mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
088e2395f1
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c
200 lines
6.6 KiB
C
200 lines
6.6 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; version 2 of the License.
|
|
|
|
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[] =
|
|
{
|
|
/*
|
|
NB: --config-file is troublesome, because get_defaults_options() doesn't
|
|
know about it, but we pretend --config-file is like --defaults-file. In
|
|
fact they behave differently: see the comments at the top of
|
|
mysys/default.c for how --defaults-file should behave.
|
|
|
|
This --config-file option behaves as:
|
|
- If it has a directory name part (absolute or relative), then only this
|
|
file is read; no error is given if the file doesn't exist
|
|
- If the file has no directory name part, the standard locations are
|
|
searched for a file of this name (and standard filename extensions are
|
|
added if the file has no extension)
|
|
*/
|
|
{"config-file", 'c', "Deprecated, please use --defaults-file instead. Name of config file to read; if no extension is given, default extension (e.g., .ini or .cnf) will be added",
|
|
(uchar**) &config_file, (uchar**) &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", (uchar**) &default_dbug_option,
|
|
(uchar**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
{"defaults-file", 'c', "Like --config-file, except: if first option, then read this file only, do not read global or per-user config files; should be the first option",
|
|
(uchar**) &config_file, (uchar**) &config_file, 0, GET_STR, REQUIRED_ARG,
|
|
0, 0, 0, 0, 0, 0},
|
|
{"defaults-extra-file", 'e',
|
|
"Read this file after the global config file and before the config file in the users home directory; should be the first option",
|
|
(uchar**) &my_defaults_extra_file, (uchar**) &my_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",
|
|
(uchar**) &my_defaults_group_suffix, (uchar**) &my_defaults_group_suffix,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"extra-file", 'e',
|
|
"Deprecated. Synonym for --defaults-extra-file.",
|
|
(uchar**) &my_defaults_extra_file,
|
|
(uchar**) &my_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 --defaults-file=example.cnf 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);
|
|
}
|