/[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 377
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: Mon Nov 24 2014
43 * Sync with util-linux git 20141120, detect ambiguous long options, fix
44 * backslash problem in tcsh
40 */ 45 */
41 46
42/* Exit codes: 47/* Exit codes:
43 * 0) No errors, succesful operation. 48 * 0) No errors, successful operation.
44 * 1) getopt(3) returned an error. 49 * 1) getopt(3) returned an error.
45 * 2) A problem with parameter parsing for getopt(1). 50 * 2) A problem with parameter parsing for getopt(1).
46 * 3) Internal error, out of memory 51 * 3) Internal error, out of memory
47 * 4) Returned for -T 52 * 4) Returned for -T
48 */ 53 */
… …
61#include <getopt.h> 66#include <getopt.h>
62#else 67#else
63#include "getopt.h" 68#include "getopt.h"
64#endif 69#endif
65 70
71#include "util-linux-compat.h"
66#include "nls.h" 72#include "nls.h"
73#include "xalloc.h"
67 74
68/* NON_OPT is the code that is returned when a non-option is found in '+' 75/* NON_OPT is the code that is returned when a non-option is found in '+'
69 * mode */ 76 * mode */
70#define NON_OPT 1 77#define NON_OPT 1
71/* LONG_OPT is the code that is returned when a long option is found. */ 78/* LONG_OPT is the code that is returned when a long option is found. */
72#define LONG_OPT 2 79#define LONG_OPT 0
73 80
74/* The shells recognized. */ 81/* The shells recognized. */
75typedef enum { BASH, TCSH } shell_t; 82typedef enum { BASH, TCSH } shell_t;
76 83
77 84
78/* Some global variables that tells us how to parse. */ 85/* Some global variables that tells us how to parse. */
79shell_t shell = BASH; /* The shell we generate output for. */ 86static shell_t shell = BASH; /* The shell we generate output for. */
80int quiet_errors = 0; /* 0 is not quiet. */ 87static int quiet_errors = 0; /* 0 is not quiet. */
81int quiet_output = 0; /* 0 is not quiet. */ 88static int quiet_output = 0; /* 0 is not quiet. */
82int quote = 1; /* 1 is do quote. */ 89static int quote = 1; /* 1 is do quote. */
83 90
91/* Allow changing which getopt is in use with function pointer */
84int (*getopt_long_fp) (int argc, char *const *argv, const char *optstr, 92int (*getopt_long_fp) (int argc, char *const *argv, const char *optstr,
85 const struct option * longopts, int *longindex); 93 const struct option * longopts, int *longindex);
86 94
87/* Function prototypes */ 95/* Function prototypes */
88void *our_malloc(size_t size);
89void *our_realloc(void *ptr, size_t size);
90const char *normalize(const char *arg); 96static const char *normalize(const char *arg);
91int generate_output(char * argv[], int argc, const char *optstr, 97static int generate_output(char *argv[], int argc, const char *optstr,
92 const struct option *longopts); 98 const struct option *longopts);
93int main(int argc, char *argv[]);
94void parse_error(const char *message); 99static void parse_error(const char *message);
95void add_long_options(char *options); 100static void add_long_options(char *options);
96void add_longopt(const char *name, int has_arg); 101static void add_longopt(const char *name, int has_arg);
97void print_help(void); 102static void print_help(void);
98void set_shell(const char *new_shell); 103static 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 104
121/* 105/*
122 * This function 'normalizes' a single argument: it puts single quotes 106 * This function 'normalizes' a single argument: it puts single quotes
123 * around it and escapes other special characters. If quote is false, it 107 * around it and escapes other special characters. If quote is false, it
124 * just returns its argument. 108 * just returns its argument.
125 * 109 *
126 * Bash only needs special treatment for single quotes; tcsh also recognizes 110 * Bash only needs special treatment for single quotes; tcsh also recognizes
127 * exclamation marks within single quotes, and nukes whitespace. This 111 * exclamation marks within single quotes, and nukes whitespace. This
128 * function returns a pointer to a buffer that is overwritten by each call. 112 * function returns a pointer to a buffer that is overwritten by each call.
129 */ 113 */
130const char *normalize(const char *arg) 114static const char *normalize(const char *arg)
131{ 115{
132 static char *BUFFER = NULL; 116 static char *BUFFER = NULL;
133 const char *argptr = arg; 117 const char *argptr = arg;
134 char *bufptr; 118 char *bufptr;
135 119
136 if (BUFFER != NULL)
137 free(BUFFER); 120 free(BUFFER);
138 121
139 if (!quote) { 122 if (!quote) {
140 /* Just copy arg */ 123 /* Just copy arg */
141 BUFFER = our_malloc(strlen(arg)+1); 124 BUFFER = xmalloc(strlen(arg) + 1);
142
143 strcpy(BUFFER, arg); 125 strcpy(BUFFER, arg);
144 return BUFFER; 126 return BUFFER;
145 } 127 }
146 128
147 /* 129 /*
148 * Each character in arg may take upto four characters in the 130 * 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 131 * 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 132 * and an opening quote! We need also the global opening and closing
151 * quote, and one extra character for '\0'. 133 * quote, and one extra character for '\0'.
152 */ 134 */
153 BUFFER = our_malloc(strlen(arg)*4+3); 135 BUFFER = xmalloc(strlen(arg) * 4 + 3);
154 136
155 bufptr = BUFFER; 137 bufptr = BUFFER;
156 *bufptr++ = '\''; 138 *bufptr++ = '\'';
157 139
158 while (*argptr) { 140 while (*argptr) {
… …
160 /* Quote: replace it with: '\'' */ 142 /* Quote: replace it with: '\'' */
161 *bufptr++ = '\''; 143 *bufptr++ = '\'';
162 *bufptr++ = '\\'; 144 *bufptr++ = '\\';
163 *bufptr++ = '\''; 145 *bufptr++ = '\'';
164 *bufptr++ = '\''; 146 *bufptr++ = '\'';
147 } else if (shell == TCSH && *argptr == '\\') {
148 /* Backslash: replace it with: '\\' */
149 *bufptr++ = '\\';
150 *bufptr++ = '\\';
165 } else if (shell == TCSH && *argptr == '!') { 151 } else if (shell == TCSH && *argptr == '!') {
166 /* Exclamation mark: replace it with: \! */ 152 /* Exclamation mark: replace it with: \! */
167 *bufptr++ = '\''; 153 *bufptr++ = '\'';
168 *bufptr++ = '\\'; 154 *bufptr++ = '\\';
169 *bufptr++ = '!'; 155 *bufptr++ = '!';
… …
186 *bufptr++ = '\''; 172 *bufptr++ = '\'';
187 *bufptr++ = '\0'; 173 *bufptr++ = '\0';
188 return BUFFER; 174 return BUFFER;
189} 175}
190 176
191/* 177/*
192 * Generate the output. argv[0] is the program name (used for reporting errors). 178 * 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 179 * 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), 180 * 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. 181 * optstr must contain the short options, and longopts the long options.
196 * Other settings are found in global variables. 182 * Other settings are found in global variables.
197 */ 183 */
198int generate_output(char * argv[], int argc, const char *optstr, 184static int generate_output(char *argv[], int argc, const char *optstr,
199 const struct option *longopts) 185 const struct option *longopts)
200{ 186{
201 int exit_code = EXIT_SUCCESS; /* Assume everything will be OK */ 187 int exit_code = EXIT_SUCCESS; /* Assume everything will be OK */
202 int opt; 188 int opt;
203 int longindex; 189 int longindex;
204 const char *charptr; 190 const char *charptr;
… …
218 if (opt == LONG_OPT) { 204 if (opt == LONG_OPT) {
219 printf(" --%s", longopts[longindex].name); 205 printf(" --%s", longopts[longindex].name);
220 if (longopts[longindex].has_arg) 206 if (longopts[longindex].has_arg)
221 printf(" %s", normalize(optarg ? optarg : "")); 207 printf(" %s", normalize(optarg ? optarg : ""));
222 } else if (opt == NON_OPT) 208 } else if (opt == NON_OPT)
223 printf(" %s", normalize(optarg)); 209 printf(" %s", normalize(optarg ? optarg : ""));
224 else { 210 else {
225 printf(" -%c", opt); 211 printf(" -%c", opt);
226 charptr = strchr(optstr, opt); 212 charptr = strchr(optstr, opt);
227 if (charptr != NULL && *++charptr == ':') 213 if (charptr != NULL && *++charptr == ':')
228 printf(" %s", normalize(optarg ? optarg : "")); 214 printf(" %s", normalize(optarg ? optarg : ""));
… …
240 226
241/* 227/*
242 * Report an error when parsing getopt's own arguments. If message is NULL, 228 * 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. 229 * we already sent a message, we just exit with a helpful hint.
244 */ 230 */
245void parse_error(const char *message) 231static void __attribute__ ((__noreturn__)) parse_error(const char *message)
246{ 232{
247 if (message) 233 if (message)
248 fprintf(stderr, "getopt: %s\n", message); 234 warnx("%s", message);
249 fputs(_("Try `getopt --help' for more information.\n"), stderr); 235 fprintf(stderr, _("Try `%s --help' for more information.\n"),
236 program_invocation_short_name);
250 exit(PARAMETER_EXIT_CODE); 237 exit(PARAMETER_EXIT_CODE);
251} 238}
252 239
253static struct option *long_options = NULL; 240static struct option *long_options = NULL;
254static int long_options_length = 0; /* Length of array */ 241static int long_options_length = 0; /* Length of array */
255static int long_options_nr = 0; /* Nr of used elements in array */ 242static int long_options_nr = 0; /* Nr of used elements in array */
256#define LONG_OPTIONS_INCR 10 243#define LONG_OPTIONS_INCR 10
257#define init_longopt() add_longopt(NULL,0) 244#define init_longopt() add_longopt(NULL,0)
258 245
259/* Register a long option. The contents of name is copied. */ 246/* Register a long option. The contents of name is copied. */
260void add_longopt(const char *name, int has_arg) 247static void add_longopt(const char *name, int has_arg)
261{ 248{
262 char *tmp; 249 char *tmp;
250 static int flag;
251
263 if (!name) { 252 if (!name) {
264 /* init */ 253 /* init */
265 free(long_options); 254 free(long_options);
266 long_options = NULL; 255 long_options = NULL;
267 long_options_length = 0; 256 long_options_length = 0;
268 long_options_nr = 0; 257 long_options_nr = 0;
269 } 258 }
270 259
271 if (long_options_nr == long_options_length) { 260 if (long_options_nr == long_options_length) {
272 long_options_length += LONG_OPTIONS_INCR; 261 long_options_length += LONG_OPTIONS_INCR;
273 long_options = our_realloc(long_options, 262 long_options = xrealloc(long_options,
274 sizeof(struct option) * 263 sizeof(struct option) *
275 long_options_length); 264 long_options_length);
276 } 265 }
277 266
278 long_options[long_options_nr].name = NULL; 267 long_options[long_options_nr].name = NULL;
279 long_options[long_options_nr].has_arg = 0; 268 long_options[long_options_nr].has_arg = 0;
280 long_options[long_options_nr].flag = NULL; 269 long_options[long_options_nr].flag = NULL;
281 long_options[long_options_nr].val = 0; 270 long_options[long_options_nr].val = 0;
282 271
283 if (long_options_nr) { 272 if (long_options_nr && name) {
284 /* Not for init! */ 273 /* Not for init! */
285 long_options[long_options_nr - 1].has_arg = has_arg; 274 long_options[long_options_nr - 1].has_arg = has_arg;
286 long_options[long_options_nr - 1].flag = NULL; 275 long_options[long_options_nr - 1].flag = &flag;
287 long_options[long_options_nr - 1].val = LONG_OPT; 276 long_options[long_options_nr - 1].val = long_options_nr;
288 tmp = our_malloc(strlen(name) + 1); 277 tmp = xmalloc(strlen(name) + 1);
289 strcpy(tmp, name); 278 strcpy(tmp, name);
290 long_options[long_options_nr - 1].name = tmp; 279 long_options[long_options_nr - 1].name = tmp;
291 } 280 }
292 long_options_nr++; 281 long_options_nr++;
293} 282}
294 283
295 284
296/* 285/*
297 * Register several long options. options is a string of long options, 286 * Register several long options. options is a string of long options,
298 * separated by commas or whitespace. This nukes options! 287 * separated by commas or whitespace. This nukes options!
299 */ 288 */
300void add_long_options(char *options) 289static void add_long_options(char *options)
301{ 290{
302 int arg_opt; 291 int arg_opt;
303 char *tokptr = strtok(options, ", \t\n"); 292 char *tokptr = strtok(options, ", \t\n");
304 while (tokptr) { 293 while (tokptr) {
305 arg_opt = no_argument; 294 arg_opt = no_argument;
… …
321 } 310 }
322 tokptr = strtok(NULL, ", \t\n"); 311 tokptr = strtok(NULL, ", \t\n");
323 } 312 }
324} 313}
325 314
326void set_shell(const char *new_shell) 315static void set_shell(const char *new_shell)
327{ 316{
328 if (!strcmp(new_shell, "bash")) 317 if (!strcmp(new_shell, "bash"))
329 shell = BASH; 318 shell = BASH;
330 else if (!strcmp(new_shell, "tcsh")) 319 else if (!strcmp(new_shell, "tcsh"))
331 shell = TCSH; 320 shell = TCSH;
… …
336 else 325 else
337 parse_error(_ 326 parse_error(_
338 ("unknown shell after -s or --shell argument")); 327 ("unknown shell after -s or --shell argument"));
339} 328}
340 329
341void print_help(void) 330static void __attribute__ ((__noreturn__)) print_help(void)
342{ 331{
343 fputs(_("Usage: getopt optstring parameters\n"), stderr); 332 fputs(USAGE_HEADER, stderr);
344 fputs(_(" getopt [options] [--] optstring parameters\n"), stderr); 333 fprintf(stderr, _(
345 fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr); 334 " %1$s optstring parameters\n"
346 fputs(_(" parameters\n"), stderr); 335 " %1$s [options] [--] optstring parameters\n"
336 " %1$s [options] -o|--options optstring [options] [--] parameters\n"),
337 program_invocation_short_name);
338
339 fputs(USAGE_OPTIONS, stderr);
347 fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr); 340 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); 341 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); 342 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); 343 fputs(_(" -o, --options <optstring> Short options to be recognized\n"), stderr);
352 fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr); 344 fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr);
353 fputs(_(" -Q, --quiet-output No normal output\n"), stderr); 345 fputs(_(" -Q, --quiet-output No normal output\n"), stderr);
354 fputs(_(" -s, --shell=shell Set shell quoting conventions\n"), stderr); 346 fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr);
355 fputs(_(" -T, --test Test for getopt(1) version\n"), stderr); 347 fputs(_(" -T, --test Test for getopt(1) version\n"), stderr);
356 fputs(_(" -u, --unqote Do not quote the output\n"), stderr); 348 fputs(_(" -u, --unquoted Do not quote the output\n"), stderr);
357 fputs(_(" -V, --version Output version information\n"), stderr); 349 fputs(USAGE_SEPARATOR, stderr);
350 fputs(USAGE_HELP, stderr);
351 fputs(USAGE_VERSION, stderr);
352 fprintf(stderr, USAGE_MAN_TAIL("getopt(1)"));
358 exit(PARAMETER_EXIT_CODE); 353 exit(PARAMETER_EXIT_CODE);
359} 354}
360 355
356int main(int argc, char *argv[])
357{
358 char *optstr = NULL;
359 char *name = NULL;
360 int opt;
361 int compatible = 0;
362
363 /* Stop scanning as soon as a non-option argument is found! */
364 static const char *shortopts = "+ao:l:n:qQs:TuhV";
361static struct option longopts[] = { 365 static const struct option longopts[] = {
362 {"options", required_argument, NULL, 'o'}, 366 {"options", required_argument, NULL, 'o'},
363 {"longoptions", required_argument, NULL, 'l'}, 367 {"longoptions", required_argument, NULL, 'l'},
364 {"quiet", no_argument, NULL, 'q'}, 368 {"quiet", no_argument, NULL, 'q'},
365 {"quiet-output", no_argument, NULL, 'Q'}, 369 {"quiet-output", no_argument, NULL, 'Q'},
366 {"shell", required_argument, NULL, 's'}, 370 {"shell", required_argument, NULL, 's'},
… …
371 {"name", required_argument, NULL, 'n'}, 375 {"name", required_argument, NULL, 'n'},
372 {"version", no_argument, NULL, 'V'}, 376 {"version", no_argument, NULL, 'V'},
373 {NULL, 0, NULL, 0} 377 {NULL, 0, NULL, 0}
374 }; 378 };
375 379
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, ""); 380 setlocale(LC_ALL, "");
389 bindtextdomain(PACKAGE, LOCALEDIR); 381 bindtextdomain(PACKAGE, LOCALEDIR);
390 textdomain(PACKAGE); 382 textdomain(PACKAGE);
391#endif
392 383
393 init_longopt(); 384 init_longopt();
394 getopt_long_fp = getopt_long; 385 getopt_long_fp = getopt_long;
395 386
396 if (getenv("GETOPT_COMPATIBLE")) 387 if (getenv("GETOPT_COMPATIBLE"))
… …
406 return EXIT_SUCCESS; 397 return EXIT_SUCCESS;
407 } else 398 } else
408 parse_error(_("missing optstring argument")); 399 parse_error(_("missing optstring argument"));
409 } 400 }
410 401
411
412 if (argv[1][0] != '-' || compatible) { 402 if (argv[1][0] != '-' || compatible) {
413 quote = 0; 403 quote = 0;
414 optstr = our_malloc(strlen(argv[1]) + 1); 404 optstr = xmalloc(strlen(argv[1]) + 1);
415 strcpy(optstr, argv[1] + strspn(argv[1], "-+")); 405 strcpy(optstr, argv[1] + strspn(argv[1], "-+"));
416 argv[1] = argv[0]; 406 argv[1] = argv[0];
417 return generate_output(argv + 1, argc - 1, optstr, 407 return generate_output(argv + 1, argc - 1, optstr,
418 long_options); 408 long_options);
419 } 409 }
… …
425 getopt_long_fp = getopt_long_only; 415 getopt_long_fp = getopt_long_only;
426 break; 416 break;
427 case 'h': 417 case 'h':
428 print_help(); 418 print_help();
429 case 'o': 419 case 'o':
430 if (optstr)
431 free(optstr); 420 free(optstr);
432 optstr = our_malloc(strlen(optarg)+1); 421 optstr = xmalloc(strlen(optarg) + 1);
433 strcpy(optstr, optarg); 422 strcpy(optstr, optarg);
434 break; 423 break;
435 case 'l': 424 case 'l':
436 add_long_options(optarg); 425 add_long_options(optarg);
437 break; 426 break;
438 case 'n': 427 case 'n':
439 if (name)
440 free(name); 428 free(name);
441 name = our_malloc(strlen(optarg)+1); 429 name = xmalloc(strlen(optarg) + 1);
442 strcpy(name, optarg); 430 strcpy(name, optarg);
443 break; 431 break;
444 case 'q': 432 case 'q':
445 quiet_errors = 1; 433 quiet_errors = 1;
446 break; 434 break;
… …
454 return TEST_EXIT_CODE; 442 return TEST_EXIT_CODE;
455 case 'u': 443 case 'u':
456 quote = 0; 444 quote = 0;
457 break; 445 break;
458 case 'V': 446 case 'V':
459 printf(_("getopt (enhanced) 1.1.4\n")); 447 printf(UTIL_LINUX_VERSION);
460 return EXIT_SUCCESS; 448 return EXIT_SUCCESS;
461 case '?': 449 case '?':
462 case ':': 450 case ':':
463 parse_error(NULL); 451 parse_error(NULL);
464 default: 452 default:
465 parse_error(_("internal error, contact the author.")); 453 parse_error(_("internal error, contact the author."));
466 } 454 }
467 455
468 if (!optstr) { 456 if (!optstr) {
469 if (optind >= argc) 457 if (optind >= argc)
470 parse_error(_("missing optstring argument")); 458 parse_error(_("missing optstring argument"));
471 else { 459 else {
472 optstr=our_malloc(strlen(argv[optind])+1); 460 optstr = xmalloc(strlen(argv[optind]) + 1);
473 strcpy(optstr, argv[optind]); 461 strcpy(optstr, argv[optind]);
474 optind++; 462 optind++;
475 } 463 }
476 } 464 }
477 if (name) 465 if (name)
478 argv[optind - 1] = name; 466 argv[optind - 1] = name;
479 else 467 else
480 argv[optind - 1] = argv[0]; 468 argv[optind - 1] = argv[0];
469
481 return generate_output(argv + optind - 1, argc-optind + 1, 470 return generate_output(argv + optind - 1, argc-optind + 1,
482 optstr, long_options); 471 optstr, long_options);
483} 472}
Legend:
Removed from v.320  
changed lines
  Added in v.377
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26