*
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.1 2004/05/27 03:37:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.2 2004/05/31 17:57:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static bool silence_echo = false;
static ShutdownMode shutdown_mode = SMART_MODE;
static int sig = SIGTERM; /* default */
-static int killproc;
static CtlCommand ctl_command = NO_COMMAND;
static char *pg_data_opts = NULL;
static char *pg_data = NULL;
static void do_restart(void);
static void do_reload(void);
static void do_status(void);
-static void do_kill(void);
-static long get_pgpid(void);
+static void do_kill(pid_t pid);
+static pid_t get_pgpid(void);
static char **readfile(char *path);
static int start_postmaster(void);
static bool test_postmaster_connection(void);
-static long
+static pid_t
get_pgpid(void)
{
FILE *pidf;
- long pid;
+ pid_t pid;
pidf = fopen(pid_file, "r");
if (pidf == NULL)
exit(1);
}
}
- fscanf(pidf, "%ld", &pid);
+ fscanf(pidf, "%u", &pid);
fclose(pidf);
return pid;
}
static void
do_start(void)
{
- long pid;
- long old_pid = 0;
+ pid_t pid;
+ pid_t old_pid = 0;
char *optline = NULL;
if (ctl_command != RESTART_COMMAND)
do_stop(void)
{
int cnt;
- long pid;
+ pid_t pid;
pid = get_pgpid();
pid = -pid;
fprintf(stderr,
_("%s: cannot stop postmaster; "
- "postgres is running (PID: %ld)\n"),
+ "postgres is running (PID: %u)\n"),
progname, pid);
exit(1);
}
- if (kill((pid_t) pid, sig) != 0)
+ if (kill(pid, sig) != 0)
{
- fprintf(stderr, _("stop signal failed\n"));
+ fprintf(stderr, _("stop signal failed (PID: %u): %s\n"), pid,
+ strerror(errno));
exit(1);
}
do_restart(void)
{
int cnt;
- long pid;
+ pid_t pid;
pid = get_pgpid();
pid = -pid;
fprintf(stderr,
_("%s: cannot restart postmaster; "
- "postgres is running (PID: %ld)\n"),
+ "postgres is running (PID: %u)\n"),
progname, pid);
fprintf(stderr, _("Please terminate postgres and try again.\n"));
exit(1);
}
- if (kill((pid_t) pid, sig) != 0)
+ if (kill(pid, sig) != 0)
{
- fprintf(stderr, _("stop signal failed\n"));
+ fprintf(stderr, _("stop signal failed (PID: %u): %s\n"), pid,
+ strerror(errno));
exit(1);
}
static void
do_reload(void)
{
- long pid;
+ pid_t pid;
pid = get_pgpid();
if (pid == 0) /* no pid file */
pid = -pid;
fprintf(stderr,
_("%s: cannot reload postmaster; "
- "postgres is running (PID: %ld)\n"),
+ "postgres is running (PID: %u)\n"),
progname, pid);
fprintf(stderr, _("Please terminate postgres and try again.\n"));
exit(1);
}
- if (kill((pid_t) pid, sig) != 0)
+ if (kill(pid, sig) != 0)
{
- fprintf(stderr, _("reload signal failed\n"));
+ fprintf(stderr, _("reload signal failed (PID: %u): %s\n"), pid,
+ strerror(errno));
exit(1);
}
static void
do_status(void)
{
- long pid;
+ pid_t pid;
pid = get_pgpid();
if (pid == 0) /* no pid file */
else if (pid < 0) /* standalone backend */
{
pid = -pid;
- fprintf(stdout, _("%s: a standalone backend \"postgres\" is running (PID: %ld)\n"), progname, pid);
+ fprintf(stdout, _("%s: a standalone backend \"postgres\" is running (PID: %u)\n"), progname, pid);
}
else /* postmaster */
{
char **optlines;
- fprintf(stdout, _("%s: postmaster is running (PID: %ld)\n"), progname, pid);
+ fprintf(stdout, _("%s: postmaster is running (PID: %u)\n"), progname, pid);
optlines = readfile(postopts_file);
if (optlines != NULL)
static void
-do_kill(void)
+do_kill(pid_t pid)
{
- if (kill(killproc, sig) != 0)
+ if (kill(pid, sig) != 0)
{
- fprintf(stderr, _("signal %d failed\n"), sig);
+ fprintf(stderr, _("signal %d failed (PID: %u): %s\n"), sig, pid,
+ strerror(errno));
exit(1);
}
}
int option_index;
int c;
+ int killproc = 0;
#ifdef WIN32
setvbuf(stderr, NULL, _IONBF, 0);
do_reload();
break;
case KILL_COMMAND:
- do_kill();
+ do_kill(killproc);
break;
default:
break;