--- getopt/trunk/getopt.c 2012/07/14 22:22:44 320 +++ getopt/trunk/getopt.c 2014/11/20 11:27:07 362 @@ -33,10 +33,12 @@ * Version 1.0.6: Tue Jun 27 2000 * No important changes * Version 1.1.0: Tue Jun 30 2000 - * Added NLS support (partly written by Arkadiusz Mikiewicz + * Added NLS support (partly written by Arkadiusz Miśkiewicz * ) * Version 1.1.4: Mon Nov 7 2005 * Fixed a few type's in the manpage + * Version 1.1.5: Sun Aug 12 2012 + * Sync with util-linux-2.21, fixed build problems, many new translations */ /* Exit codes: @@ -64,6 +66,7 @@ #endif #include "nls.h" +#include "xalloc.h" /* NON_OPT is the code that is returned when a non-option is found in '+' * mode */ @@ -76,47 +79,25 @@ /* Some global variables that tells us how to parse. */ -shell_t shell = BASH; /* The shell we generate output for. */ -int quiet_errors = 0; /* 0 is not quiet. */ -int quiet_output = 0; /* 0 is not quiet. */ -int quote = 1; /* 1 is do quote. */ +static shell_t shell = BASH; /* The shell we generate output for. */ +static int quiet_errors = 0; /* 0 is not quiet. */ +static int quiet_output = 0; /* 0 is not quiet. */ +static int quote = 1; /* 1 is do quote. */ +/* Allow changing which getopt is in use with function pointer */ int (*getopt_long_fp) (int argc, char *const *argv, const char *optstr, const struct option * longopts, int *longindex); /* Function prototypes */ -void *our_malloc(size_t size); -void *our_realloc(void *ptr, size_t size); -const char *normalize(const char *arg); -int generate_output(char * argv[], int argc, const char *optstr, - const struct option *longopts); +static const char *normalize(const char *arg); +static int generate_output(char *argv[], int argc, const char *optstr, + const struct option *longopts); int main(int argc, char *argv[]); -void parse_error(const char *message); -void add_long_options(char *options); -void add_longopt(const char *name, int has_arg); -void print_help(void); -void set_shell(const char *new_shell); -void set_initial_shell(void); - -void *our_malloc(size_t size) -{ - void *ret=malloc(size); - if (! ret) { - fprintf(stderr, ("%s: Out of memory!\n"), "getopt"); - exit(XALLOC_EXIT_CODE); - } - return(ret); -} - -void *our_realloc(void *ptr, size_t size) -{ - void *ret=realloc(ptr, size); - if (! ret && size) { - fprintf(stderr, ("%s: Out of memory!\n"), "getopt"); - exit(XALLOC_EXIT_CODE); - } - return(ret); -} +static void parse_error(const char *message); +static void add_long_options(char *options); +static void add_longopt(const char *name, int has_arg); +static void print_help(void); +static void set_shell(const char *new_shell); /* * This function 'normalizes' a single argument: it puts single quotes @@ -127,19 +108,17 @@ * exclamation marks within single quotes, and nukes whitespace. This * function returns a pointer to a buffer that is overwritten by each call. */ -const char *normalize(const char *arg) +static const char *normalize(const char *arg) { static char *BUFFER = NULL; const char *argptr = arg; char *bufptr; - if (BUFFER != NULL) - free(BUFFER); + free(BUFFER); if (!quote) { /* Just copy arg */ - BUFFER = our_malloc(strlen(arg)+1); - + BUFFER = xmalloc(strlen(arg) + 1); strcpy(BUFFER, arg); return BUFFER; } @@ -150,7 +129,7 @@ * and an opening quote! We need also the global opening and closing * quote, and one extra character for '\0'. */ - BUFFER = our_malloc(strlen(arg)*4+3); + BUFFER = xmalloc(strlen(arg) * 4 + 3); bufptr = BUFFER; *bufptr++ = '\''; @@ -195,8 +174,8 @@ * optstr must contain the short options, and longopts the long options. * Other settings are found in global variables. */ -int generate_output(char * argv[], int argc, const char *optstr, - const struct option *longopts) +static int generate_output(char *argv[], int argc, const char *optstr, + const struct option *longopts) { int exit_code = EXIT_SUCCESS; /* Assume everything will be OK */ int opt; @@ -220,7 +199,7 @@ if (longopts[longindex].has_arg) printf(" %s", normalize(optarg ? optarg : "")); } else if (opt == NON_OPT) - printf(" %s", normalize(optarg)); + printf(" %s", normalize(optarg ? optarg : "")); else { printf(" -%c", opt); charptr = strchr(optstr, opt); @@ -242,11 +221,12 @@ * Report an error when parsing getopt's own arguments. If message is NULL, * we already sent a message, we just exit with a helpful hint. */ -void parse_error(const char *message) +static void __attribute__ ((__noreturn__)) parse_error(const char *message) { if (message) - fprintf(stderr, "getopt: %s\n", message); - fputs(_("Try `getopt --help' for more information.\n"), stderr); + fprintf(stderr, "%s: %s\n", program_invocation_short_name, message); + fprintf(stderr, _("Try `%s --help' for more information.\n"), + program_invocation_short_name); exit(PARAMETER_EXIT_CODE); } @@ -257,7 +237,7 @@ #define init_longopt() add_longopt(NULL,0) /* Register a long option. The contents of name is copied. */ -void add_longopt(const char *name, int has_arg) +static void add_longopt(const char *name, int has_arg) { char *tmp; if (!name) { @@ -270,9 +250,9 @@ if (long_options_nr == long_options_length) { long_options_length += LONG_OPTIONS_INCR; - long_options = our_realloc(long_options, - sizeof(struct option) * - long_options_length); + long_options = xrealloc(long_options, + sizeof(struct option) * + long_options_length); } long_options[long_options_nr].name = NULL; @@ -280,12 +260,12 @@ long_options[long_options_nr].flag = NULL; long_options[long_options_nr].val = 0; - if (long_options_nr) { + if (long_options_nr && name) { /* Not for init! */ long_options[long_options_nr - 1].has_arg = has_arg; long_options[long_options_nr - 1].flag = NULL; long_options[long_options_nr - 1].val = LONG_OPT; - tmp = our_malloc(strlen(name) + 1); + tmp = xmalloc(strlen(name) + 1); strcpy(tmp, name); long_options[long_options_nr - 1].name = tmp; } @@ -297,7 +277,7 @@ * Register several long options. options is a string of long options, * separated by commas or whitespace. This nukes options! */ -void add_long_options(char *options) +static void add_long_options(char *options) { int arg_opt; char *tokptr = strtok(options, ", \t\n"); @@ -323,7 +303,7 @@ } } -void set_shell(const char *new_shell) +static void set_shell(const char *new_shell) { if (!strcmp(new_shell, "bash")) shell = BASH; @@ -338,27 +318,39 @@ ("unknown shell after -s or --shell argument")); } -void print_help(void) +static void __attribute__ ((__noreturn__)) print_help(void) { fputs(_("Usage: getopt optstring parameters\n"), stderr); fputs(_(" getopt [options] [--] optstring parameters\n"), stderr); fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr); fputs(_(" parameters\n"), stderr); + fputs(_("\nOptions:\n"), stderr); fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr); fputs(_(" -h, --help This small usage guide\n"), stderr); - fputs(_(" -l, --longoptions=longopts Long options to be recognized\n"), stderr); - fputs(_(" -n, --name=progname The name under which errors are reported\n"), stderr); - fputs(_(" -o, --options=optstring Short options to be recognized\n"), stderr); + fputs(_(" -l, --longoptions Long options to be recognized\n"), stderr); + fputs(_(" -n, --name The name under which errors are reported\n"), stderr); + fputs(_(" -o, --options Short options to be recognized\n"), stderr); fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr); fputs(_(" -Q, --quiet-output No normal output\n"), stderr); - fputs(_(" -s, --shell=shell Set shell quoting conventions\n"), stderr); + fputs(_(" -s, --shell Set shell quoting conventions\n"), stderr); fputs(_(" -T, --test Test for getopt(1) version\n"), stderr); - fputs(_(" -u, --unqote Do not quote the output\n"), stderr); + fputs(_(" -u, --unquoted Do not quote the output\n"), stderr); fputs(_(" -V, --version Output version information\n"), stderr); + fputc('\n', stderr); + exit(PARAMETER_EXIT_CODE); } -static struct option longopts[] = { +int main(int argc, char *argv[]) +{ + char *optstr = NULL; + char *name = NULL; + int opt; + int compatible = 0; + + /* Stop scanning as soon as a non-option argument is found! */ + static const char *shortopts = "+ao:l:n:qQs:TuhV"; + static const struct option longopts[] = { {"options", required_argument, NULL, 'o'}, {"longoptions", required_argument, NULL, 'l'}, {"quiet", no_argument, NULL, 'q'}, @@ -372,23 +364,9 @@ {"version", no_argument, NULL, 'V'}, {NULL, 0, NULL, 0} }; - -/* Stop scanning as soon as a non-option argument is found! */ -static const char *shortopts = "+ao:l:n:qQs:TuhV"; - -int main(int argc, char *argv[]) -{ - char *optstr = NULL; - char *name = NULL; - int opt; - int compatible = 0; - -#if WITHOUT_GETTEXT -#else setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); -#endif init_longopt(); getopt_long_fp = getopt_long; @@ -411,7 +389,7 @@ if (argv[1][0] != '-' || compatible) { quote = 0; - optstr = our_malloc(strlen(argv[1]) + 1); + optstr = xmalloc(strlen(argv[1]) + 1); strcpy(optstr, argv[1] + strspn(argv[1], "-+")); argv[1] = argv[0]; return generate_output(argv + 1, argc - 1, optstr, @@ -427,18 +405,16 @@ case 'h': print_help(); case 'o': - if (optstr) - free(optstr); - optstr = our_malloc(strlen(optarg)+1); + free(optstr); + optstr = xmalloc(strlen(optarg) + 1); strcpy(optstr, optarg); break; case 'l': add_long_options(optarg); break; case 'n': - if (name) - free(name); - name = our_malloc(strlen(optarg)+1); + free(name); + name = xmalloc(strlen(optarg) + 1); strcpy(name, optarg); break; case 'q': @@ -456,7 +432,7 @@ quote = 0; break; case 'V': - printf(_("getopt (enhanced) 1.1.4\n")); + printf(_("%s (enhanced) %s\n"), program_invocation_short_name, program_version); return EXIT_SUCCESS; case '?': case ':': @@ -469,7 +445,7 @@ if (optind >= argc) parse_error(_("missing optstring argument")); else { - optstr=our_malloc(strlen(argv[optind])+1); + optstr = xmalloc(strlen(argv[optind]) + 1); strcpy(optstr, argv[optind]); optind++; }