Patch to change command line arguments -dump_* to -dump-* to make the
interface consistent.
Karsten Schölzel
Change command line arguments -dump_* to -dump-* to make the interface
consistent.
---
commit fae1a0f892f5705f565c5e44da34b3b6befcd155
tree 7d65873e1c16874b17545d66872c7bc5110c5dd8
parent 25918cf90393f44a7a560cecf383ef9c09a8d098
author Karsten Schoelzel <[EMAIL PROTECTED]> Sat, 29 Apr 2006 03:12:21 +0200
committer Karsten Schoelzel <[EMAIL PROTECTED]> Sat, 29 Apr 2006 03:12:21 +0200
Bonus/htmldump | 2 +-
doc-jp/HISTORY | 8 ++++----
doc-jp/MANUAL.html | 8 ++++----
doc-jp/README.cygwin | 2 +-
doc-jp/w3m.1 | 8 ++++----
doc/HISTORY | 2 +-
doc/MANUAL.html | 8 ++++----
doc/README.cygwin | 2 +-
doc/w3m.1 | 8 ++++----
main.c | 16 ++++++++--------
w3m-doc/configuration.html.in | 12 ++++++------
11 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/Bonus/htmldump b/Bonus/htmldump
index 4be60bf..c6738a6 100755
--- a/Bonus/htmldump
+++ b/Bonus/htmldump
@@ -9,4 +9,4 @@ if [ $# = 0 ]; then
else
URL=$1
fi
-w3m -dump_source $URL | makeref $OPT -url $URL | w3m -dump -F -T text/html
+w3m -dump-source $URL | makeref $OPT -url $URL | w3m -dump -F -T text/html
diff --git a/doc-jp/HISTORY b/doc-jp/HISTORY
index ce90974..81b0259 100644
--- a/doc-jp/HISTORY
+++ b/doc-jp/HISTORY
@@ -1918,7 +1918,7 @@ From: Shin HATTORI <[EMAIL PROTECTED]
��bzip2 ���ݡ��ȤΥХ�������
From: [EMAIL PROTECTED] (Hironori Sakamoto)
-��-dump, -dump_head, -dump_source ���ץ����󤬶��礷�Ƥ���
+��-dump, -dump-head, -dump-source ���ץ����󤬶��礷�Ƥ���
�Х��ν�����
��-o���ץ��������ɲá�
��-dump ���ץ��������Ȥ��ȥ��������פ����Х��ν�����
@@ -2115,8 +2115,8 @@ From: [EMAIL PROTECTED] (Hironori
���������С������� -dump ���ե졼��ɽ������ URL ��Ʊ���˰����ޤ���
�� �����������ɤⶦ�̲����Ƥ��ޤ���
������
- �������쥯��(> file )���ѥ��פξ��硢-halfdump, -dump_source,
- -dump_head �Ǥʤ����С�-dump �����ꤹ���ͤˤ��ޤ�����
+ �������쥯��(> file )���ѥ��פξ��硢-halfdump, -dump-source,
+ -dump-head �Ǥʤ����С�-dump �����ꤹ���ͤˤ��ޤ�����
w3m file.html > file.txt �ǥե����ޥå��ˤʤ��ޤ���
�� �������Ѵ��ġ����Ȥ⤹�뤿�� i18n �Ǥ⤳�����Ƥޤ���
@@ -3770,7 +3770,7 @@ configure ������ 'pxvt' �� 'rxvt' ������
openSocket() �����ǡ�getprotobyname() �����Ԥ����顤tcp�Υץ��ȥ���
�ֹ��� 6 �Ƿ����Ǥ����뤳�Ȥˤ�����
--dump_source ���ץ��������Ĥ��롥
+-dump-source ���ץ��������Ĥ��롥
���ޤ��� makeref �������ץȤ�ź�ա�
diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html
index 9dab5d9..193c38a 100644
--- a/doc-jp/MANUAL.html
+++ b/doc-jp/MANUAL.html
@@ -118,14 +118,14 @@ HTML�ե������Υ�������ɽ������
<dd>ʸ�����������ꤹ�롥�ǥե����Ȥϥ������ɥ����ç¤ï¿½ï¿½ï¿½ï¿½ï¿½é¼«Æ°Åªï¿½Ë·×»ï¿½ï¿½ï¿½ï¿½ë¡¥
<dt>-ppl �ԥ�������
<dd>ʸ���ν��������ꤹ�롥�ǥե����Ȥϥ������ɥ����ç¤ï¿½ï¿½ï¿½ï¿½ï¿½é¼«Æ°Åªï¿½Ë·×»ï¿½ï¿½ï¿½ï¿½ë¡¥
-<dt>-dump_source
+<dt>-dump-source
<dd>URL�����Ƥ��ɤߤ��ߡ�����������ɸ�����Ϥ˽ñ¤½Ð¤ï¿½ï¿½ï¿½
���ú¥³¡¼ï¿½ï¿½ï¿½Ñ´ï¿½ï¿½â¤µï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½
-<dt>-dump_head
+<dt>-dump-head
<dd>URL�˥������������إå����������Ϥ��롥
-<dt>-dump_both
+<dt>-dump-both
<dd>URL�˥������������إå�������HTML�����������Ϥ��롥
-<dt>-dump_extra
+<dt>-dump-extra
<dd>URL�˥�������������ĥ�����ȥإå�������HTML�����������Ϥ��롥
<dt>-post file
<dd>�ե����������Ƥ�POST���롥
diff --git a/doc-jp/README.cygwin b/doc-jp/README.cygwin
index 97e14c9..b4d023e 100644
--- a/doc-jp/README.cygwin
+++ b/doc-jp/README.cygwin
@@ -43,7 +43,7 @@ Win95/98/ME �� Cygwin �����Ѥ��������ˤ�
config.h �ˤϡ�Cygwin �Ķ������˰ʲ��Υޥ������������Ƥ����ޤ���
o USE_BINMODE_STREAM
- -dump, -dump_{head,source,both,extra} ���� stdout �ؤν��Ϥ��Х��ʥ�
+ -dump, -dump-{head,source,both,extra} ���� stdout �ؤν��Ϥ��Х��ʥ�
�⡼�ɤǹԤ��ޤ���cygwin-1.3.11 �ʹߤǤ����פˤʤäƤ����Ϥ��Ǥ�����
����¦�˿��äƤ��������˻Ĥ��Ƥ��ޤ���
Cygwin, EMX �Ķ��Ƕ��̤Ǥ���
diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1
index 1f119da..34115bc 100644
--- a/doc-jp/w3m.1
+++ b/doc-jp/w3m.1
@@ -140,16 +140,16 @@ URL�����Ƥ��ɤߤ��ߡ��������줿�Хåե��
.BI \-ppc\ �ԥ�������
ʸ�����������ꤹ�롥�ǥե����Ȥ� 8.0��
.TP
-.B \-dump_source
+.B \-dump-source
URL�����Ƥ��ɤߤ��ߡ�����������ɸ�����Ϥ˽ñ¤½Ð¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ú¥³¡¼ï¿½ï¿½ï¿½Ñ´ï¿½ï¿½â¤µï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½
.TP
-.B \-dump_head
+.B \-dump-head
URL�˥������������إå����������Ϥ��롥
.TP
-.B \-dump_both
+.B \-dump-both
URL�˥������������إå�������HTML�����������Ϥ��롥
.TP
-.B \-dump_extra
+.B \-dump-extra
URL�˥�������������ĥ�����ȥإå�������HTML�����������Ϥ��롥
.TP
.BI \-post\ file
diff --git a/doc/HISTORY b/doc/HISTORY
index b8f5b94..aa350e2 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -1315,7 +1315,7 @@ From: Shin HATTORI <[EMAIL PROTECTED]
* Bugfix: bzip2 support.
From: [EMAIL PROTECTED] (Hironori Sakamoto)
-* Bugfix: -dump, -dump_head, -dump_source option interfares
+* Bugfix: -dump, -dump-head, -dump-source option interfares
each other.
* Improvement: -o option added.
* Bugfix: -dump option causes core dump.
diff --git a/doc/MANUAL.html b/doc/MANUAL.html
index 4877f72..92fbb79 100644
--- a/doc/MANUAL.html
+++ b/doc/MANUAL.html
@@ -116,13 +116,13 @@ with -cols option.
<dt>-ppc count
<dd> Specify the number of pixels per character (default 8.0). Larger
values will make tables narrower.
-<dt>-dump_source
+<dt>-dump-source
<dd>Read document specified by URL and dump the source.
-<dt>-dump_head
+<dt>-dump-head
<dd>Read document specified by URL and dump headers.
-<dt>-dump_both
+<dt>-dump-both
<dd>Read document specified by URL and dump headers and the source.
-<dt>-dump_extra
+<dt>-dump-extra
<dd>Read document specified by URL and dump extra informations, headers and
the source.
<dt>-post file
<dd>use POST method with file content.
diff --git a/doc/README.cygwin b/doc/README.cygwin
index b08e79b..5fd0b71 100644
--- a/doc/README.cygwin
+++ b/doc/README.cygwin
@@ -38,7 +38,7 @@ Macros
The macros below are defined in config.h for Cygwin environment.
USE_BINMODE_STREAM
- With -dump, -dump_{head,source,both,extra} option, output to stdout are
+ With -dump, -dump-{head,source,both,extra} option, output to stdout are
done in binary mode. It might not been needed with cygwin-1.3.11 or later,
but remained for safe.
In common with Cygwin and EMX.
diff --git a/doc/w3m.1 b/doc/w3m.1
index 104fa74..d135ec1 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -84,16 +84,16 @@ specify column width (used with -dump)
specify the number of pixels per character (default 8.0)
Larger values will make tables narrower.
.TP
-.B -dump_source
+.B -dump-source
dump page source into stdout
.TP
-.B -dump_head
+.B -dump-head
dump response of HEAD request into stdout
.TP
-.B -dump_both
+.B -dump-both
dump HEAD and source into stdout
.TP
-.B -dump_extra
+.B -dump-extra
dump HEAD, source, and extra information into stdout
.TP
.B -post file
diff --git a/main.c b/main.c
index 8f448c2..6721a31 100644
--- a/main.c
+++ b/main.c
@@ -212,11 +212,11 @@ fusage(FILE * f, int err)
#endif
fprintf(f, " -dump dump formatted page into stdout\n");
fprintf(f,
- " -dump_head dump response of HEAD request into stdout\n");
- fprintf(f, " -dump_source dump page source into stdout\n");
- fprintf(f, " -dump_both dump HEAD and source into stdout\n");
+ " -dump-head dump response of HEAD request into stdout\n");
+ fprintf(f, " -dump-source dump page source into stdout\n");
+ fprintf(f, " -dump-both dump HEAD and source into stdout\n");
fprintf(f,
- " -dump_extra dump HEAD, source, and extra information into
stdout\n");
+ " -dump-extra dump HEAD, source, and extra information into
stdout\n");
fprintf(f, " -post file use POST method with file content\n");
fprintf(f, " -header string insert string as a header\n");
fprintf(f, " +<num> goto <num> line\n");
@@ -588,13 +588,13 @@ main(int argc, char **argv, char **envp)
}
else if (!strcmp("-dump", argv[i]))
w3m_dump = DUMP_BUFFER;
- else if (!strcmp("-dump_source", argv[i]))
+ else if (!strcmp("-dump-source", argv[i]))
w3m_dump = DUMP_SOURCE;
- else if (!strcmp("-dump_head", argv[i]))
+ else if (!strcmp("-dump-head", argv[i]))
w3m_dump = DUMP_HEAD;
- else if (!strcmp("-dump_both", argv[i]))
+ else if (!strcmp("-dump-both", argv[i]))
w3m_dump = (DUMP_HEAD | DUMP_SOURCE);
- else if (!strcmp("-dump_extra", argv[i]))
+ else if (!strcmp("-dump-extra", argv[i]))
w3m_dump = (DUMP_HEAD | DUMP_SOURCE | DUMP_EXTRA);
else if (!strcmp("-halfdump", argv[i]))
w3m_dump = DUMP_HALFDUMP;
diff --git a/w3m-doc/configuration.html.in b/w3m-doc/configuration.html.in
index 136768f..e959801 100644
--- a/w3m-doc/configuration.html.in
+++ b/w3m-doc/configuration.html.in
@@ -87,14 +87,14 @@
<DD>$BJ8;z$NI}$r;XDj$9$k!#%G%U%)%k%H$O(B<B>8.0</B>$B!#(B
<DT>-dump
<DD>URL $B$G;XDj$5$l$?(B WWW
$B$NFbMF$rFI$_9~$_!"@07A$5$l$?%P%C%U%!$NFbMF$rI8=`=PNO$K=q$-=P$9!#J8=q$NI}$O(B
80 $B7e$H2>Dj$5$l$k!#$3$NI}$O(B -cols $B%*%W%7%g%s$GJQ992DG=!#(B
-<DT>-dump_head
+<DT>-dump-head
<DD>URL $B$G;XDj$5$l$?(B WWW
$B$NFbMF$rFI$_9~$_!"$=$N%X%C%@>pJs$N$_$rI8=`=PNO$K=q$-=P$9!#(B
-<DT>-dump_source
+<DT>-dump-source
<DD>URL $B$G;XDj$5$l$?(B WWW
$B$NFbMF$rFI$_9~$_!"@07A$;$:$KI8=`=PNO$K=q$-=P$9!#4A;z%3!<%I$NJQ49$b9T$o$J$$!#(B
-<DT>-dump_both
- <DD>-dump_head $B$H(B -dump_souce $B$NN>J}$N8z2L(B
-<DT>-dump_extra
- <DD>-dump_both $B$K2C$(!"3HD%>pJs(B(extra
information)$B$rI8=`=PNO$K=q$-=P$9!#(B
+<DT>-dump-both
+ <DD>-dump-head $B$H(B -dump-souce $B$NN>J}$N8z2L(B
+<DT>-dump-extra
+ <DD>-dump-both $B$K2C$(!"3HD%>pJs(B(extra
information)$B$rI8=`=PNO$K=q$-=P$9!#(B
<DT>-post $B%U%!%$%kL>(B
<DD>$B;XDj$7$?%U%!%$%k$NFbMF$G(B POST $B%a%=%C%I$rMQ$$$k!#(B
<DT>-header $BJ8;zNs(B
