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