diff options
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_dump.c | 6 | ||||
| -rw-r--r-- | myisam/ft_eval.c | 7 | ||||
| -rw-r--r-- | myisam/ft_test1.c | 6 | ||||
| -rw-r--r-- | myisam/mi_test1.c | 9 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 8 | ||||
| -rw-r--r-- | myisam/myisampack.c | 9 |
6 files changed, 15 insertions, 30 deletions
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c index 619e59efc3e..822603212a0 100644 --- a/myisam/ft_dump.c +++ b/myisam/ft_dump.c @@ -245,11 +245,7 @@ static void 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); - } + exit(ho_error); } /* get options */ diff --git a/myisam/ft_eval.c b/myisam/ft_eval.c index 1b40209563d..e196121d7af 100644 --- a/myisam/ft_eval.c +++ b/myisam/ft_eval.c @@ -179,11 +179,8 @@ static void 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); - } + exit(ho_error); + if(!(d_file=argv[optind])) print_error(1,"No d_file"); if(!(df=fopen(d_file,"r"))) print_error(1,"fopen(%s)",d_file); diff --git a/myisam/ft_test1.c b/myisam/ft_test1.c index 728ea4cd047..6fa347f594a 100644 --- a/myisam/ft_test1.c +++ b/myisam/ft_test1.c @@ -284,11 +284,7 @@ static void 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); - } + exit(ho_error); return; } /* get options */ diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c index 84810cb25ea..d0ce3ea966e 100644 --- a/myisam/mi_test1.c +++ b/myisam/mi_test1.c @@ -623,7 +623,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), key_cacheing=1; break; case 'V': - printf("test1 Ver 1.1 \n"); + printf("test1 Ver 1.2 \n"); exit(0); case '#': DEBUGGER_ON; @@ -644,11 +644,8 @@ static void 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); - } + exit(ho_error); + return; } /* get options */ diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 0cd3e5f3139..379a985705d 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -292,7 +292,7 @@ static struct my_option my_long_options[] = static void print_version(void) { - printf("%s Ver 2.5 for %s at %s\n", my_progname, SYSTEM_TYPE, + printf("%s Ver 2.6 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); } @@ -615,13 +615,15 @@ get_one_option(int optid, static void get_options(register int *argc,register char ***argv) { + int ho_error; + load_defaults("my", load_default_groups, argc, argv); default_argv= *argv; if (isatty(fileno(stdout))) check_param.testflag|=T_WRITE_LOOP; - if (handle_options(argc, argv, my_long_options, get_one_option)) - exit(1); + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) + exit(ho_error); /* If using repair, then update checksum if one uses --update-state */ if ((check_param.testflag & T_UPDATE_STATE) && diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 2cadeaae72a..0064b50348f 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -269,7 +269,7 @@ static struct my_option my_long_options[] = static void print_version(void) { - printf("%s Ver 1.20 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); + printf("%s Ver 1.21 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); } static void usage(void) @@ -347,11 +347,8 @@ static void get_options(int *argc,char ***argv) write_loop=1; 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); - } + exit(ho_error); + if (!*argc) { usage(); |