diff options
| author | Bruce Momjian | 2000-10-11 17:55:34 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2000-10-11 17:55:34 +0000 |
| commit | 5e38665f8a80154417e4351b600466d36dca7b26 (patch) | |
| tree | 64738f7a32912c8c3a674cf8d93759491fa1ec90 | |
| parent | a37ab1d385203f31e2daf8ca8dce5f5a209f80b7 (diff) | |
Update make_mkid
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 18 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 9 | ||||
| -rwxr-xr-x | src/tools/make_mkid | 6 |
3 files changed, 28 insertions, 5 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 7b49bcdab9..90fc52d7e5 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.169 2000/10/08 09:25:36 ishii Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.170 2000/10/11 17:55:32 momjian Exp $ * * NOTES * @@ -544,6 +544,22 @@ PostmasterMain(int argc, char *argv[]) } /* + * Select default values for switches where needed + */ + if (HostName == NULL) + { + if (!(HostName = getenv("PGHOST"))) + { + HostName = "any"; + } + } + else if (!NetServer) + { + fprintf(stderr, "%s: -h requires -i.\n", progname); + exit(1); + } + + /* * Check for invalid combinations of switches */ if (NBuffers < 2 * MaxBackends || NBuffers < 16) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index e877f41e73..cf6831df00 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.12 2000/10/08 09:25:37 ishii Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.13 2000/10/11 17:55:32 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <[email protected]>. @@ -237,6 +237,8 @@ ConfigureNamesInt[] = DEF_NBUFFERS, 16, INT_MAX}, {"port", PGC_POSTMASTER, &PostPortName, DEF_PGPORT, 1, 65535}, + {"unixsocket", PGC_POSTMASTER, &UnixSocketName, + DEF_PGSOCKETFILE, 1, 65535}, {"sort_mem", PGC_USERSET, &SortMem, 512, 1, INT_MAX}, @@ -372,7 +374,10 @@ ResetAllOptions(void) } if (getenv("PGPORT")) - PostPortName = atoi(getenv("PGPORT")); + PostPortNumber = atoi(getenv("PGPORT")); + + if (UnixSocketName == NULL) + UnixSocketName = getenv("PGUNIXSOCKET"); } diff --git a/src/tools/make_mkid b/src/tools/make_mkid index 6827e5710c..1565b9c806 100755 --- a/src/tools/make_mkid +++ b/src/tools/make_mkid @@ -1,6 +1,8 @@ #!/bin/sh -find `pwd`/ \( -name _deadcode -a -prune \) -o \ - -type f -name '*.[chyl]' -print|sed 's;//;/;g' | mkid - +#set -x + +mkid `find \`pwd\`/ \( -name _deadcode -a -prune \) -o \ + -type f -name '*.[chyl]' -print|sed 's;//;/;g'` find . -name 'CVS' -prune -o -type d -print |while read DIR do |