diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 15 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 060b0e5ef40..192e5205a14 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.178 2000/11/04 12:43:23 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.179 2000/11/06 22:18:06 petere Exp $ * * NOTES * @@ -57,7 +57,7 @@ #endif #ifdef HAVE_GETOPT_H -#include "getopt.h" +#include <getopt.h> #endif #include "catalog/pg_database.h" @@ -372,7 +372,7 @@ PostmasterMain(int argc, char *argv[]) * will occur. */ opterr = 1; - while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:?")) != EOF) + while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:SsV-:?")) != EOF) { switch(opt) { @@ -380,6 +380,10 @@ PostmasterMain(int argc, char *argv[]) potential_DataDir = optarg; break; + case 'V': + puts("postmaster (PostgreSQL) " PG_VERSION); + exit(0); + case '-': { char *name, *value; @@ -421,7 +425,10 @@ PostmasterMain(int argc, char *argv[]) IgnoreSystemIndexes(false); optind = 1; /* start over */ - while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:Ss-:?")) != EOF) +#ifdef HAVE_INT_OPTRESET + optreset = 1; +#endif + while ((opt = getopt(argc, argv, "A:a:B:b:D:d:Film:MN:no:p:SsV-:?")) != EOF) { switch (opt) { diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 29192686e6c..3a6cc57d3d8 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.185 2000/11/04 12:43:24 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.186 2000/11/06 22:18:08 petere Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1112,7 +1112,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha optind = 1; /* reset after postmaster's usage */ - while ((flag = getopt(argc, argv, "A:B:CD:d:Eef:FiLNOPo:p:S:st:v:W:x:-:?")) != EOF) + while ((flag = getopt(argc, argv, "A:B:CD:d:Eef:FiLNOPo:p:S:st:v:VW:x:-:?")) != EOF) switch (flag) { case 'A': @@ -1338,6 +1338,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha FrontendProtocol = (ProtocolVersion) atoi(optarg); break; + case 'V': + puts("postgres (PostgreSQL) " PG_VERSION); + exit(0); + case 'W': /* ---------------- * wait N seconds to allow attach from a debugger @@ -1635,7 +1639,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.185 $ $Date: 2000/11/04 12:43:24 $\n"); + puts("$Revision: 1.186 $ $Date: 2000/11/06 22:18:08 $\n"); } /* |