/[public]/getopt/trunk/getopt.c
ViewVC logotype

Diff of /getopt/trunk/getopt.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 320 Revision 371
1/* 1/*
2 * getopt.c - Enhanced implementation of BSD getopt(1) 2 * getopt.c - Enhanced implementation of BSD getopt(1)
3 * Copyright (c) 1997-2005 Frodo Looijaard <frodo@frodo.looijaard.name> 3 * Copyright (c) 1997-2014 Frodo Looijaard <frodo@frodo.looijaard.name>
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify 5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or 7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version. 8 * (at your option) any later version.
… …
10 * This program is distributed in the hope that it will be useful, 10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details. 13 * GNU General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU General Public License 15 * You should have received a copy of the GNU General Public License along
16 * along with this program; if not, write to the Free Software 16 * with this program; if not, write to the Free Software Foundation, Inc.,
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 */ 18 */
19 19
20/* 20/*
21 * Version 1.0-b4: Tue Sep 23 1997. First public release. 21 * Version 1.0-b4: Tue Sep 23 1997. First public release.
22 * Version 1.0: Wed Nov 19 1997. 22 * Version 1.0: Wed Nov 19 1997.
23 * Bumped up the version number to 1.0 23 * Bumped up the version number to 1.0
24 * Fixed minor typo (CSH instead of TCSH) 24 * Fixed minor typo (CSH instead of TCSH)
25 * Version 1.0.1: Tue Jun 3 1998 25 * Version 1.0.1: Tue Jun 3 1998
26 * Fixed sizeof instead of strlen bug 26 * Fixed sizeof instead of strlen bug
27 * Bumped up the version number to 1.0.1 27 * Bumped up the version number to 1.0.1
… …
31 * Version 1.0.5: Tue Jun 22 1999 31 * Version 1.0.5: Tue Jun 22 1999
32 * Make -u option work (not present) 32 * Make -u option work (not present)
33 * Version 1.0.6: Tue Jun 27 2000 33 * Version 1.0.6: Tue Jun 27 2000
34 * No important changes 34 * No important changes
35 * Version 1.1.0: Tue Jun 30 2000 35 * Version 1.1.0: Tue Jun 30 2000
36 * Added NLS support (partly written by Arkadiusz Mi<B6>kiewicz 36 * Added NLS support (partly written by Arkadiusz Miśkiewicz
37 * <misiek@pld.org.pl>) 37 * <misiek@pld.org.pl>)
38 * Version 1.1.4: Mon Nov 7 2005 38 * Version 1.1.4: Mon Nov 7 2005
39 * Fixed a few type's in the manpage 39 * Fixed a few type's in the manpage
40 * Version 1.1.5: Sun Aug 12 2012
41 * Sync with util-linux-2.21, fixed build problems, many new translations
42 * Version 1.1.6: ??? 2014
43 * Sync with util-linux git 20141120, detect ambiguous long options
40 */ 44 */
41 45
42/* Exit codes: 46/* Exit codes:
43 * 0) No errors, succesful operation. 47 * 0) No errors, successful operation.
44 * 1) getopt(3) returned an error. 48 * 1) getopt(3) returned an error.
45 * 2) A problem with parameter parsing for getopt(1). 49 * 2) A problem with parameter parsing for getopt(1).
46 * 3) Internal error, out of memory 50 * 3) Internal error, out of memory
47 * 4) Returned for -T 51 * 4) Returned for -T
48 */ 52 */
… …
61#include <getopt.h> 65#include <getopt.h>
62#else 66#else
63#include "getopt.h" 67#include "getopt.h"
64#endif 68#endif
65 69
70#include "util-linux-compat.h"
66#include "nls.h" 71#include "nls.h"
72#include "xalloc.h"
67 73
68/* NON_OPT is the code that is returned when a non-option is found in '+' 74/* NON_OPT is the code that is returned when a non-option is found in '+'
69 * mode */ 75 * mode */
70#define NON_OPT 1 76#define NON_OPT 1
71/* LONG_OPT is the code that is returned when a long option is found. */ 77/* LONG_OPT is the code that is returned when a long option is found. */
72#define LONG_OPT 2 78#define LONG_OPT 0
73 79
74/* The shells recognized. */ 80/* The shells recognized. */
75typedef enum { BASH, TCSH } shell_t; 81typedef enum { BASH, TCSH } shell_t;
76 82
77 83
78/* Some global variables that tells us how to parse. */ 84/* Some global variables that tells us how to parse. */
79shell_t shell = BASH; /* The shell we generate output for. */ 85static shell_t shell = BASH; /* The shell we generate output for. */
80int quiet_errors = 0; /* 0 is not quiet. */ 86static int quiet_errors = 0; /* 0 is not quiet. */
81int quiet_output = 0; /* 0 is not quiet. */ 87static int quiet_output = 0; /* 0 is not quiet. */
82int quote = 1; /* 1 is do quote. */ 88static int quote = 1; /* 1 is do quote. */
83 89
90/* Allow changing which getopt is in use with function pointer */
84int (*getopt_long_fp) (int argc, char *const *argv, const char *optstr, 91int (*getopt_long_fp) (int argc, char *const *argv, const char *optstr,
85 const struct option * longopts, int *longindex); 92 const struct option * longopts, int *longindex);
86 93
87/* Function prototypes */ 94/* Function prototypes */
88void *our_malloc(size_t size);
89void *our_realloc(void *ptr, size_t size);
90const char *normalize(const char *arg); 95static const char *normalize(const char *arg);
91int generate_output(char * argv[], int argc, const char *optstr, 96static int generate_output(char *argv[], int argc, const char *optstr,
92 const struct option *longopts); 97 const struct option *longopts);
93int main(int argc, char *argv[]);
94void parse_error(const char *message); 98static void parse_error(const char *message);
95void add_long_options(char *options); 99static void add_long_options(char *options);
96void add_longopt(const char *name, int has_arg); 100static void add_longopt(const char *name, int has_arg);
97void print_help(void); 101static void print_help(void);
98void set_shell(const char *new_shell); 102static void set_shell(const char *new_shell);
99void set_initial_shell(void);
100
101void *our_malloc(size_t size)
102{
103 void *ret=malloc(size);
104 if (! ret) {
105 fprintf(stderr, ("%s: Out of memory!\n"), "getopt");
106 exit(XALLOC_EXIT_CODE);
107 }
108 return(ret);
109}
110
111void *our_realloc(void *ptr, size_t size)
112{
113 void *ret=realloc(ptr, size);
114 if (! ret && size) {
115 fprintf(stderr, ("%s: Out of memory!\n"), "getopt");
116 exit(XALLOC_EXIT_CODE);
117 }
118 return(ret);
119}
120 103
121/* 104/*
122 * This function 'normalizes' a single argument: it puts single quotes 105 * This function 'normalizes' a single argument: it puts single quotes
123 * around it and escapes other special characters. If quote is false, it 106 * around it and escapes other special characters. If quote is false, it
124 * just returns its argument. 107 * just returns its argument.
125 * 108 *
126 * Bash only needs special treatment for single quotes; tcsh also recognizes 109 * Bash only needs special treatment for single quotes; tcsh also recognizes
127 * exclamation marks within single quotes, and nukes whitespace. This 110 * exclamation marks within single quotes, and nukes whitespace. This
128 * function returns a pointer to a buffer that is overwritten by each call. 111 * function returns a pointer to a buffer that is overwritten by each call.
129 */ 112 */
130const char *normalize(const char *arg) 113static const char *normalize(const char *arg)
131{ 114{
132 static char *BUFFER = NULL; 115 static char *BUFFER = NULL;
133 const char *argptr = arg; 116 const char *argptr = arg;
134 char *bufptr; 117 char *bufptr;
135 118
136 if (BUFFER != NULL)
137 free(BUFFER); 119 free(BUFFER);
138 120
139 if (!quote) { 121 if (!quote) {
140 /* Just copy arg */ 122 /* Just copy arg */
141 BUFFER = our_malloc(strlen(arg)+1); 123 BUFFER = xmalloc(strlen(arg) + 1);
142
143 strcpy(BUFFER, arg); 124 strcpy(BUFFER, arg);
144 return BUFFER; 125 return BUFFER;
145 } 126 }
146 127
147 /* 128 /*
148 * Each character in arg may take upto four characters in the 129 * Each character in arg may take up to four characters in the
149 * result: For a quote we need a closing quote, a backslash, a quote 130 * result: For a quote we need a closing quote, a backslash, a quote
150 * and an opening quote! We need also the global opening and closing 131 * and an opening quote! We need also the global opening and closing
151 * quote, and one extra character for '\0'. 132 * quote, and one extra character for '\0'.
152 */ 133 */
153 BUFFER = our_malloc(strlen(arg)*4+3); 134 BUFFER = xmalloc(strlen(arg) * 4 + 3);
154 135
155 bufptr = BUFFER; 136 bufptr = BUFFER;
156 *bufptr++ = '\''; 137 *bufptr++ = '\'';
157 138
158 while (*argptr) { 139 while (*argptr) {
… …
186 *bufptr++ = '\''; 167 *bufptr++ = '\'';
187 *bufptr++ = '\0'; 168 *bufptr++ = '\0';
188 return BUFFER; 169 return BUFFER;
189} 170}
190 171
191/* 172/*
192 * Generate the output. argv[0] is the program name (used for reporting errors). 173 * Generate the output. argv[0] is the program name (used for reporting errors).
193 * argv[1..] contains the options to be parsed. argc must be the number of 174 * argv[1..] contains the options to be parsed. argc must be the number of
194 * elements in argv (ie. 1 if there are no options, only the program name), 175 * elements in argv (ie. 1 if there are no options, only the program name),
195 * optstr must contain the short options, and longopts the long options. 176 * optstr must contain the short options, and longopts the long options.
196 * Other settings are found in global variables. 177 * Other settings are found in global variables.
197 */ 178 */
198int generate_output(char * argv[], int argc, const char *optstr, 179static int generate_output(char *argv[], int argc, const char *optstr,
199 const struct option *longopts) 180 const struct option *longopts)
200{ 181{
201 int exit_code = EXIT_SUCCESS; /* Assume everything will be OK */ 182 int exit_code = EXIT_SUCCESS; /* Assume everything will be OK */
202 int opt; 183 int opt;
203 int longindex; 184 int longindex;
204 const char *charptr; 185 const char *charptr;
… …
218 if (opt == LONG_OPT) { 199 if (opt == LONG_OPT) {
219 printf(" --%s", longopts[longindex].name); 200 printf(" --%s", longopts[longindex].name);
220 if (longopts[longindex].has_arg) 201 if (longopts[longindex].has_arg)
221 printf(" %s", normalize(optarg ? optarg : "")); 202 printf(" %s", normalize(optarg ? optarg : ""));
222 } else if (opt == NON_OPT) 203 } else if (opt == NON_OPT)
223 printf(" %s", normalize(optarg)); 204 printf(" %s", normalize(optarg ? optarg : ""));
224 else { 205 else {
225 printf(" -%c", opt); 206 printf(" -%c", opt);
226 charptr = strchr(optstr, opt); 207 charptr = strchr(optstr, opt);
227 if (charptr != NULL && *++charptr == ':') 208 if (charptr != NULL && *++charptr == ':')
228 printf(" %s", normalize(optarg ? optarg : "")); 209 printf(" %s", normalize(optarg ? optarg : ""));
… …
240 221
241/* 222/*
242 * Report an error when parsing getopt's own arguments. If message is NULL, 223 * Report an error when parsing getopt's own arguments. If message is NULL,
243 * we already sent a message, we just exit with a helpful hint. 224 * we already sent a message, we just exit with a helpful hint.
244 */ 225 */
245void parse_error(const char *message) 226static void __attribute__ ((__noreturn__)) parse_error(const char *message)
246{ 227{
247 if (message) 228 if (message)
248 fprintf(stderr, "getopt: %s\n", message); 229 warnx("%s", message);
249 fputs(_("Try `getopt --help' for more information.\n"), stderr); 230 fprintf(stderr, _("Try `%s --help' for more information.\n"),
231 program_invocation_short_name);
250 exit(PARAMETER_EXIT_CODE); 232 exit(PARAMETER_EXIT_CODE);
251} 233}
252 234
253static struct option *long_options = NULL; 235static struct option *long_options = NULL;
254static int long_options_length = 0; /* Length of array */ 236static int long_options_length = 0; /* Length of array */
255static int long_options_nr = 0; /* Nr of used elements in array */ 237static int long_options_nr = 0; /* Nr of used elements in array */
256#define LONG_OPTIONS_INCR 10 238#define LONG_OPTIONS_INCR 10
257#define init_longopt() add_longopt(NULL,0) 239#define init_longopt() add_longopt(NULL,0)
258 240
259/* Register a long option. The contents of name is copied. */ 241/* Register a long option. The contents of name is copied. */
260void add_longopt(const char *name, int has_arg) 242static void add_longopt(const char *name, int has_arg)
261{ 243{
262 char *tmp; 244 char *tmp;
245 static int flag;
246
263 if (!name) { 247 if (!name) {
264 /* init */ 248 /* init */
265 free(long_options); 249 free(long_options);
266 long_options = NULL; 250 long_options = NULL;
267 long_options_length = 0; 251 long_options_length = 0;
268 long_options_nr = 0; 252 long_options_nr = 0;
269 } 253 }
270 254
271 if (long_options_nr == long_options_length) { 255 if (long_options_nr == long_options_length) {
272 long_options_length += LONG_OPTIONS_INCR; 256 long_options_length += LONG_OPTIONS_INCR;
273 long_options = our_realloc(long_options, 257 long_options = xrealloc(long_options,
274 sizeof(struct option) * 258 sizeof(struct option) *
275 long_options_length); 259 long_options_length);
276 } 260 }
277 261
278 long_options[long_options_nr].name = NULL; 262 long_options[long_options_nr].name = NULL;
279 long_options[long_options_nr].has_arg = 0; 263 long_options[long_options_nr].has_arg = 0;
280 long_options[long_options_nr].flag = NULL; 264 long_options[long_options_nr].flag = NULL;
281 long_options[long_options_nr].val = 0; 265 long_options[long_options_nr].val = 0;
282 266
283 if (long_options_nr) { 267 if (long_options_nr && name) {
284 /* Not for init! */ 268 /* Not for init! */
285 long_options[long_options_nr - 1].has_arg = has_arg; 269 long_options[long_options_nr - 1].has_arg = has_arg;
286 long_options[long_options_nr - 1].flag = NULL; 270 long_options[long_options_nr - 1].flag = &flag;
287 long_options[long_options_nr - 1].val = LONG_OPT; 271 long_options[long_options_nr - 1].val = long_options_nr;
288 tmp = our_malloc(strlen(name) + 1); 272 tmp = xmalloc(strlen(name) + 1);
289 strcpy(tmp, name); 273 strcpy(tmp, name);
290 long_options[long_options_nr - 1].name = tmp; 274 long_options[long_options_nr - 1].name = tmp;
291 } 275 }
292 long_options_nr++; 276 long_options_nr++;
293} 277}
294 278
295 279
296/* 280/*
297 * Register several long options. options is a string of long options, 281 * Register several long options. options is a string of long options,
298 * separated by commas or whitespace. This nukes options! 282 * separated by commas or whitespace. This nukes options!
299 */ 283 */
300void add_long_options(char *options) 284static void add_long_options(char *options)
301{ 285{
302 int arg_opt; 286 int arg_opt;
303 char *tokptr = strtok(options, ", \t\n"); 287 char *tokptr = strtok(options, ", \t\n");
304 while (tokptr) { 288 while (tokptr) {
305 arg_opt = no_argument; 289 arg_opt = no_argument;
… …
321 } 305 }
322 tokptr = strtok(NULL, ", \t\n"); 306 tokptr = strtok(NULL, ", \t\n");
323 } 307 }
324} 308}
325 309
326void set_shell(const char *new_shell) 310static void set_shell(const char *new_shell)
327{ 311{
328 if (!strcmp(new_shell, "bash")) 312 if (!strcmp(new_shell, "bash"))
329 shell = BASH; 313 shell = BASH;
330 else if (!strcmp(new_shell, "tcsh")) 314 else if (!strcmp(new_shell, "tcsh"))
331 shell = TCSH; 315 shell = TCSH;
… …
336 else 320 else
337 parse_error(_ 321 parse_error(_
338 ("unknown shell after -s or --shell argument")); 322 ("unknown shell after -s or --shell argument"));
339} 323}
340 324
341void print_help(void) 325static void __attribute__ ((__noreturn__)) print_help(void)
342{ 326{
343 fputs(_("Usage: getopt optstring parameters\n"), stderr); 327 fputs(USAGE_HEADER, stderr);
344 fputs(_(" getopt [options] [--] optstring parameters\n"), stderr); 328 fprintf(stderr, _(
345 fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr); 329 " %1$s optstring parameters\n"
346 fputs(_(" parameters\n"), stderr); 330 " %1$s [options] [--] optstring parameters\n"
331 " %1$s [options] -o|--options optstring [options] [--] parameters\n"),
332 program_invocation_short_name);
333
334 fputs(USAGE_OPTIONS, stderr);
347 fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr); 335 fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr);
348 fputs(_(" -h, --help This small usage guide\n"), stderr);
349 fputs(_(" -l, --longoptions=longopts Long options to be recognized\n"), stderr); 336 fputs(_(" -l, --longoptions <longopts> Long options to be recognized\n"), stderr);
350 fputs(_(" -n, --name=progname The name under which errors are reported\n"), stderr); 337 fputs(_(" -n, --name <progname> The name under which errors are reported\n"), stderr);
351 fputs(_(" -o, --options=optstring Short options to be recognized\n"), stderr); 338 fputs(_(" -o, --options <optstring> Short options to be recognized\n"), stderr);
352 fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr); 339 fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr);
353 fputs(_(" -Q, --quiet-output No normal output\n"), stderr); 340 fputs(_(" -Q, --quiet-output No normal output\n"), stderr);
354 fputs(_(" -s, --shell=shell Set shell quoting conventions\n"), stderr); 341 fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr);
355 fputs(_(" -T, --test Test for getopt(1) version\n"), stderr); 342 fputs(_(" -T, --test Test for getopt(1) version\n"), stderr);
356 fputs(_(" -u, --unqote Do not quote the output\n"), stderr); 343 fputs(_(" -u, --unquoted Do not quote the output\n"), stderr);
357 fputs(_(" -V, --version Output version information\n"), stderr); 344 fputs(USAGE_SEPARATOR, stderr);
345 fputs(USAGE_HELP, stderr);
346 fputs(USAGE_VERSION, stderr);
347 fprintf(stderr, USAGE_MAN_TAIL("getopt(1)"));
358 exit(PARAMETER_EXIT_CODE); 348 exit(PARAMETER_EXIT_CODE);
359} 349}
360 350
351int main(int argc, char *argv[])
352{
353 char *optstr = NULL;
354 char *name = NULL;
355 int opt;
356 int compatible = 0;
357
358 /* Stop scanning as soon as a non-option argument is found! */
359 static const char *shortopts = "+ao:l:n:qQs:TuhV";
361static struct option longopts[] = { 360 static const struct option longopts[] = {
362 {"options", required_argument, NULL, 'o'}, 361 {"options", required_argument, NULL, 'o'},
363 {"longoptions", required_argument, NULL, 'l'}, 362 {"longoptions", required_argument, NULL, 'l'},
364 {"quiet", no_argument, NULL, 'q'}, 363 {"quiet", no_argument, NULL, 'q'},
365 {"quiet-output", no_argument, NULL, 'Q'}, 364 {"quiet-output", no_argument, NULL, 'Q'},
366 {"shell", required_argument, NULL, 's'}, 365 {"shell", required_argument, NULL, 's'},
… …
371 {"name", required_argument, NULL, 'n'}, 370 {"name", required_argument, NULL, 'n'},
372 {"version", no_argument, NULL, 'V'}, 371 {"version", no_argument, NULL, 'V'},
373 {NULL, 0, NULL, 0} 372 {NULL, 0, NULL, 0}
374 }; 373 };
375 374
376/* Stop scanning as soon as a non-option argument is found! */
377static const char *shortopts = "+ao:l:n:qQs:TuhV";
378
379int main(int argc, char *argv[])
380{
381 char *optstr = NULL;
382 char *name = NULL;
383 int opt;
384 int compatible = 0;
385
386#if WITHOUT_GETTEXT
387#else
388 setlocale(LC_ALL, ""); 375 setlocale(LC_ALL, "");
389 bindtextdomain(PACKAGE, LOCALEDIR); 376 bindtextdomain(PACKAGE, LOCALEDIR);
390 textdomain(PACKAGE); 377 textdomain(PACKAGE);
391#endif
392 378
393 init_longopt(); 379 init_longopt();
394 getopt_long_fp = getopt_long; 380 getopt_long_fp = getopt_long;
395 381
396 if (getenv("GETOPT_COMPATIBLE")) 382 if (getenv("GETOPT_COMPATIBLE"))
… …
406 return EXIT_SUCCESS; 392 return EXIT_SUCCESS;
407 } else 393 } else
408 parse_error(_("missing optstring argument")); 394 parse_error(_("missing optstring argument"));
409 } 395 }
410 396
411
412 if (argv[1][0] != '-' || compatible) { 397 if (argv[1][0] != '-' || compatible) {
413 quote = 0; 398 quote = 0;
414 optstr = our_malloc(strlen(argv[1]) + 1); 399 optstr = xmalloc(strlen(argv[1]) + 1);
415 strcpy(optstr, argv[1] + strspn(argv[1], "-+")); 400 strcpy(optstr, argv[1] + strspn(argv[1], "-+"));
416 argv[1] = argv[0]; 401 argv[1] = argv[0];
417 return generate_output(argv + 1, argc - 1, optstr, 402 return generate_output(argv + 1, argc - 1, optstr,
418 long_options); 403 long_options);
419 } 404 }
… …
425 getopt_long_fp = getopt_long_only; 410 getopt_long_fp = getopt_long_only;
426 break; 411 break;
427 case 'h': 412 case 'h':
428 print_help(); 413 print_help();
429 case 'o': 414 case 'o':
430 if (optstr)
431 free(optstr); 415 free(optstr);
432 optstr = our_malloc(strlen(optarg)+1); 416 optstr = xmalloc(strlen(optarg) + 1);
433 strcpy(optstr, optarg); 417 strcpy(optstr, optarg);
434 break; 418 break;
435 case 'l': 419 case 'l':
436 add_long_options(optarg); 420 add_long_options(optarg);
437 break; 421 break;
438 case 'n': 422 case 'n':
439 if (name)
440 free(name); 423 free(name);
441 name = our_malloc(strlen(optarg)+1); 424 name = xmalloc(strlen(optarg) + 1);
442 strcpy(name, optarg); 425 strcpy(name, optarg);
443 break; 426 break;
444 case 'q': 427 case 'q':
445 quiet_errors = 1; 428 quiet_errors = 1;
446 break; 429 break;
… …
454 return TEST_EXIT_CODE; 437 return TEST_EXIT_CODE;
455 case 'u': 438 case 'u':
456 quote = 0; 439 quote = 0;
457 break; 440 break;
458 case 'V': 441 case 'V':
459 printf(_("getopt (enhanced) 1.1.4\n")); 442 printf(UTIL_LINUX_VERSION);
460 return EXIT_SUCCESS; 443 return EXIT_SUCCESS;
461 case '?': 444 case '?':
462 case ':': 445 case ':':
463 parse_error(NULL); 446 parse_error(NULL);
464 default: 447 default:
465 parse_error(_("internal error, contact the author.")); 448 parse_error(_("internal error, contact the author."));
466 } 449 }
467 450
468 if (!optstr) { 451 if (!optstr) {
469 if (optind >= argc) 452 if (optind >= argc)
470 parse_error(_("missing optstring argument")); 453 parse_error(_("missing optstring argument"));
471 else { 454 else {
472 optstr=our_malloc(strlen(argv[optind])+1); 455 optstr = xmalloc(strlen(argv[optind]) + 1);
473 strcpy(optstr, argv[optind]); 456 strcpy(optstr, argv[optind]);
474 optind++; 457 optind++;
475 } 458 }
476 } 459 }
477 if (name) 460 if (name)
478 argv[optind - 1] = name; 461 argv[optind - 1] = name;
479 else 462 else
480 argv[optind - 1] = argv[0]; 463 argv[optind - 1] = argv[0];
464
481 return generate_output(argv + optind - 1, argc-optind + 1, 465 return generate_output(argv + optind - 1, argc-optind + 1,
482 optstr, long_options); 466 optstr, long_options);
483} 467}
Legend:
Removed from v.320  
changed lines
  Added in v.371
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26