Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 902e017d 902e017d1636989fa1d08618a4d6d139bd7c5de6 by Sergey Poznyakoff
Options

Minor changes for consistency with the overall GNU mh options layout.

1 parent fc93d31f
Inline Side-by-side
Showing 23 changed files with 346 additions and 122 deletions
1 2003-03-19 Sergey Poznyakoff 1 2003-03-19 Sergey Poznyakoff
2 2
3 * mh/anno.c: Minor changes for consistency with the overall
4 GNU mh options layout.
5 * mh/comp.c: Likewise.
6 * mh/fmtcheck.c: Likewise.
7 * mh/folder.c: Likewise.
8 * mh/forw.c: Likewise.
9 * mh/inc.c: Likewise.
10 * mh/install-mh.c: Likewise.
11 * mh/mark.c: Likewise.
12 * mh/mh_getopt.h: Likewise.
13 * mh/mhl.c: Likewise.
14 * mh/mhn.c: Likewise.
15 * mh/mhpath.c: Likewise.
16 * mh/pick.c: Likewise.
17 * mh/refile.c: Likewise.
18 * mh/repl.c: Likewise.
19 * mh/rmf.c: Likewise.
20 * mh/rmm.c: Likewise.
21 * mh/scan.c: Likewise.
22 * mh/send.c: Likewise.
23 * mh/sortm.c: Likewise.
24 * mh/whatnow.c: Likewise.
25 * mh/whom.c: Likewise.
26
27 2003-03-19 Sergey Poznyakoff
28
3 * doc/rfc/Makefile.am: Added rfc1521.txt 29 * doc/rfc/Makefile.am: Added rfc1521.txt
4 * doc/rfc/rfc1521.txt: Added to the repository. 30 * doc/rfc/rfc1521.txt: Added to the repository.
5 * mailbox/filter_trans.c (base64_encode): Bugfix. 31 * mailbox/filter_trans.c (base64_encode): Bugfix.
......
...@@ -39,6 +39,8 @@ static struct argp_option options[] = { ...@@ -39,6 +39,8 @@ static struct argp_option options[] = {
39 N_("Add this FIELD to the message header") }, 39 N_("Add this FIELD to the message header") },
40 {"text", ARG_TEXT, N_("STRING"), 0, 40 {"text", ARG_TEXT, N_("STRING"), 0,
41 N_("Field value for the component") }, 41 N_("Field value for the component") },
42 {"license", ARG_LICENSE, 0, 0,
43 N_("Display software license"), -1},
42 { NULL } 44 { NULL }
43 }; 45 };
44 46
...@@ -88,6 +90,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -88,6 +90,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
88 anno_text = arg; 90 anno_text = arg;
89 break; 91 break;
90 92
93 case ARG_LICENSE:
94 mh_license (argp_program_version);
95 break;
96
91 default: 97 default:
92 return 1; 98 return 1;
93 } 99 }
......
...@@ -53,6 +53,9 @@ static struct argp_option options[] = { ...@@ -53,6 +53,9 @@ static struct argp_option options[] = {
53 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")}, 53 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
54 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, 54 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL,
55 N_("Use draft file preserved after the last session") }, 55 N_("Use draft file preserved after the last session") },
56 {"nouse", ARG_NOUSE, NULL, OPTION_HIDDEN, ""},
57 {"license", ARG_LICENSE, 0, 0,
58 N_("Display software license"), -1},
56 { 0 } 59 { 0 }
57 }; 60 };
58 61
...@@ -111,6 +114,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -111,6 +114,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
111 use_draft = is_true (arg); 114 use_draft = is_true (arg);
112 break; 115 break;
113 116
117 case ARG_NOUSE:
118 use_draft = 0;
119 break;
120
114 case ARG_FILE: 121 case ARG_FILE:
115 wh_env.draftfile = mh_expand_name (NULL, arg, 0); 122 wh_env.draftfile = mh_expand_name (NULL, arg, 0);
116 break; 123 break;
...@@ -128,6 +135,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -128,6 +135,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
128 argp_error (state, _("option is not yet implemented")); 135 argp_error (state, _("option is not yet implemented"));
129 exit (1); 136 exit (1);
130 137
138 case ARG_LICENSE:
139 mh_license (argp_program_version);
140 break;
141
131 default: 142 default:
132 return 1; 143 return 1;
133 } 144 }
......
...@@ -34,6 +34,9 @@ static struct argp_option options[] = { ...@@ -34,6 +34,9 @@ static struct argp_option options[] = {
34 N_("Dump the listing of compiled format code")}, 34 N_("Dump the listing of compiled format code")},
35 { "debug", ARG_DEBUG, NULL, 0, 35 { "debug", ARG_DEBUG, NULL, 0,
36 N_("Enable parser debugging output"),}, 36 N_("Enable parser debugging output"),},
37 {"license", ARG_LICENSE, 0, 0,
38 N_("Display software license"), -1},
39
37 { 0 } 40 { 0 }
38 }; 41 };
39 42
...@@ -84,6 +87,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -84,6 +87,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
84 mh_format_debug (1); 87 mh_format_debug (1);
85 break; 88 break;
86 89
90 case ARG_LICENSE:
91 mh_license (argp_program_version);
92 break;
93
87 default: 94 default:
88 return 1; 95 return 1;
89 } 96 }
......
...@@ -59,14 +59,22 @@ static struct argp_option options[] = { ...@@ -59,14 +59,22 @@ static struct argp_option options[] = {
59 N_("List all folders"), 3}, 59 N_("List all folders"), 3},
60 {"create", ARG_CREATE, N_("BOOL"), OPTION_ARG_OPTIONAL, 60 {"create", ARG_CREATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
61 N_("Create non-existing folders"), 3}, 61 N_("Create non-existing folders"), 3},
62 {"nocreate", ARG_NOCREATE, NULL, OPTION_HIDDEN, ""},
62 {"fast", ARG_FAST, N_("BOOL"), OPTION_ARG_OPTIONAL, 63 {"fast", ARG_FAST, N_("BOOL"), OPTION_ARG_OPTIONAL,
63 N_("List only the folder names"), 3}, 64 N_("List only the folder names"), 3},
65 {"nofast", ARG_NOFAST, NULL, OPTION_HIDDEN, ""},
64 {"header", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL, 66 {"header", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL,
65 N_("Print the header line"), 3}, 67 N_("Print the header line"), 3},
68 {"noheader", ARG_NOHEADER, NULL, OPTION_HIDDEN, ""},
66 {"recurse",ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL, 69 {"recurse",ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
67 N_("Scan folders recursively"), 3}, 70 N_("Scan folders recursively"), 3},
71 {"norecurse", ARG_NORECURSIVE, NULL, OPTION_HIDDEN, ""},
68 {"total", ARG_TOTAL, N_("BOOL"), OPTION_ARG_OPTIONAL, 72 {"total", ARG_TOTAL, N_("BOOL"), OPTION_ARG_OPTIONAL,
69 N_("Output the total statistics"), 3}, 73 N_("Output the total statistics"), 3},
74 {"nototal", ARG_NOTOTAL, NULL, OPTION_HIDDEN, ""},
75
76 {"license", ARG_LICENSE, 0, 0,
77 N_("Display software license"), -1},
70 78
71 {NULL}, 79 {NULL},
72 }; 80 };
...@@ -141,27 +149,50 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -141,27 +149,50 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
141 create_flag = is_true (arg); 149 create_flag = is_true (arg);
142 break; 150 break;
143 151
152 case ARG_NOCREATE:
153 create_flag = 0;
154
144 case ARG_FAST: 155 case ARG_FAST:
145 fast_mode = is_true (arg); 156 fast_mode = is_true (arg);
146 break; 157 break;
147 158
159 case ARG_NOFAST:
160 fast_mode = 0;
161 break;
162
148 case ARG_HEADER: 163 case ARG_HEADER:
149 print_header = is_true (arg); 164 print_header = is_true (arg);
150 break; 165 break;
151 166
167 case ARG_NOHEADER:
168 print_header = 0;
169 break;
170
152 case ARG_RECURSIVE: 171 case ARG_RECURSIVE:
153 recurse = is_true (arg); 172 recurse = is_true (arg);
154 break; 173 break;
155 174
175 case ARG_NORECURSIVE:
176 recurse = 0;
177 break;
178
156 case ARG_TOTAL: 179 case ARG_TOTAL:
157 print_total = is_true (arg); 180 print_total = is_true (arg);
158 break; 181 break;
159 182
183 case ARG_NOTOTAL:
184 print_total = 0;
185 break;
186
160 case ARG_FOLDER: 187 case ARG_FOLDER:
161 push_folder = mh_current_folder (); 188 push_folder = mh_current_folder ();
162 current_folder = arg; 189 current_folder = arg;
163 break; 190 break;
164 191
192 case ARG_LICENSE:
193 mh_license (argp_program_version);
194 break;
195
165 default: 196 default:
166 return 1; 197 return 1;
167 } 198 }
......
...@@ -66,6 +66,11 @@ static struct argp_option options[] = { ...@@ -66,6 +66,11 @@ static struct argp_option options[] = {
66 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")}, 66 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
67 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, 67 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL,
68 N_("Use draft file preserved after the last session") }, 68 N_("Use draft file preserved after the last session") },
69 {"nouse", ARG_NOUSE, N_("BOOL"), OPTION_HIDDEN, "" },
70
71 {"license", ARG_LICENSE, 0, 0,
72 N_("Display software license"), -1},
73
69 {NULL}, 74 {NULL},
70 }; 75 };
71 76
...@@ -128,6 +133,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -128,6 +133,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
128 use_draft = is_true (arg); 133 use_draft = is_true (arg);
129 break; 134 break;
130 135
136 case ARG_NOUSE:
137 use_draft = 0;
138 break;
139
131 case ARG_WIDTH: 140 case ARG_WIDTH:
132 width = strtoul (arg, NULL, 0); 141 width = strtoul (arg, NULL, 0);
133 if (!width) 142 if (!width)
...@@ -184,6 +193,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -184,6 +193,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
184 argp_error (state, _("option is not yet implemented")); 193 argp_error (state, _("option is not yet implemented"));
185 exit (1); 194 exit (1);
186 195
196 case ARG_LICENSE:
197 mh_license (argp_program_version);
198 break;
199
187 default: 200 default:
188 return 1; 201 return 1;
189 } 202 }
......
...@@ -36,12 +36,14 @@ static struct argp_option options[] = { ...@@ -36,12 +36,14 @@ static struct argp_option options[] = {
36 N_("Disable audit")}, 36 N_("Disable audit")},
37 {"changecur", ARG_CHANGECUR, N_("BOOL"), OPTION_ARG_OPTIONAL, 37 {"changecur", ARG_CHANGECUR, N_("BOOL"), OPTION_ARG_OPTIONAL,
38 N_("Mark first incorporated message as current (default)")}, 38 N_("Mark first incorporated message as current (default)")},
39 {"nochangecur", ARG_NOCHANGECUR, NULL, OPTION_HIDDEN, ""},
39 {"form", ARG_FORM, N_("FILE"), 0, 40 {"form", ARG_FORM, N_("FILE"), 0,
40 N_("Read format from given file")}, 41 N_("Read format from given file")},
41 {"format", ARG_FORMAT, N_("FORMAT"), 0, 42 {"format", ARG_FORMAT, N_("FORMAT"), 0,
42 N_("Use this format string")}, 43 N_("Use this format string")},
43 {"truncate", ARG_TRUNCATE, N_("BOOL"), OPTION_ARG_OPTIONAL, 44 {"truncate", ARG_TRUNCATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
44 N_("Truncate source mailbox after incorporating (default)")}, 45 N_("Truncate source mailbox after incorporating (default)")},
46 {"notruncate", ARG_NOTRUNCATE, NULL, OPTION_HIDDEN, ""},
45 {"width", ARG_WIDTH, N_("NUMBER"), 0, 47 {"width", ARG_WIDTH, N_("NUMBER"), 0,
46 N_("Set output width")}, 48 N_("Set output width")},
47 {"quiet", ARG_QUIET, 0, 0, 49 {"quiet", ARG_QUIET, 0, 0,
...@@ -97,6 +99,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -97,6 +99,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
97 changecur = is_true(arg); 99 changecur = is_true(arg);
98 break; 100 break;
99 101
102 case ARG_NOCHANGECUR:
103 changecur = 0;
104 break;
105
100 case ARG_FOLDER: 106 case ARG_FOLDER:
101 append_folder = arg; 107 append_folder = arg;
102 break; 108 break;
...@@ -113,6 +119,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -113,6 +119,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
113 truncate_source = is_true(arg); 119 truncate_source = is_true(arg);
114 break; 120 break;
115 121
122 case ARG_NOTRUNCATE:
123 truncate_source = 0;
124 break;
125
116 case ARG_WIDTH: 126 case ARG_WIDTH:
117 width = strtoul (arg, NULL, 0); 127 width = strtoul (arg, NULL, 0);
118 if (!width) 128 if (!width)
......
...@@ -26,6 +26,8 @@ static char args_doc[] = ""; ...@@ -26,6 +26,8 @@ static char args_doc[] = "";
26 static struct argp_option options[] = { 26 static struct argp_option options[] = {
27 {"auto", ARG_AUTO, NULL, 0, N_("Do not ask for anything")}, 27 {"auto", ARG_AUTO, NULL, 0, N_("Do not ask for anything")},
28 {"compat", ARG_COMPAT, NULL, OPTION_HIDDEN, ""}, 28 {"compat", ARG_COMPAT, NULL, OPTION_HIDDEN, ""},
29 {"license", ARG_LICENSE, 0, 0,
30 N_("Display software license"), -1},
29 {NULL} 31 {NULL}
30 }; 32 };
31 33
...@@ -49,6 +51,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -49,6 +51,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
49 case ARG_COMPAT: 51 case ARG_COMPAT:
50 break; 52 break;
51 53
54 case ARG_LICENSE:
55 mh_license (argp_program_version);
56 break;
57
52 default: 58 default:
53 return 1; 59 return 1;
54 } 60 }
......
...@@ -40,6 +40,8 @@ static struct argp_option options[] = { ...@@ -40,6 +40,8 @@ static struct argp_option options[] = {
40 {"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL, 40 {"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL,
41 N_("Empty the sequence before adding messages")}, 41 N_("Empty the sequence before adding messages")},
42 {"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "" }, 42 {"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "" },
43 {"license", ARG_LICENSE, 0, 0,
44 N_("Display software license"), -1},
43 {NULL} 45 {NULL}
44 }; 46 };
45 47
...@@ -112,6 +114,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -112,6 +114,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
112 seq_flags &= ~SEQ_ZERO; 114 seq_flags &= ~SEQ_ZERO;
113 break; 115 break;
114 116
117 case ARG_LICENSE:
118 mh_license (argp_program_version);
119 break;
120
115 default: 121 default:
116 return 1; 122 return 1;
117 } 123 }
......
...@@ -38,128 +38,138 @@ struct mh_argp_data ...@@ -38,128 +38,138 @@ struct mh_argp_data
38 char *doc; 38 char *doc;
39 }; 39 };
40 40
41 #define ARG_ADD 266 41 #define ARG_ADD 257
42 #define ARG_AFTER 267 42 #define ARG_AFTER 258
43 #define ARG_ALIAS 268 43 #define ARG_ALIAS 259
44 #define ARG_ALL 269 44 #define ARG_ALL 260
45 #define ARG_AND 270 45 #define ARG_AND 261
46 #define ARG_ANNOTATE 271 46 #define ARG_ANNOTATE 262
47 #define ARG_AUDIT 272 47 #define ARG_AUDIT 263
48 #define ARG_AUTO 273 48 #define ARG_AUTO 264
49 #define ARG_BEFORE 274 49 #define ARG_BEFORE 265
50 #define ARG_BELL 275 50 #define ARG_BELL 266
51 #define ARG_BUILD 276 51 #define ARG_BUILD 267
52 #define ARG_CC 277 52 #define ARG_CC 268
53 #define ARG_CFLAGS 278 53 #define ARG_CFLAGS 269
54 #define ARG_CHANGECUR 279 54 #define ARG_CHANGECUR 270
55 #define ARG_CHECK 280 55 #define ARG_CHECK 271
56 #define ARG_CLEAR 281 56 #define ARG_CLEAR 272
57 #define ARG_COMPAT 282 57 #define ARG_COMPAT 273
58 #define ARG_COMPONENT 283 58 #define ARG_COMPONENT 274
59 #define ARG_COMPOSE 284 59 #define ARG_COMPOSE 275
60 #define ARG_CREATE 285 60 #define ARG_CREATE 276
61 #define ARG_DATE 286 61 #define ARG_DATE 277
62 #define ARG_DATEFIELD 287 62 #define ARG_DATEFIELD 278
63 #define ARG_DEBUG 288 63 #define ARG_DEBUG 279
64 #define ARG_DELETE 289 64 #define ARG_DELETE 280
65 #define ARG_DRAFT 290 65 #define ARG_DRAFT 281
66 #define ARG_DRAFTFOLDER 291 66 #define ARG_DRAFTFOLDER 282
67 #define ARG_DRAFTMESSAGE 292 67 #define ARG_DRAFTMESSAGE 283
68 #define ARG_DRY_RUN 293 68 #define ARG_DRY_RUN 284
69 #define ARG_DUMP 294 69 #define ARG_DUMP 285
70 #define ARG_EDITOR 295 70 #define ARG_EDITOR 286
71 #define ARG_FAST 296 71 #define ARG_FAST 287
72 #define ARG_FCC 297 72 #define ARG_FCC 288
73 #define ARG_FILE 298 73 #define ARG_FILE 289
74 #define ARG_FILTER 299 74 #define ARG_FILTER 290
75 #define ARG_FOLDER 300 75 #define ARG_FOLDER 291
76 #define ARG_FORM 301 76 #define ARG_FORM 292
77 #define ARG_FORMAT 302 77 #define ARG_FORMAT 293
78 #define ARG_FORWARD 303 78 #define ARG_FORWARD 294
79 #define ARG_FROM 304 79 #define ARG_FROM 295
80 #define ARG_HEADER 305 80 #define ARG_HEADER 296
81 #define ARG_INPLACE 306 81 #define ARG_INPLACE 297
82 #define ARG_INTERACTIVE 307 82 #define ARG_INTERACTIVE 298
83 #define ARG_LBRACE 308 83 #define ARG_LBRACE 299
84 #define ARG_LENGTH 309 84 #define ARG_LENGTH 300
85 #define ARG_LICENSE 310 85 #define ARG_LICENSE 301
86 #define ARG_LIMIT 311 86 #define ARG_LIMIT 302
87 #define ARG_LINK 312 87 #define ARG_LINK 303
88 #define ARG_LIST 313 88 #define ARG_LIST 304
89 #define ARG_MIME 314 89 #define ARG_MIME 305
90 #define ARG_MOREPROC 315 90 #define ARG_MOREPROC 306
91 #define ARG_MSGID 316 91 #define ARG_MSGID 307
92 #define ARG_NOAUDIT 317 92 #define ARG_NOAUDIT 308
93 #define ARG_NOAUTO 318 93 #define ARG_NOAUTO 309
94 #define ARG_NOBELL 319 94 #define ARG_NOBELL 310
95 #define ARG_NOCC 320 95 #define ARG_NOCC 311
96 #define ARG_NOCHECK 321 96 #define ARG_NOCHANGECUR 312
97 #define ARG_NOCLEAR 322 97 #define ARG_NOCHECK 313
98 #define ARG_NOCOMPOSE 323 98 #define ARG_NOCLEAR 314
99 #define ARG_NODATE 324 99 #define ARG_NOCOMPOSE 315
100 #define ARG_NODATEFIELD 325 100 #define ARG_NOCREATE 316
101 #define ARG_NODRAFTFOLDER 326 101 #define ARG_NODATE 317
102 #define ARG_NOEDIT 327 102 #define ARG_NODATEFIELD 318
103 #define ARG_NOFILTER 328 103 #define ARG_NODRAFTFOLDER 319
104 #define ARG_NOFORMAT 329 104 #define ARG_NOEDIT 320
105 #define ARG_NOFORWARD 330 105 #define ARG_NOFAST 321
106 #define ARG_NOHEADERS 331 106 #define ARG_NOFILTER 322
107 #define ARG_NOINPLACE 332 107 #define ARG_NOFORMAT 323
108 #define ARG_NOLIMIT 333 108 #define ARG_NOFORWARD 324
109 #define ARG_NOLIST 334 109 #define ARG_NOHEADER 325
110 #define ARG_NOMIME 335 110 #define ARG_NOHEADERS 326
111 #define ARG_NOMOREPROC 336 111 #define ARG_NOINTERACTIVE 327
112 #define ARG_NOMSGID 337 112 #define ARG_NOINPLACE 328
113 #define ARG_NOPAUSE 338 113 #define ARG_NOLIMIT 329
114 #define ARG_NOPUBLIC 339 114 #define ARG_NOLIST 330
115 #define ARG_NOPUSH 340 115 #define ARG_NOMIME 331
116 #define ARG_NOREALSIZE 341 116 #define ARG_NOMOREPROC 332
117 #define ARG_NOSERIALONLY 342 117 #define ARG_NOMSGID 333
118 #define ARG_NOSHOW 343 118 #define ARG_NOPAUSE 334
119 #define ARG_NOSTORE 344 119 #define ARG_NOPUBLIC 335
120 #define ARG_NOT 345 120 #define ARG_NOPUSH 336
121 #define ARG_NOTEXTFIELD 346 121 #define ARG_NOREALSIZE 337
122 #define ARG_NOVERBOSE 347 122 #define ARG_NORECURSIVE 338
123 #define ARG_NOWATCH 348 123 #define ARG_NOREVERSE 339
124 #define ARG_NOWHATNOWPROC 349 124 #define ARG_NOSERIALONLY 340
125 #define ARG_NOZERO 350 125 #define ARG_NOSHOW 341
126 #define ARG_NUMFIELD 351 126 #define ARG_NOSTORE 342
127 #define ARG_OR 352 127 #define ARG_NOT 343
128 #define ARG_PART 353 128 #define ARG_NOTEXTFIELD 344
129 #define ARG_PATTERN 354 129 #define ARG_NOTOTAL 345
130 #define ARG_PAUSE 355 130 #define ARG_NOTRUNCATE 346
131 #define ARG_POP 356 131 #define ARG_NOUSE 347
132 #define ARG_PRESERVE 357 132 #define ARG_NOVERBOSE 348
133 #define ARG_PRINT 358 133 #define ARG_NOWATCH 349
134 #define ARG_PROMPT 359 134 #define ARG_NOWHATNOWPROC 350
135 #define ARG_PUBLIC 360 135 #define ARG_NOZERO 351
136 #define ARG_PUSH 361 136 #define ARG_NUMFIELD 352
137 #define ARG_QUERY 362 137 #define ARG_OR 353
138 #define ARG_QUIET 363 138 #define ARG_PART 354
139 #define ARG_RBRACE 364 139 #define ARG_PATTERN 355
140 #define ARG_REALSIZE 365 140 #define ARG_PAUSE 356
141 #define ARG_RECURSIVE 366 141 #define ARG_POP 357
142 #define ARG_REORDER 367 142 #define ARG_PRESERVE 358
143 #define ARG_REVERSE 368 143 #define ARG_PRINT 359
144 #define ARG_SEQUENCE 369 144 #define ARG_PROMPT 360
145 #define ARG_SERIALONLY 370 145 #define ARG_PUBLIC 361
146 #define ARG_SHOW 371 146 #define ARG_PUSH 362
147 #define ARG_SOURCE 372 147 #define ARG_QUERY 363
148 #define ARG_SPLIT 373 148 #define ARG_QUIET 364
149 #define ARG_STORE 374 149 #define ARG_RBRACE 365
150 #define ARG_SUBJECT 375 150 #define ARG_REALSIZE 366
151 #define ARG_TEXT 376 151 #define ARG_RECURSIVE 367
152 #define ARG_TEXTFIELD 377 152 #define ARG_REORDER 368
153 #define ARG_TO 378 153 #define ARG_REVERSE 369
154 #define ARG_TOTAL 379 154 #define ARG_SEQUENCE 370
155 #define ARG_TRUNCATE 380 155 #define ARG_SERIALONLY 371
156 #define ARG_TYPE 381 156 #define ARG_SHOW 372
157 #define ARG_USE 382 157 #define ARG_SOURCE 373
158 #define ARG_VERBOSE 383 158 #define ARG_SPLIT 374
159 #define ARG_WATCH 384 159 #define ARG_STORE 375
160 #define ARG_WHATNOWPROC 385 160 #define ARG_SUBJECT 376
161 #define ARG_WIDTH 386 161 #define ARG_TEXT 377
162 #define ARG_ZERO 387 162 #define ARG_TEXTFIELD 378
163 #define ARG_TO 379
164 #define ARG_TOTAL 380
165 #define ARG_TRUNCATE 381
166 #define ARG_TYPE 382
167 #define ARG_USE 383
168 #define ARG_VERBOSE 384
169 #define ARG_WATCH 385
170 #define ARG_WHATNOWPROC 386
171 #define ARG_WIDTH 387
172 #define ARG_ZERO 388
163 173
164 void mh_argv_preproc __P((int argc, char **argv, struct mh_argp_data *data)); 174 void mh_argv_preproc __P((int argc, char **argv, struct mh_argp_data *data));
165 int mh_getopt __P((int argc, char **argv, struct mh_option *mh_opt, 175 int mh_getopt __P((int argc, char **argv, struct mh_option *mh_opt,
......
...@@ -46,6 +46,8 @@ static struct argp_option options[] = { ...@@ -46,6 +46,8 @@ static struct argp_option options[] = {
46 N_("Use given PROG instead of the default") }, 46 N_("Use given PROG instead of the default") },
47 {"nomoreproc", ARG_NOMOREPROC, NULL, 0, 47 {"nomoreproc", ARG_NOMOREPROC, NULL, 0,
48 N_("Disable use of moreproc program") }, 48 N_("Disable use of moreproc program") },
49 {"license", ARG_LICENSE, 0, 0,
50 N_("Display software license"), -1},
49 { NULL } 51 { NULL }
50 }; 52 };
51 53
...@@ -129,6 +131,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -129,6 +131,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
129 nomoreproc = 1; 131 nomoreproc = 1;
130 break; 132 break;
131 133
134 case ARG_LICENSE:
135 mh_license (argp_program_version);
136 break;
137
132 default: 138 default:
133 return 1; 139 return 1;
134 } 140 }
......
...@@ -82,6 +82,8 @@ static struct argp_option options[] = { ...@@ -82,6 +82,8 @@ static struct argp_option options[] = {
82 {"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "", 41 }, 82 {"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "", 41 },
83 {"quiet", ARG_QUIET, 0, 0, 83 {"quiet", ARG_QUIET, 0, 0,
84 N_("Be quiet")}, 84 N_("Be quiet")},
85 {"license", ARG_LICENSE, 0, 0,
86 N_("Display software license"), -1},
85 {NULL} 87 {NULL}
86 }; 88 };
87 89
...@@ -388,6 +390,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -388,6 +390,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
388 mode_options |= OPT_QUIET; 390 mode_options |= OPT_QUIET;
389 break; 391 break;
390 392
393 case ARG_LICENSE:
394 mh_license (argp_program_version);
395 break;
396
391 default: 397 default:
392 return 1; 398 return 1;
393 } 399 }
......
...@@ -28,6 +28,8 @@ static char args_doc[] = N_("[+folder] [msgs]"); ...@@ -28,6 +28,8 @@ static char args_doc[] = N_("[+folder] [msgs]");
28 static struct argp_option options[] = { 28 static struct argp_option options[] = {
29 {"folder", ARG_FOLDER, N_("FOLDER"), 0, 29 {"folder", ARG_FOLDER, N_("FOLDER"), 0,
30 N_("Specify folder to operate upon")}, 30 N_("Specify folder to operate upon")},
31 {"license", ARG_LICENSE, 0, 0,
32 N_("Display software license"), -1},
31 { 0 } 33 { 0 }
32 }; 34 };
33 35
...@@ -45,6 +47,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -45,6 +47,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
45 current_folder = arg; 47 current_folder = arg;
46 break; 48 break;
47 49
50 case ARG_LICENSE:
51 mh_license (argp_program_version);
52 break;
53
48 default: 54 default:
49 return 1; 55 return 1;
50 } 56 }
......
...@@ -89,6 +89,8 @@ static struct argp_option options[] = { ...@@ -89,6 +89,8 @@ static struct argp_option options[] = {
89 {"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL, 89 {"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL,
90 N_("Empty the sequence before adding messages"), 4}, 90 N_("Empty the sequence before adding messages"), 4},
91 {"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "", 4 }, 91 {"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "", 4 },
92 {"license", ARG_LICENSE, 0, 0,
93 N_("Display software license"), -1},
92 {NULL}, 94 {NULL},
93 }; 95 };
94 96
...@@ -282,6 +284,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -282,6 +284,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
282 pick_add_token (&lexlist, T_STRING, p); 284 pick_add_token (&lexlist, T_STRING, p);
283 break; 285 break;
284 286
287 case ARG_LICENSE:
288 mh_license (argp_program_version);
289 break;
290
285 default: 291 default:
286 return 1; 292 return 1;
287 } 293 }
......
...@@ -45,6 +45,8 @@ static struct argp_option options[] = { ...@@ -45,6 +45,8 @@ static struct argp_option options[] = {
45 N_("Specify source folder. FOLDER will become the current folder after the program exits.")}, 45 N_("Specify source folder. FOLDER will become the current folder after the program exits.")},
46 {"src", 0, NULL, OPTION_ALIAS, NULL}, 46 {"src", 0, NULL, OPTION_ALIAS, NULL},
47 {"file", ARG_FILE, N_("FILE"), 0, N_("Use FILE as the source message")}, 47 {"file", ARG_FILE, N_("FILE"), 0, N_("Use FILE as the source message")},
48 {"license", ARG_LICENSE, 0, 0,
49 N_("Display software license"), -1},
48 { 0 } 50 { 0 }
49 }; 51 };
50 52
...@@ -174,6 +176,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -174,6 +176,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
174 source_file = arg; 176 source_file = arg;
175 break; 177 break;
176 178
179 case ARG_LICENSE:
180 mh_license (argp_program_version);
181 break;
182
177 default: 183 default:
178 return 1; 184 return 1;
179 } 185 }
......
...@@ -61,6 +61,8 @@ static struct argp_option options[] = { ...@@ -61,6 +61,8 @@ static struct argp_option options[] = {
61 {"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0, 61 {"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0,
62 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")}, 62 N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
63 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, N_("Use draft file preserved after the last session") }, 63 {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, N_("Use draft file preserved after the last session") },
64 {"license", ARG_LICENSE, 0, 0,
65 N_("Display software license"), -1},
64 { 0 } 66 { 0 }
65 }; 67 };
66 68
...@@ -200,6 +202,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -200,6 +202,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
200 argp_error (state, _("option is not yet implemented")); 202 argp_error (state, _("option is not yet implemented"));
201 exit (1); 203 exit (1);
202 204
205 case ARG_LICENSE:
206 mh_license (argp_program_version);
207 break;
208
203 default: 209 default:
204 return 1; 210 return 1;
205 } 211 }
......
...@@ -39,8 +39,12 @@ static struct argp_option options[] = { ...@@ -39,8 +39,12 @@ static struct argp_option options[] = {
39 N_("Specify the folder to delete")}, 39 N_("Specify the folder to delete")},
40 {"interactive", ARG_INTERACTIVE, N_("BOOL"), OPTION_ARG_OPTIONAL, 40 {"interactive", ARG_INTERACTIVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
41 N_("Interactive mode: ask for confirmation before removing each folder")}, 41 N_("Interactive mode: ask for confirmation before removing each folder")},
42 {"nointeractive", ARG_NOINTERACTIVE, NULL, OPTION_HIDDEN, ""},
42 {"recursive", ARG_RECURSIVE, NULL, 0, 43 {"recursive", ARG_RECURSIVE, NULL, 0,
43 N_("Recursively delete all subfolders")}, 44 N_("Recursively delete all subfolders")},
45 {"norecursive", ARG_NORECURSIVE, NULL, OPTION_HIDDEN, ""},
46 {"license", ARG_LICENSE, 0, 0,
47 N_("Display software license"), -1},
44 { 0 } 48 { 0 }
45 }; 49 };
46 50
...@@ -68,10 +72,22 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -68,10 +72,22 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
68 interactive = is_true (arg); 72 interactive = is_true (arg);
69 break; 73 break;
70 74
75 case ARG_NOINTERACTIVE:
76 interactive = 0;
77 break;
78
71 case ARG_RECURSIVE: 79 case ARG_RECURSIVE:
72 recurse = is_true (arg); 80 recurse = is_true (arg);
73 break; 81 break;
74 82
83 case ARG_NORECURSIVE:
84 recurse = 0;
85 break;
86
87 case ARG_LICENSE:
88 mh_license (argp_program_version);
89 break;
90
75 default: 91 default:
76 return 1; 92 return 1;
77 } 93 }
......
...@@ -28,6 +28,8 @@ static char args_doc[] = N_("[+folder] [msgs]"); ...@@ -28,6 +28,8 @@ static char args_doc[] = N_("[+folder] [msgs]");
28 static struct argp_option options[] = { 28 static struct argp_option options[] = {
29 {"folder", ARG_FOLDER, N_("FOLDER"), 0, 29 {"folder", ARG_FOLDER, N_("FOLDER"), 0,
30 N_("Specify folder to operate upon")}, 30 N_("Specify folder to operate upon")},
31 {"license", ARG_LICENSE, 0, 0,
32 N_("Display software license"), -1},
31 { 0 } 33 { 0 }
32 }; 34 };
33 35
...@@ -45,6 +47,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -45,6 +47,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
45 current_folder = arg; 47 current_folder = arg;
46 break; 48 break;
47 49
50 case ARG_LICENSE:
51 mh_license (argp_program_version);
52 break;
53
48 default: 54 default:
49 return 1; 55 return 1;
50 } 56 }
......
...@@ -37,6 +37,7 @@ static struct argp_option options[] = { ...@@ -37,6 +37,7 @@ static struct argp_option options[] = {
37 N_("Specify folder to scan")}, 37 N_("Specify folder to scan")},
38 {"clear", ARG_CLEAR, N_("BOOL"), OPTION_ARG_OPTIONAL, 38 {"clear", ARG_CLEAR, N_("BOOL"), OPTION_ARG_OPTIONAL,
39 N_("Clear screen after displaying the list")}, 39 N_("Clear screen after displaying the list")},
40 {"noclear", ARG_NOCLEAR, NULL, OPTION_HIDDEN, ""},
40 {"form", ARG_FORM, N_("FILE"), 0, 41 {"form", ARG_FORM, N_("FILE"), 0,
41 N_("Read format from given file")}, 42 N_("Read format from given file")},
42 {"format", ARG_FORMAT, N_("FORMAT"), 0, 43 {"format", ARG_FORMAT, N_("FORMAT"), 0,
...@@ -47,6 +48,7 @@ static struct argp_option options[] = { ...@@ -47,6 +48,7 @@ static struct argp_option options[] = {
47 N_("Set output width")}, 48 N_("Set output width")},
48 {"reverse", ARG_REVERSE, N_("BOOL"), OPTION_ARG_OPTIONAL, 49 {"reverse", ARG_REVERSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
49 N_("List messages in reverse order")}, 50 N_("List messages in reverse order")},
51 {"noreverse", ARG_NOREVERSE, NULL, OPTION_HIDDEN, ""},
50 {"file", ARG_FILE, N_("FILE"), 0, 52 {"file", ARG_FILE, N_("FILE"), 0,
51 N_("[Not yet implemented]")}, 53 N_("[Not yet implemented]")},
52 54
...@@ -96,6 +98,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -96,6 +98,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
96 clear = is_true(arg); 98 clear = is_true(arg);
97 break; 99 break;
98 100
101 case ARG_NOCLEAR:
102 clear = 0;
103 break;
104
99 case ARG_FORM: 105 case ARG_FORM:
100 mh_read_formfile (arg, &format_str); 106 mh_read_formfile (arg, &format_str);
101 break; 107 break;
...@@ -121,6 +127,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -121,6 +127,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
121 reverse = is_true(arg); 127 reverse = is_true(arg);
122 break; 128 break;
123 129
130 case ARG_NOREVERSE:
131 reverse = 0;
132 break;
133
124 case ARG_FILE: 134 case ARG_FILE:
125 argp_error (state, _("option is not yet implemented")); 135 argp_error (state, _("option is not yet implemented"));
126 break; 136 break;
......
...@@ -71,6 +71,8 @@ static struct argp_option options[] = { ...@@ -71,6 +71,8 @@ static struct argp_option options[] = {
71 {"nowatch", ARG_NOWATCH, NULL, OPTION_HIDDEN, "" }, 71 {"nowatch", ARG_NOWATCH, NULL, OPTION_HIDDEN, "" },
72 {"width", ARG_WIDTH, N_("NUMBER"), 0, 72 {"width", ARG_WIDTH, N_("NUMBER"), 0,
73 N_("* Make header fields no longer than NUMBER columns") }, 73 N_("* Make header fields no longer than NUMBER columns") },
74 {"license", ARG_LICENSE, 0, 0,
75 N_("Display software license"), -1},
74 { 0 } 76 { 0 }
75 }; 77 };
76 78
...@@ -224,6 +226,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -224,6 +226,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
224 } 226 }
225 break; 227 break;
226 228
229 case ARG_LICENSE:
230 mh_license (argp_program_version);
231 break;
232
227 default: 233 default:
228 return 1; 234 return 1;
229 } 235 }
......
...@@ -73,6 +73,10 @@ static struct argp_option options[] = { ...@@ -73,6 +73,10 @@ static struct argp_option options[] = {
73 N_("Use shell algorithm"), 40 }, 73 N_("Use shell algorithm"), 40 },
74 {"quicksort", ARG_QUICKSORT, 0, 0, 74 {"quicksort", ARG_QUICKSORT, 0, 0,
75 N_("Use quicksort algorithm (default)"), 40 }, 75 N_("Use quicksort algorithm (default)"), 40 },
76
77 {"license", ARG_LICENSE, 0, 0,
78 N_("Display software license"), -1},
79
76 { NULL }, 80 { NULL },
77 }; 81 };
78 82
...@@ -185,6 +189,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -185,6 +189,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
185 algorithm = key; 189 algorithm = key;
186 break; 190 break;
187 191
192 case ARG_LICENSE:
193 mh_license (argp_program_version);
194 break;
195
188 default: 196 default:
189 return 1; 197 return 1;
190 } 198 }
......
...@@ -34,6 +34,10 @@ static struct argp_option options[] = { ...@@ -34,6 +34,10 @@ static struct argp_option options[] = {
34 {"editor", ARG_EDITOR, N_("PROG"), 0, N_("Set the editor program to use")}, 34 {"editor", ARG_EDITOR, N_("PROG"), 0, N_("Set the editor program to use")},
35 {"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")}, 35 {"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
36 {"prompt", ARG_PROMPT, N_("STRING"), 0, N_("Set the prompt")}, 36 {"prompt", ARG_PROMPT, N_("STRING"), 0, N_("Set the prompt")},
37
38 {"license", ARG_LICENSE, 0, 0,
39 N_("Display software license"), -1},
40
37 { NULL } 41 { NULL }
38 }; 42 };
39 43
...@@ -80,6 +84,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -80,6 +84,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
80 wh_env.prompt = arg; 84 wh_env.prompt = arg;
81 break; 85 break;
82 86
87 case ARG_LICENSE:
88 mh_license (argp_program_version);
89 break;
90
83 default: 91 default:
84 return 1; 92 return 1;
85 } 93 }
......
...@@ -37,6 +37,10 @@ static struct argp_option options[] = { ...@@ -37,6 +37,10 @@ static struct argp_option options[] = {
37 {"check", ARG_CHECK, N_("BOOL"), OPTION_ARG_OPTIONAL, 37 {"check", ARG_CHECK, N_("BOOL"), OPTION_ARG_OPTIONAL,
38 N_("Check if addresses are deliverable") }, 38 N_("Check if addresses are deliverable") },
39 {"nocheck", ARG_NOCHECK, NULL, OPTION_HIDDEN, "" }, 39 {"nocheck", ARG_NOCHECK, NULL, OPTION_HIDDEN, "" },
40
41 {"license", ARG_LICENSE, 0, 0,
42 N_("Display software license"), -1},
43
40 {NULL} 44 {NULL}
41 }; 45 };
42 46
...@@ -89,6 +93,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state) ...@@ -89,6 +93,10 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
89 check_recipients = 0; 93 check_recipients = 0;
90 break; 94 break;
91 95
96 case ARG_LICENSE:
97 mh_license (argp_program_version);
98 break;
99
92 default: 100 default:
93 return 1; 101 return 1;
94 } 102 }
......