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