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