diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/comp_err.c | 31 | ||||
| -rw-r--r-- | extra/my_print_defaults.c | 128 | ||||
| -rw-r--r-- | extra/mysql_install.c | 221 | ||||
| -rw-r--r-- | extra/perror.c | 138 | ||||
| -rw-r--r-- | extra/replace.c | 31 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 129 | ||||
| -rw-r--r-- | extra/resolveip.c | 70 |
8 files changed, 474 insertions, 276 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index ee6c2ba92f2..25633a386e2 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ -resolve_stack_dump +resolve_stack_dump mysql_install OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ __math.h time.h __time.h unistd.h __unistd.h types.h \ diff --git a/extra/comp_err.c b/extra/comp_err.c index f7b68ff0891..806fb5052b4 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -1,23 +1,22 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Saves all errmesg in a header file, updated by me, in a compact file */ -#include <global.h> +#include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <m_string.h> diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 316d91ef7b3..2c87ee11820 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -1,19 +1,18 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* ** print_default.c: @@ -22,73 +21,82 @@ ** Written by Monty */ -#include <global.h> +#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: %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); diff --git a/extra/mysql_install.c b/extra/mysql_install.c index dfd71895647..0153ad3bf70 100644 --- a/extra/mysql_install.c +++ b/extra/mysql_install.c @@ -18,24 +18,215 @@ /* Install or upgrade MySQL server. By Sasha Pachev <sasha@mysql.com> */ -#define INSTALL_VERSION "1.0" +#define INSTALL_VERSION "1.1" #define DONT_USE_RAID -#include <global.h> +#include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <m_string.h> #include <mysql_version.h> #include <errno.h> -#include <getopt.h> +#include <my_getopt.h> -struct option long_options[] = +#define ANSWERS_CHUNCK 32 + +int have_gui=0; + +static struct my_option my_long_options[] = { - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {0, 0,0,0} + {"help", '?', "Display this help 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} }; +/* For now, not much exciting here, but we'll add more once + we add GUI support + */ +typedef struct +{ + FILE* out; + FILE* in; + const char* question; + int default_ind; + DYNAMIC_ARRAY answers; +} QUESTION_WIDGET; + +static void usage(); +static void die(const char* fmt, ...); +static void print_version(void); +static char get_answer_char(int ans_ind); +static int ask_user(const char* question,int default_ind, ...); +static void add_answer(QUESTION_WIDGET* w, const char* ans); +static void display_question(QUESTION_WIDGET* w); +static int init_question_widget(QUESTION_WIDGET* w, const char* question, + int default_ind); +static void end_question_widget(QUESTION_WIDGET* w); +static int get_answer(QUESTION_WIDGET* w); +static char answer_from_char(char c); +static void invalid_answer(QUESTION_WIDGET* w); + +enum {IMODE_STANDARD=0,IMODE_CUSTOM,IMODE_UPGRAGE} install_mode + = IMODE_STANDARD; + +static char get_answer_char(int ans_ind) +{ + return 'a' + ans_ind; +} + +static void invalid_answer(QUESTION_WIDGET* w) +{ + if (!have_gui) + { + fprintf(w->out, "ERROR: invalid answer, try again...\a\n"); + } +} + +static char answer_from_char(char c) +{ + return c - 'a'; +} + +static void die(const char* fmt, ...) +{ + va_list args; + va_start(args, fmt); + fprintf(stderr, "%s: ", my_progname); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + exit(1); +} + +static void display_question(QUESTION_WIDGET* w) +{ + if (!have_gui) + { + uint i,num_answers=w->answers.elements; + DYNAMIC_ARRAY* answers = &w->answers; + fprintf(w->out,"\n%s\n\n",w->question); + + for (i=0; i<num_answers; i++) + { + char* ans; + get_dynamic(answers,(gptr)&ans,i); + fprintf(w->out,"%c - %s\n",get_answer_char(i),ans); + } + fprintf(w->out,"q - Abort Install/Upgrade\n\n"); + } +} + +static void add_answer(QUESTION_WIDGET* w, const char* ans) +{ + insert_dynamic(&w->answers,(gptr)&ans); +} + +static int init_question_widget(QUESTION_WIDGET* w, const char* question, + int default_ind) +{ + if (have_gui) + { + w->in = w->out = 0; + } + else + { + w->out = stdout; + w->in = stdin; + } + w->question = question; + w->default_ind = default_ind; + if (my_init_dynamic_array(&w->answers,sizeof(char*), + ANSWERS_CHUNCK,ANSWERS_CHUNCK)) + die("Out of memory"); + return 0; +} + +static void end_question_widget(QUESTION_WIDGET* w) +{ + delete_dynamic(&w->answers); +} + +static int get_answer(QUESTION_WIDGET* w) +{ + if (!have_gui) + { + char buf[32]; + int ind; + char c; + if (!fgets(buf,sizeof(buf),w->in)) + die("Failed fgets on input stream"); + switch ((c=tolower(*buf))) + { + case '\n': + return w->default_ind; + case 'q': + die("Install/Upgrade aborted"); + default: + ind = answer_from_char(c); + if (ind >= 0 && ind < (int)w->answers.elements) + return ind; + } + } + return -1; +} + +static int ask_user(const char* question,int default_ind, ...) +{ + va_list args; + char* opt; + QUESTION_WIDGET w; + int ans; + + va_start(args,default_ind); + init_question_widget(&w,question,default_ind); + for (;(opt=va_arg(args,char*));) + { + add_answer(&w,opt); + } + for (;;) + { + display_question(&w); + if ((ans = get_answer(&w)) >= 0) + break; + invalid_answer(&w); + } + end_question_widget(&w); + va_end(args); + return ans; +} + + +static my_bool +get_one_option(int optid, const struct my_option *opt __attribute__((unused)), + char *argument __attribute__((unused))) +{ + switch(optid) { + case 'V': + print_version(); + exit(0); + case '?': + usage(); + exit(0); + } + return 0; +} + + +static int parse_args(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); + } + return 0; +} + static void print_version(void) { printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname,INSTALL_VERSION, @@ -49,12 +240,20 @@ static void usage() printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); printf("Install or upgrade MySQL server.\n\n"); printf("Usage: %s [OPTIONS] \n", my_progname); - printf("\n\ - -?, --help Display this help and exit.\n\ - -h, --host=... Connect to host.\n\ - -V, --version Output version information and exit.\n"); + my_print_help(my_long_options); + my_print_variables(my_long_options); } +int main(int argc, char** argv) +{ + MY_INIT(argv[0]); + parse_args(argc,argv); + install_mode = ask_user("Please select install/upgrade mode", + install_mode, "Standard Install", + "Custom Install", "Upgrade",0); + printf("mode=%d\n", install_mode); + return 0; +} diff --git a/extra/perror.c b/extra/perror.c index 6cb86eedf27..da62913b4a4 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -1,48 +1,57 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Return error-text for system error messages and nisam messages */ -#define PERROR_VERSION "2.7" +#define PERROR_VERSION "2.8" -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <errno.h> -#include <getopt.h> +#include <my_getopt.h> +static my_bool verbose, print_all_codes; -static struct option long_options[] = +static struct my_option my_long_options[] = { - {"help", no_argument, 0, '?'}, - {"info", no_argument, 0, 'I'}, - {"all", no_argument, 0, 'a'}, - {"silent", no_argument, 0, 's'}, - {"verbose", no_argument, 0, 'v'}, - {"version", no_argument, 0, 'V'}, - {0, 0, 0, 0} + {"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG, + NO_ARG, 0, 0, 0, 0, 0, 0}, + {"info", 'I', "Synonym for --help", 0, 0, 0, GET_NO_ARG, + NO_ARG, 0, 0, 0, 0, 0, 0}, +#ifdef HAVE_SYS_ERRLIST + {"all", 'a', "Print all the error messages and the number.", + (gptr*) &print_all_codes, (gptr*) &print_all_codes, 0, GET_BOOL, NO_ARG, + 0, 0, 0, 0, 0, 0}, +#endif + {"silent", 's', "Only print the error message", 0, 0, 0, GET_NO_ARG, NO_ARG, + 0, 0, 0, 0, 0, 0}, + {"verbose", 'v', "Print error code and message (default).", (gptr*) &verbose, + (gptr*) &verbose, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, + {"version", 'V', "Displays version information and exits.", + 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} }; + typedef struct ha_errors { int errcode; const char *msg; } HA_ERRORS; -static int verbose=1,print_all_codes=0; static HA_ERRORS ha_errlist[]= { @@ -100,57 +109,43 @@ static void usage(void) printf("Print a description for a system error code or a error code from\na MyISAM/ISAM/BDB table handler.\n"); printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n"); printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname); - printf("\n\ - -?, --help Displays this help and exits.\n\ - -I, --info Synonym for the above."); -#ifdef HAVE_SYS_ERRLIST - printf("\n\ - -a, --all Print all the error messages and the number."); -#endif - printf("\n\ - -s, --silent Only print the error message\n\ - -v, --verbose Print error code and message (default).\n\ - -V, --version Displays version information and exits.\n"); -} + my_print_help(my_long_options); + my_print_variables(my_long_options); +} + + +static my_bool +get_one_option(int optid, const struct my_option *opt __attribute__((unused)), + char *argument __attribute__((unused))) +{ + switch (optid) { + case 's': + verbose=0; + break; + case 'V': + print_version(); + exit(0); + break; + case 'I': + case '?': + usage(); + exit(0); + break; + } + return 0; +} static int get_options(int *argc,char ***argv) { - int c,option_index; + int ho_error; - while ((c=getopt_long(*argc,*argv,"asvVI?",long_options, - &option_index)) != EOF) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) { - switch (c) { -#ifdef HAVE_SYS_ERRLIST - case 'a': - print_all_codes=1; - break; -#endif - case 'v': - verbose=1; - break; - case 's': - verbose=0; - break; - case 'V': - print_version(); - exit(0); - break; - case 'I': - case '?': - usage(); - exit(0); - break; - default: - fprintf(stderr,"%s: Illegal option character '%c'\n", - my_progname,opterr); - return(1); - break; - } + printf("%s: handle_options() failed with error %d\n", my_progname, + ho_error); + exit(1); } - (*argc)-=optind; - (*argv)+=optind; if (!*argc && !print_all_codes) { usage(); @@ -231,4 +226,3 @@ int main(int argc,char *argv[]) exit(error); return error; } - diff --git a/extra/replace.c b/extra/replace.c index ef3abda5cc5..41312f5e3d4 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -1,19 +1,18 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Replace strings in textfile This program replace strings in a file or on stdin/stdout. @@ -38,7 +37,7 @@ */ #define DONT_USE_RAID -#include <global.h> +#include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <m_string.h> diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index a08845b8de3..23f22e276a6 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -1,37 +1,36 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* Resolve numeric stack dump produced by mysqld 3.23.30 and later versions into symbolic names. By Sasha Pachev <sasha@mysql.com> */ #define DONT_USE_RAID -#include <global.h> +#include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <m_string.h> #include <mysql_version.h> #include <errno.h> -#include <getopt.h> +#include <my_getopt.h> #define INIT_SYM_TABLE 4096 #define INC_SYM_TABLE 4096 #define MAX_SYM_SIZE 128 -#define DUMP_VERSION "1.2" +#define DUMP_VERSION "1.3" #define HEX_INVALID (uchar)255 typedef ulong my_long_addr_t ; /* at some point, we need to fix configure @@ -49,15 +48,21 @@ static char* dump_fname = 0, *sym_fname = 0; static DYNAMIC_ARRAY sym_table; /* how do you like this , static DYNAMIC ? */ static FILE* fp_dump, *fp_sym = 0, *fp_out; -struct option long_options[] = +static struct my_option my_long_options[] = { - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {"symbols-file", required_argument, 0, 's'}, - {"numeric-dump-file", required_argument, 0, 'n'}, - {0, 0,0,0} + {"help", 'h', "Display this help 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}, + {"symbols-file", 's', "Use specified symbols file.", (gptr*) &sym_fname, + (gptr*) &sym_fname, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"numeric-dump-file", 'n', "Read the dump from specified file.", + (gptr*) &dump_fname, (gptr*) &dump_fname, 0, GET_STR, REQUIRED_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 verify_sort(); static void print_version(void) @@ -73,11 +78,8 @@ static void usage() printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); printf("Resolve numeric stack strace dump into symbols.\n\n"); printf("Usage: %s [OPTIONS] symbols-file [numeric-dump-file]\n", my_progname); - printf("\n\ - -?, --help Display this help and exit.\n\ - -s, --symbols-file=... Use specified symbols file.\n\ - -n, --numeric-dump-file=... Read the dump from specified file.\n\ - -V, --version Output version information and exit.\n"); + my_print_help(my_long_options); + my_print_variables(my_long_options); printf("\n\ The symbols-file should include the output from: 'nm --numeric-sort mysqld'.\n\ The numeric-dump-file should contain a numeric stack trace from mysqld.\n\ @@ -98,40 +100,36 @@ static void die(const char* fmt, ...) } -static int parse_args(int argc, char **argv) +static my_bool +get_one_option(int optid, const struct my_option *opt __attribute__((unused)), + char *argument __attribute__((unused))) { - int c, option_index = 0; + switch(optid) { + case 'V': + print_version(); + exit(0); + case '?': + usage(); + exit(0); + } + return 0; +} - while((c = getopt_long(argc, argv, "?Vn:s:", - long_options, &option_index)) != EOF) - { - switch(c) - { - case 'n': - dump_fname = optarg; - break; - case 's': - sym_fname = optarg; - break; - case 'V': - print_version(); - exit(0); - case '?': - usage(); - exit(0); - default: - usage(); - exit(1); - } - } - argc-=optind; - argv+=optind; +static int parse_args(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); + } /* The following code is to make the command compatible with the old version that required one to use the -n and -s options - */ + */ if (argc == 2) { @@ -163,7 +161,7 @@ static void open_files() { fp_out = stdout; fp_dump = stdin; - + if(dump_fname && !(fp_dump = my_fopen(dump_fname, O_RDONLY, MYF(MY_WME)))) die("Could not open %s", dump_fname); /* if name not given, assume stdin*/ @@ -173,7 +171,7 @@ static void open_files() trace dump and specify the path to it with -s or --symbols-file"); if(!(fp_sym = my_fopen(sym_fname, O_RDONLY, MYF(MY_WME)))) die("Could not open %s", sym_fname); - + } static uchar hex_val(char c) @@ -192,10 +190,10 @@ static my_long_addr_t read_addr(char** buf) uchar c; char* p = *buf; my_long_addr_t addr = 0; - + while((c = hex_val(*p++)) != HEX_INVALID) addr = (addr << 4) + c; - + *buf = p; return addr; } @@ -209,7 +207,7 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf) return -1; while(isspace(*buf++)) /* empty */; - + while(isspace(*buf++)) /* empty - skip more space */; --buf; @@ -256,7 +254,7 @@ static void verify_sort() { uint i; uchar* last = 0; - + for(i = 0; i < sym_table.elements; i++) { SYM_ENTRY se; @@ -274,7 +272,7 @@ static SYM_ENTRY* resolve_addr(uchar* addr, SYM_ENTRY* se) get_dynamic(&sym_table, (gptr)se, 0); if(addr < se->addr) return 0; - + for(i = 1; i < sym_table.elements; i++) { get_dynamic(&sym_table, (gptr)se, i); @@ -297,7 +295,7 @@ static void do_resolve() while(isspace(*p)) ++p; /* skip space */; - + if(*p++ == '0' && *p++ == 'x') { SYM_ENTRY se ; @@ -307,7 +305,7 @@ static void do_resolve() (int) (addr - se.addr)); else fprintf(fp_out, "%p (?)\n", addr); - + } else { @@ -327,4 +325,3 @@ int main(int argc, char** argv) clean_up(); return 0; } - diff --git a/extra/resolveip.c b/extra/resolveip.c index 9bab5846c03..f4b703bec4f 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -16,7 +16,7 @@ /* Resolves IP's to hostname and hostnames to IP's */ -#define RESOLVE_VERSION "2.0" +#define RESOLVE_VERSION "2.1" #include <my_global.h> #include <m_ctype.h> @@ -30,22 +30,26 @@ #endif #include <arpa/inet.h> #include <netdb.h> -#include <getopt.h> +#include <my_getopt.h> #if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno) extern int h_errno; #endif -static int silent=0; +static my_bool silent; -static struct option long_options[] = +static struct my_option my_long_options[] = { - {"help", no_argument, 0, '?'}, - {"info", no_argument, 0, 'I'}, - {"silent", no_argument, 0, 's'}, - {"version", no_argument, 0, 'V'}, - {0, 0, 0, 0} + {"help", '?', "Displays this help and exits.", + 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"info", 'I', "Synonym for --help", + 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"silent", 's', "Be more silent.", (gptr*) &silent, (gptr*) &silent, + 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"version", 'V', "Displays version information and exits.", + 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} }; @@ -62,41 +66,39 @@ static void usage(void) 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("Get hostname based on IP-address or IP-address based on hostname.\n"); printf("Usage: %s [OPTIONS] hostname or IP-address\n",my_progname); - printf("\n\ - -?, --help Displays this help and exits.\n\ - -I, --info Synonym for the above.\n\ - -s, --silent Be more silent.\n\ - -V, --version Displays version information and exits.\n"); + my_print_help(my_long_options); + my_print_variables(my_long_options); +} + + +static my_bool +get_one_option(int optid, const struct my_option *opt __attribute__((unused)), + char *argument __attribute__((unused))) +{ + switch (optid) { + case 'V': print_version(); exit(0); + case 'I': + case '?': + usage(); + exit(0); + } + return 0; } /*static my_string load_default_groups[]= { "resolveip","client",0 }; */ static int get_options(int *argc,char ***argv) { - int c,option_index; + int ho_error; /* load_defaults("my",load_default_groups,argc,argv); */ - while ((c=getopt_long(*argc,*argv,"?IsV", - long_options, &option_index)) != EOF) + + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) { - switch (c) { - case 's': - silent=1; - break; - case 'V': print_version(); exit(0); - case 'I': - case '?': - usage(); - exit(0); - default: - fprintf(stderr,"%s: Illegal option character '%c'\n", - my_progname,opterr); - return(1); - break; - } + printf("%s: handle_options() failed with error %d\n", my_progname, + ho_error); + exit(1); } - (*argc)-=optind; - (*argv)+=optind; if (*argc == 0) { usage(); |