diff options
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index dda96d5092a..e7e2e7cc8ff 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -148,7 +148,7 @@ void load_defaults(const char *conf_file, const char **groups, #endif for (dirs=default_directories ; *dirs; dirs++) { - int error; + int error=0; if (**dirs) error=search_default_file(&args, &alloc, *dirs, conf_file, default_ext, &group); @@ -359,7 +359,12 @@ void print_defaults(const char *conf_file, const char **groups) #endif for (dirs=default_directories ; *dirs; dirs++) { - strmov(name,*dirs); + if (**dirs) + strmov(name,*dirs); + else if (defaults_extra_file) + strmov(name,defaults_extra_file); + else + continue; convert_dirname(name); if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ strcat(name,"."); @@ -377,6 +382,7 @@ void print_defaults(const char *conf_file, const char **groups) puts("\nThe following options may be given as the first argument:\n\ --print-defaults Print the program argument list and exit\n\ --no-defaults Don't read default options from any options file\n\ ---defaults-file=# Only read default options from the given file #"); +--defaults-file=# Only read default options from the given file #\n\ +--defaults-extra-file=# Read this file after the global files are read"); } |