Added new program, mysql_waitpid.

extra/Makefile.am

@@ -18,7 +18,7 @@ INCLUDES =		@MT_INCLUDES@ -I$(srcdir)/../include -I../include -I..
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
 bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
-			resolve_stack_dump mysql_install
+			resolve_stack_dump mysql_install mysql_waitpid
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

extra/mysql_waitpid.c

+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <my_global.h>
+#include <my_getopt.h>
+
+static const char *VER= "1.0";
+static char *progname;
+static int verbose= 0;
+
+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.", 0, 0, 0,
+   GET_NO_ARG, 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(int optid, const struct my_option *opt __attribute__((unused)),
+	       char *argument __attribute__((unused)))
+{
+  switch(optid) {
+  case 'V':
+    printf("%s version %s by Jani Tolonen\n", progname, VER);
+    exit(-1);
+  case 'I':
+  case '?':
+    usage();
+  }
+  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();
+  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);
+  exit(-1);
+}