diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-11-06 22:18:10 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-11-06 22:18:10 +0000 |
| commit | 306c44eeadc9e33f415ff011f254b0527edfa88d (patch) | |
| tree | d9f6a2d9250f4d169af38fae8b9af349bbd88f34 /src/backend/postmaster/postmaster.c | |
| parent | 6f2f1690156d4815a40977f900f098af4f745086 (diff) | |
| download | postgresql-306c44eeadc9e33f415ff011f254b0527edfa88d.tar.gz postgresql-306c44eeadc9e33f415ff011f254b0527edfa88d.zip | |
Add -V option to backend, to show version, since --version doesn't seem
to work everywhere. Also, on FreeBSD you need to set the optreset variable
to 1 before parsing the command line a second time with getopt().
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 15 |
1 files changed, 11 insertions, 4 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) { |