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