mirror of
https://github.com/MariaDB/server.git
synced 2025-11-04 04:46:15 +01:00
5d6ad2ad66
One should not change the program arguments! This change also reduces warnings from the icc compiler. Almost all changes are just syntax changes (adding const to 'get_one_option function' declarations). Other changes: - Added a few cast of 'argument' from 'const char*' to 'char *'. This was mainly in calls to 'external' functions we don't have control of. - Ensure that all reset of 'password command line argument' are similar. (In almost all cases it was just adding a comment and a cast) - In mysqlbinlog.cc and mysqld.cc there was a few cases that changed the command line argument. These places where changed to instead allocate the option in a MEM_ROOT to avoid changing the argument. Some of this code was changed to ensure that different programs did parsing the same way. Added a test case for the changes in mysqlbinlog.cc - Changed a few variables that took their value from command line options from 'char *' to 'const char *'.
108 lines
2.9 KiB
C
108 lines
2.9 KiB
C
/*
|
|
Copyright (c) 2003, 2010, Oracle and/or its affiliates
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
|
|
|
|
/* Wait until a program dies */
|
|
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <my_sys.h>
|
|
#include <my_getopt.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
static const char *VER= "1.1";
|
|
static char *progname;
|
|
static my_bool verbose;
|
|
|
|
void usage(void);
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
0, 0, 0, 0, 0},
|
|
{"help", 'I', "Synonym for -?.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
|
|
0, 0, 0, 0, 0},
|
|
{"verbose", 'v',
|
|
"Be more verbose. Give a warning, if kill can't handle signal 0.",
|
|
&verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"version", 'V', "Print 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}
|
|
};
|
|
|
|
static my_bool
|
|
get_one_option(const struct my_option *opt,
|
|
const char *argument __attribute__((unused)),
|
|
const char *filename __attribute__((unused)))
|
|
{
|
|
switch(opt->id) {
|
|
case 'V':
|
|
printf("%s version %s by Jani Tolonen\n", progname, VER);
|
|
exit(0);
|
|
case 'I':
|
|
case '?':
|
|
usage();
|
|
exit(0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int pid= 0, t= 0, sig= 0;
|
|
|
|
progname= argv[0];
|
|
|
|
if (handle_options(&argc, &argv, my_long_options, get_one_option))
|
|
exit(-1);
|
|
if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
|
|
(t= atoi(argv[1])) <= 0)
|
|
{
|
|
usage();
|
|
exit(-1);
|
|
}
|
|
for (; t > 0; t--)
|
|
{
|
|
if (kill((pid_t) pid, sig))
|
|
{
|
|
if (errno == EINVAL)
|
|
{
|
|
if (verbose)
|
|
printf("WARNING: kill couldn't handle signal 0, using signal 1.\n");
|
|
sig= 1;
|
|
t++;
|
|
continue;
|
|
}
|
|
return 0;
|
|
}
|
|
sleep(1);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
void usage(void)
|
|
{
|
|
printf("%s version %s by Jani Tolonen\n\n", progname, VER);
|
|
printf("usage: %s [options] #pid #time\n\n", progname);
|
|
printf("Description: Waits for a program, which program id is #pid, to\n");
|
|
printf("terminate within #time seconds. If the program terminates within\n");
|
|
printf("this time, or if the #pid no longer exists, value 0 is returned.\n");
|
|
printf("Otherwise 1 is returned. Both #pid and #time must be positive\n");
|
|
printf("integer arguments.\n\n");
|
|
printf("Options:\n");
|
|
my_print_help(my_long_options);
|
|
}
|