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