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