diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/my_print_defaults.c | 14 | ||||
| -rw-r--r-- | extra/resolveip.c | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 549b2124b55..41c26e73dff 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -136,18 +136,18 @@ int main(int argc, char **argv) arguments[0]=my_progname; arguments[1]=0; if ((error= load_defaults(config_file, (const char **) load_default_groups, - &count, &arguments)) > 1) + &count, &arguments))) { if (verbose && opt_defaults_file_used) { - if (error == 2) - fprintf(stderr, "WARNING: Defaults file (%s) not found!\n", + if (error == 1) + fprintf(stderr, "WARNING: Defaults file '%s' not found!\n", config_file); - if (error == 3) - fprintf(stderr, "WARNING: Defaults file (%s) is not a regular file!\n", + if (error == 2) + fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n", config_file); } - exit(2); // Non-fatal error + error= 2; } for (argument= arguments+1 ; *argument ; argument++) @@ -155,5 +155,5 @@ int main(int argc, char **argv) my_free((char*) load_default_groups,MYF(0)); free_defaults(arguments); - exit(0); + exit(error); } diff --git a/extra/resolveip.c b/extra/resolveip.c index 9851ec49605..91f23bf5b00 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -36,6 +36,10 @@ extern int h_errno; #endif +#ifndef HAVE_IN_ADDR_T +#define in_addr_t u_long +#endif + static my_bool silent; @@ -91,8 +95,6 @@ static int get_options(int *argc,char ***argv) { int ho_error; - /* load_defaults("my",load_default_groups,argc,argv); */ - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) exit(ho_error); |