diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-04 00:57:51 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-01-04 00:57:51 +0000 |
| commit | eeb2189112fc2136bf697f2b7d20e436acc8880b (patch) | |
| tree | 9405f9d876530cf5b457f1de0695d7ad63e56511 /src/backend/tcop/postgres.c | |
| parent | d6061d2f31187795790e7e63d5d9730f9d78e7ea (diff) | |
| download | postgresql-eeb2189112fc2136bf697f2b7d20e436acc8880b.tar.gz postgresql-eeb2189112fc2136bf697f2b7d20e436acc8880b.zip | |
Fix erroneous implementation of -s in postmaster.c (the switch doesn't take
an optarg). Add some comments noting that code in three different files has
to be kept in sync. Fix erroneous description of -S switch (it sets work_mem
not silent_mode), and do some light copy-editing elsewhere in postgres-ref.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index f4b5d59d83e..6ddc9cc1caa 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.519 2006/12/08 02:15:07 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.520 2007/01/04 00:57:51 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2756,6 +2756,11 @@ PostgresMain(int argc, char *argv[], const char *username) ctx = PGC_POSTMASTER; gucsource = PGC_S_ARGV; /* initial switches came from command line */ + /* + * Parse command-line options. CAUTION: keep this in sync with + * postmaster/postmaster.c (the option sets should not conflict) + * and with the common help() function in main/main.c. + */ while ((flag = getopt(argc, argv, "A:B:c:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:y:-:")) != -1) { switch (flag) |