mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
68b4d7b74d
Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while ( BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f: Delete: mysys/my_tempnam.c VC++Files/client/mysqlclient.dsp: Remove not used file my_tempnam.c VC++Files/client/mysqlclient_ia64.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql_ia64.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys_ia64.dsp: Remove not used file my_tempnam.c client/mysql.cc: Change to use get_defaults_options() Remove compiler warnings client/mysqldump.c: Indentation fixes Use quoted table name for 'primary_key_fields' extra/my_print_defaults.c: Add support for --defaults-group-suffix change to use get_default_options() extra/replace.c: Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c include/config-win.h: Added DEFAULT_GROUP_SUFFIX_ENV include/my_sys.h: Change defaults_instance -> defaults_group_suffix Change get_defaults_files -> get_defaults_options libmysql/Makefile.shared: Added DEFAULT_GROUP_SUFFIX_ENV mysys/Makefile.am: Added DEFAULT_GROUP_SUFFIX_ENV Remove my_tempnam.c mysys/default.c: Changed --instance to --defaults-group-suffix Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am (mysys shouldn't by MySQL independent) Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order mysys/default_modify.c: Optimized code to use allocated space more efficently Reduce code size Ensure that realloc() works independent of argument size mysys/my_bitmap.c: Added missing return sql/ha_innodb.cc: Change if( -> if ( sql/ha_ndbcluster.cc: Change while( -> while ( sql/item_cmpfunc.cc: Break loop early (simple optimization) sql/item_strfunc.cc: Change if( -> if ( sql/log.cc: Fixed comment sql/mysqld.cc: Change if( -> if ( sql/opt_range.cc: while( -> while ( if( -> if ( sql/parse_file.cc: Change if( -> if ( sql/sql_cache.cc: while( -> while ( sql/sql_parse.cc: Change if( -> if ( sql/sql_prepare.cc: Added comment sql/sql_select.cc: while( -> while ( Removed index variable by incrementing pointer sql/sql_show.cc: Change if( -> if ( sql/sql_yacc.yy: Change if( -> if ( tests/mysql_client_test.c: Added cast to first argument to bzero()
186 lines
5.7 KiB
C
186 lines
5.7 KiB
C
|
|
/* 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 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:
|
|
** Print all parameters in a default file that will be given to some program.
|
|
**
|
|
** Written by Monty
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <my_getopt.h>
|
|
|
|
|
|
const char *config_file="my"; /* Default config file */
|
|
uint verbose= 0, opt_defaults_file_used= 0;
|
|
const char *default_dbug_option="d:t:o,/tmp/my_print_defaults.trace";
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"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},
|
|
#ifdef DBUG_OFF
|
|
{"debug", '#', "This is a non-debug version. Catch this and exit",
|
|
0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#else
|
|
{"debug", '#', "Output debug log", (gptr*) &default_dbug_option,
|
|
(gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
{"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},
|
|
{"defaults-group-suffix", 'g',
|
|
"In addition to the given groups, read also groups with this suffix",
|
|
(gptr*) &defaults_group_suffix, (gptr*) &defaults_group_suffix,
|
|
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},
|
|
{"verbose", 'v', "Increase the output level",
|
|
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}
|
|
};
|
|
|
|
|
|
#include <help_start.h>
|
|
|
|
static void usage(my_bool version)
|
|
{
|
|
printf("%s Ver 1.6 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);
|
|
my_print_help(my_long_options);
|
|
my_print_default_files(config_file);
|
|
my_print_variables(my_long_options);
|
|
printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname);
|
|
}
|
|
|
|
#include <help_end.h>
|
|
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
char *argument __attribute__((unused)))
|
|
{
|
|
switch (optid) {
|
|
case 'c':
|
|
opt_defaults_file_used= 1;
|
|
break;
|
|
case 'n':
|
|
exit(0);
|
|
case 'I':
|
|
case '?':
|
|
usage(0);
|
|
exit(0);
|
|
case 'v':
|
|
verbose++;
|
|
break;
|
|
case 'V':
|
|
usage(1);
|
|
exit(0);
|
|
case '#':
|
|
DBUG_PUSH(argument ? argument : default_dbug_option);
|
|
break;
|
|
}
|
|
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)))
|
|
exit(ho_error);
|
|
|
|
if (*argc < 1)
|
|
{
|
|
usage(0);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int count, error, args_used;
|
|
char **load_default_groups, *tmp_arguments[6];
|
|
char **argument, **arguments, **org_argv;
|
|
char *defaults, *extra_defaults, *group_suffix;
|
|
MY_INIT(argv[0]);
|
|
|
|
org_argv= argv;
|
|
args_used= get_defaults_options(argc, argv, &defaults, &extra_defaults,
|
|
&group_suffix);
|
|
|
|
/* Copy defaults-xxx arguments & program name */
|
|
count=args_used+1;
|
|
arguments= tmp_arguments;
|
|
memcpy((char*) arguments, (char*) org_argv, count * sizeof(*org_argv));
|
|
arguments[count]= 0;
|
|
|
|
/* Check out the args */
|
|
if (!(load_default_groups=(char**) my_malloc((argc+1)*sizeof(char*),
|
|
MYF(MY_WME))))
|
|
exit(1);
|
|
if (get_options(&argc,&argv))
|
|
exit(1);
|
|
memcpy((char*) load_default_groups, (char*) argv, (argc + 1) * sizeof(*argv));
|
|
|
|
if ((error= load_defaults(config_file, (const char **) load_default_groups,
|
|
&count, &arguments)))
|
|
{
|
|
if (verbose && opt_defaults_file_used)
|
|
{
|
|
if (error == 1)
|
|
fprintf(stderr, "WARNING: Defaults file '%s' not found!\n",
|
|
config_file);
|
|
/* This error is not available now. For the future */
|
|
if (error == 2)
|
|
fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n",
|
|
config_file);
|
|
}
|
|
error= 2;
|
|
}
|
|
|
|
for (argument= arguments+1 ; *argument ; argument++)
|
|
puts(*argument);
|
|
my_free((char*) load_default_groups,MYF(0));
|
|
free_defaults(arguments);
|
|
|
|
exit(error);
|
|
}
|