diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 4 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 29 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 45 |
3 files changed, 34 insertions, 44 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index aa07c12279c..7dca3d567e5 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.41 1998/05/19 18:05:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.42 1998/05/27 18:32:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -621,7 +621,7 @@ StreamServerPort(char *hostName, short portName, int *fdP) pqdebug("%s", PQerrormsg); strcat(PQerrormsg, "\tIs another postmaster already running on that port?\n"); if (family == AF_UNIX) - strcat(PQerrormsg, "\tIf not, remove socket node (/tmp/.s.PGSQL.<portnr>)and retry.\n"); + strcat(PQerrormsg, "\tIf not, remove socket node (/tmp/.s.PGSQL.<portnumber>)and retry.\n"); else strcat(PQerrormsg, "\tIf not, wait a few seconds and retry.\n"); fputs(PQerrormsg, stderr); diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6f1c28b50ab..59b3007bd53 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.76 1998/03/30 16:47:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.77 1998/05/27 18:32:02 momjian Exp $ * * NOTES * @@ -186,10 +186,10 @@ static char ExtraOptions[ARGV_SIZE] = ""; * the postmaster stop (rather than kill) peers and not reinitialize * shared data structures. */ -static int Reinit = 1; -static int SendStop = 0; +static bool Reinit = true; +static int SendStop = false; -static int NetServer = 0; /* if not zero, postmaster listen for +static bool NetServer = false; /* if not zero, postmaster listen for * non-local connections */ /* @@ -360,7 +360,7 @@ PostmasterMain(int argc, char *argv[]) DebugLvl = 1; break; case 'i': - NetServer = 1; + NetServer = true; break; case 'm': /* Multiplexed backends no longer supported. */ @@ -375,7 +375,7 @@ PostmasterMain(int argc, char *argv[]) break; case 'n': /* Don't reinit shared mem after abnormal exit */ - Reinit = 0; + Reinit = false; break; case 'o': @@ -408,7 +408,7 @@ PostmasterMain(int argc, char *argv[]) * lets the wily post_hacker collect core dumps from * everyone. */ - SendStop = 1; + SendStop = true; break; default: /* usage() never returns */ @@ -508,17 +508,18 @@ pmdaemonize(void) static void usage(const char *progname) { - fprintf(stderr, "usage: %s [options..]\n", progname); + fprintf(stderr, "usage: %s [options]\n", progname); fprintf(stderr, "\t-B nbufs\tset number of shared buffers\n"); + fprintf(stderr, "\t-D datadir\tset data directory\n"); + fprintf(stderr, "\t-S \t\tsilent mode (disassociate from tty)\n"); + fprintf(stderr, "\t-a system\tuse this authentication system\n"); fprintf(stderr, "\t-b backend\tuse a specific backend server executable\n"); fprintf(stderr, "\t-d [1|2|3]\tset debugging level\n"); - fprintf(stderr, "\t-D datadir\tset data directory\n"); - fprintf(stderr, "\t-i \tlisten on TCP/IP sockets as well as Unix domain socket\n"); - fprintf(stderr, "\t-n\t\tdon't reinitialize shared memory after abnormal exit\n"); + fprintf(stderr, "\t-i \t\tlisten on TCP/IP sockets as well as Unix domain socket\n"); + fprintf(stderr, "\t-n \t\tdon't reinitialize shared memory after abnormal exit\n"); fprintf(stderr, "\t-o option\tpass 'option' to each backend servers\n"); - fprintf(stderr, "\t-p port\t\tspecify port for postmaster to listen on\n"); - fprintf(stderr, "\t-S\t\tsilent mode (disassociate from tty)\n"); - fprintf(stderr, "\t-s\t\tsend SIGSTOP to all backend servers if one dies\n"); + fprintf(stderr, "\t-p port\tspecify port for postmaster to listen on\n"); + fprintf(stderr, "\t-s \t\tsend SIGSTOP to all backend servers if one dies\n"); exit(1); } diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 1e254c84648..c8cad2444c7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.70 1998/05/26 03:20:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.71 1998/05/27 18:32:03 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -803,34 +803,23 @@ static void usage(char *progname) { fprintf(stderr, - "Usage: %s [-B nbufs] [-d lvl] ] [-f plantype] \t[-v protocol] [\t -o filename]\n", - progname); - fprintf(stderr, "\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLFNopQSs] [dbname]\n"); - fprintf(stderr, " b: consider bushy plan trees during optimization\n"); - fprintf(stderr, " B: set number of buffers in buffer pool\n"); - fprintf(stderr, " C: supress version info\n"); - fprintf(stderr, " d: set debug level\n"); - fprintf(stderr, " E: echo query before execution\n"); - fprintf(stderr, " e turn on European date format\n"); - fprintf(stderr, " F: turn off fsync\n"); - fprintf(stderr, " f: forbid plantype generation\n"); - fprintf(stderr, " i: don't execute the query, just show the plan tree\n"); + "Usage: %s [options] [dbname]\n", progname); + fprintf(stderr, "\t-B buffers\tset number of buffers in buffer pool\n"); + fprintf(stderr, "\t-C \t\tsupress version info\n"); + fprintf(stderr, "\t-D dir\t\tdata directory\n"); + fprintf(stderr, "\t-E \t\techo query before execution\n"); + fprintf(stderr, "\t-F \t\tturn off fsync\n"); #ifdef LOCK_MGR_DEBUG - fprintf(stderr, " K: set locking debug level [0|1|2]\n"); + fprintf(stderr, "\t-K \t\tset locking debug level [0|1|2]\n"); #endif - fprintf(stderr, " L: turn off locking\n"); - fprintf(stderr, " M: start as postmaster\n"); - fprintf(stderr, " N: don't use newline as query delimiter\n"); - fprintf(stderr, " o: send stdout and stderr to given filename \n"); - fprintf(stderr, " p: backend started by postmaster\n"); - fprintf(stderr, " P: set port file descriptor\n"); - fprintf(stderr, " Q: suppress informational messages\n"); - fprintf(stderr, " S: set amount of sort memory available\n"); - fprintf(stderr, " s: show stats after each query\n"); - fprintf(stderr, " t: trace component execution times\n"); - fprintf(stderr, " T: execute all possible plans for each query\n"); - fprintf(stderr, " v: set protocol version being used by frontend\n"); - fprintf(stderr, " x: control expensive function optimization\n"); + fprintf(stderr, "\t-P port\t\tset port file descriptor\n"); + fprintf(stderr, "\t-Q \t\tsuppress informational messages\n"); + fprintf(stderr, "\t-S buffers\tset amount of sort memory available\n"); + fprintf(stderr, "\t-d [1|2|3]\tset debug level\n"); + fprintf(stderr, "\t-e \t\tturn on European date format\n"); + fprintf(stderr, "\t-o file\t\tsend stdout and stderr to given filename \n"); + fprintf(stderr, "\t-s \t\tshow stats after each query\n"); + fprintf(stderr, "\t-v version\tset protocol version being used by frontend\n"); } /* ---------------------------------------------------------------- @@ -1328,7 +1317,7 @@ PostgresMain(int argc, char *argv[]) if (IsUnderPostmaster == false) { puts("\nPOSTGRES backend interactive interface"); - puts("$Revision: 1.70 $ $Date: 1998/05/26 03:20:00 $"); + puts("$Revision: 1.71 $ $Date: 1998/05/27 18:32:03 $"); } /* ---------------- |