--- getopt/trunk/getopt.c	2012/07/14 22:22:44	320
+++ getopt/trunk/getopt.c	2012/07/17 15:27:08	322
@@ -64,6 +64,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 +77,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,18 +106,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 +128,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 +173,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;
@@ -242,7 +220,7 @@
  * 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);
@@ -257,7 +235,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 +248,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;
@@ -285,7 +263,7 @@
 		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 +275,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 +301,7 @@
 	}
 }
 
-void set_shell(const char *new_shell)
+static void set_shell(const char *new_shell)
 {
 	if (!strcmp(new_shell, "bash"))
 		shell = BASH;
@@ -338,7 +316,7 @@
 			    ("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);
@@ -358,7 +336,16 @@
 	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,17 +359,6 @@
 		{"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, "");
@@ -411,7 +387,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 +403,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':
@@ -469,7 +443,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++;
 		}