moved my_getopt.h under client_priv.h

Changed my_print_defaults, mysql_install, perror, resolve_stack_dump,
resolveip and pack_isam to use my_getopt.


client/client_priv.h:
  getopt -> my_getopt
client/mysql.cc:
  moved my_getopt.h under client_priv.h
client/mysqladmin.c:
  moved my_getopt.h under client_priv.h
client/mysqlbinlog.cc:
  moved my_getopt.h under client_priv.h
client/mysqlcheck.c:
  moved my_getopt.h under client_priv.h
client/mysqldump.c:
  moved my_getopt.h under client_priv.h
client/mysqlimport.c:
  moved my_getopt.h under client_priv.h
client/mysqlshow.c:
  moved my_getopt.h under client_priv.h
extra/my_print_defaults.c:
  Changed from getopt to use my_getopt
extra/mysql_install.c:
  Changed from getopt to use my_getopt
extra/perror.c:
  Changed from getopt to use my_getopt
extra/resolve_stack_dump.c:
  Changed from getopt to use my_getopt
extra/resolveip.c:
  Changed from getopt to use my_getopt
fs/mysqlcorbafs.c:
  Left reminder about my_getopt when this program is ready.
  Currently it's not being compiled.
isam/pack_isam.c:
  Changed from getopt to use my_getopt

1 files changed, 53 insertions, 44 deletions

diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index 70ccb3797e6..2c87ee11820 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -23,71 +23,80 @@
 
 #include <my_global.h>
 #include <my_sys.h>
-#include <getopt.h>
+#include <my_getopt.h>
 
 const char *config_file="my";			/* Default config file */
 
-static struct option long_options[] =
+static struct my_option my_long_options[] =
 {
-  {"config-file",	required_argument, 0,	'c'},
-  {"defaults-file",	required_argument, 0,	'c'},
-  {"defaults-extra-file", required_argument, 0,	'e'},
-  {"extra-file", 	required_argument, 0,	'e'},
-  {"no-defaults",	no_argument,	   0,	'n'},
-  {"help",		no_argument,	   0,	'?'},
-  {"version",		no_argument,	   0,	'V'},
-  {0, 0, 0, 0}
+  {"config-file", 'c', "The config file to be used",
+   (gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
+  {"defaults-file", 'c', "Synonym for --config-file",
+   (gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
+  {"defaults-extra-file", 'e', 
+   "Read this file after the global /etc config file and before the config file in the users home directory.",
+   (gptr*) &defaults_extra_file, (gptr*) &defaults_extra_file, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"extra-file", 'e', 
+   "Synonym for --defaults-extra-file",
+   (gptr*) &defaults_extra_file, (gptr*) &defaults_extra_file, 0, GET_STR,
+   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"no-defaults", 'n', "Return an empty string (useful for scripts)",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"help", '?', "Display this help message and exit.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"version", 'V', "Output version information and exit.",
+   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+
 static void usage(my_bool version)
 {
-  printf("%s  Ver 1.3 for %s at %s\n",my_progname,SYSTEM_TYPE,
+  printf("%s  Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE,
 	 MACHINE_TYPE);
   if (version)
     return;
   puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
   puts("Prints all arguments that is give to some program using the default files");
-  printf("Usage: %s [OPTIONS] groups\n",my_progname);
-  printf("\n\
-  -c, --config-file=#, --defaults-file=#\n\
-	                The config file to use (default '%s')\n\
-  -e, --extra-file=#, --defaults-extra-file=#\n\
-			Read this file after the global /etc config file and\n\
-			before the config file in the users home directory.\n\
-  -n, --no-defaults	Return an empty string (useful for scripts)\n\
-  -?, --help		Display this help message and exit.\n\
-  -V, --version		Output version information and exit.\n",
-	 config_file);
-  printf("\nExample usage:\n%s --config-file=my client mysql\n",my_progname);
+  printf("Usage: %s [OPTIONS] groups\n", my_progname);
+  my_print_help(my_long_options);
+  my_print_variables(my_long_options);
+  printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname);
 }
 
-static int get_options(int *argc,char ***argv)
-{
-  int c,option_index;
 
-  while ((c=getopt_long(*argc,*argv,"nc:e:V?I",
-			long_options, &option_index)) != EOF)
-  {
-    switch (c) {
-    case 'c':
-      config_file=optarg;
-      break;
-    case 'e':
-      defaults_extra_file=optarg;		/* Used by the load_defaults */
-      break;
+static my_bool
+get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
+	       char *argument __attribute__((unused)))
+{
+  switch (optid) {
     case 'n':
-      exit(0);
+    exit(0);
     case 'I':
     case '?':
-      usage(0);
-      exit(0);
+    usage(0);
+    exit(0);
     case 'V':
-      usage(1);
-      exit(0);
-    }
+    usage(1);
+    exit(0);
+  }
+  return 0;
+}
+
+
+static int get_options(int *argc,char ***argv)
+{
+  int ho_error;
+
+  if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
+  {
+    printf("%s: handle_options() failed with error %d\n", my_progname,
+	   ho_error);
+    exit(1);
   }
-  (*argc)-=optind;
-  (*argv)+=optind;
   if (*argc < 1)
   {
     usage(0);