diff options
Diffstat (limited to 'ext/mysql/libmysql/default.c')
| -rw-r--r-- | ext/mysql/libmysql/default.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/ext/mysql/libmysql/default.c b/ext/mysql/libmysql/default.c index b1e33f3e59..07df9bb9b7 100644 --- a/ext/mysql/libmysql/default.c +++ b/ext/mysql/libmysql/default.c @@ -1,5 +1,5 @@ -/* Copyright Abandoned 1998 TCX DataKonsult AB & Monty Program KB & Detron HB - This file is public domain and comes with NO WARRANTY of any kind */ +/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB +This file is public domain and comes with NO WARRANTY of any kind */ /**************************************************************************** ** Add all options from files named "group".cnf from the default_directories @@ -28,7 +28,7 @@ /* Which directories are searched for options (and in which order) */ const char *default_directories[]= { -#ifdef __WIN32__ +#ifdef __WIN__ "C:/", #else "/etc/", @@ -36,14 +36,14 @@ const char *default_directories[]= { #ifdef DATADIR DATADIR, #endif -#ifndef __WIN32__ +#ifndef __WIN__ "~/", #endif NullS, }; #define default_ext ".cnf" /* extension for config file */ -#ifdef __WIN32__ +#ifdef __WIN__ #include <winbase.h> #define windows_ext ".ini" #endif @@ -59,7 +59,7 @@ void load_defaults(const char *conf_file, const char **groups, DYNAMIC_ARRAY args; const char **dirs, *extra_default_file; TYPELIB group; - my_bool print_defaults=0; + my_bool found_print_defaults=0; MEM_ROOT alloc; char *ptr,**res; DBUG_ENTER("load_defaults"); @@ -78,7 +78,7 @@ void load_defaults(const char *conf_file, const char **groups, res[i-1]=argv[0][i]; (*argc)--; *argv=res; - memcpy(ptr,&alloc,sizeof(alloc)); /* Save alloc root for free */ + *(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */ DBUG_VOID_RETURN; } @@ -88,8 +88,8 @@ void load_defaults(const char *conf_file, const char **groups, extra_default_file=strchr(argv[0][1],'=')+1; group.count=0; - group.name= (char*) "defaults"; - group.type_names=(char**) groups; + group.name= "defaults"; + group.type_names= groups; for (; *groups ; groups++) group.count++; @@ -109,7 +109,7 @@ void load_defaults(const char *conf_file, const char **groups, } else { -#ifdef __WIN32__ +#ifdef __WIN__ char system_dir[FN_REFLEN]; GetWindowsDirectory(system_dir,sizeof(system_dir)); if (search_default_file(&args, &alloc, system_dir, conf_file, windows_ext, @@ -140,7 +140,7 @@ void load_defaults(const char *conf_file, const char **groups, /* Check if we wan't to see the new argument list */ if (*argc >= 2 && !strcmp(argv[0][1],"--print-defaults")) { - print_defaults=1; + found_print_defaults=1; --*argc; ++*argv; /* skipp argument */ } @@ -150,9 +150,9 @@ void load_defaults(const char *conf_file, const char **groups, (*argc)+=args.elements; *argv= (char**) res; - memcpy(ptr,&alloc,sizeof(alloc)); /* Save alloc root for free */ + *(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */ delete_dynamic(&args); - if (print_defaults) + if (found_print_defaults) { int i; printf("%s would have been started with the following arguments:\n", @@ -173,7 +173,7 @@ void load_defaults(const char *conf_file, const char **groups, void free_defaults(char **argv) { MEM_ROOT ptr; - memcpy((char*) &ptr,(char *) argv - sizeof(ptr),sizeof(ptr)); + memcpy_fixed((char*) &ptr,(char *) argv - sizeof(ptr), sizeof(ptr)); free_root(&ptr); } @@ -308,7 +308,9 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, void print_defaults(const char *conf_file, const char **groups) { +#ifdef __WIN__ bool have_ext=fn_ext(conf_file)[0] != 0; +#endif char name[FN_REFLEN]; const char **dirs; puts("\nDefault options are read from the following files in the given order:"); @@ -317,7 +319,7 @@ void print_defaults(const char *conf_file, const char **groups) fputs(conf_file,stdout); else { -#ifdef __WIN32__ +#ifdef __WIN__ GetWindowsDirectory(name,sizeof(name)); printf("%s\\%s%s ",name,conf_file,have_ext ? "" : windows_ext); #endif @@ -342,4 +344,5 @@ void print_defaults(const char *conf_file, const char **groups) --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 #"); -}; +} + |