mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
4fa2747a63
don't include my_progname in the error message, my_error starts from it automatically, resulting in, like /usr/bin/mysqladmin: Notice: /usr/bin/mysqladmin is deprecated and will be removed in a future release, use command 'mariadb-admin' and remove "Notice" so that the problem description would directly follow the executable name. make the check to work when the executable is in the PATH (so, invoked simply like 'mysql' and thus readlink cannot find it) fix the check in mysql_install_db and mysql_secure_installation to not print the warning if the intermediate path contains "mysql" substring add this message also to * mysql_waitpid * mysql_convert_table_format * mysql_find_rows * mysql_setpermissions * mysqlaccess * mysqld_multi * mysqld_safe * mysqldumpslow * mysqlhotcopy * mysql_ldb Closes #2273
107 lines
2.9 KiB
C
107 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 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", my_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;
|
|
|
|
MY_INIT(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", my_progname, VER);
|
|
printf("usage: %s [options] #pid #time\n\n", my_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);
|
|
}
|