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