w3m

commit 9ffb0203281c6892b6b7a5bf080e4be94f6a5866
parent 6fac05f72992feee17db54d0086a788fb788404c
Author: ukai <ukai>
Date:   Tue, 12 Nov 2002 12:24:44 +0000

[w3m-dev 03414] Re: show parameter
* main.c (fusage): add -show-option
	(MAIN): check -show-option
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
main.c
 | 
11
+++++++----

2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
 2002-11-12  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03414] Re: show parameter
+	* main.c (fusage): add -show-option
+		(MAIN): check -show-option
+
+2002-11-12  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03413] Re: setting form on loading
 	* form.c (loadPreForm): add textarea
 		(preFormUpdateBuffer): submit if value is matched as well
diff --git a/main.c b/main.c
@@ -239,6 +239,7 @@ fusage(FILE * f, int err)
     fprintf(f,
 	    "    -title[=TERM]    set buffer name to terminal title string\n");
     fprintf(f, "    -o opt=value     assign value to config option\n");
+    fprintf(f, "    -show-option     print all config options\n");
     fprintf(f, "    -config file     specify config file\n");
     fprintf(f, "    -help            print this usage message\n");
     fprintf(f, "    -version         print w3m version\n");
@@ -654,10 +655,12 @@ MAIN(int argc, char **argv, char **envp)
 		displayTitleTerm = getenv("TERM");
 	    else if (!strncmp("-title=", argv[i], 7))
 		displayTitleTerm = argv[i] + 7;
-	    else if (!strcmp("-o", argv[i])) {
-		if (++i >= argc || !strcmp(argv[i], "?")) {
-		    show_params_p = 1;
-		    usage();
+	    else if (!strcmp("-o", argv[i]) ||
+		     !strcmp("-show-option", argv[i])) {
+		if (!strcmp("-show-option", argv[i]) || ++i >= argc ||
+		    !strcmp(argv[i], "?")) {
+		    show_params(stdout);
+		    exit(0);
 		}
 		if (!set_param_option(argv[i])) {
 		    /* option set failed */