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