Update make_mkid

bmomjian · bmomjian · commit 5e38665f8a80 · 2000-10-11T17:55:34.000Z
diff --git 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
  *
@@ -543,6 +543,22 @@ PostmasterMain(int argc, char *argv[])
 		exit(1);
 	}
 
+	/*
+	 * 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
 	 */
diff --git 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 <peter_e@gmx.net>.
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* Support for grand unified configuration scheme, including SET`
`5`	`5`	`* command, configuration file, and command line options.`
`6`	`6`	`*`
`7`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.12 2000/10/08 09:25:37 ishii Exp $`
	`7`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.13 2000/10/11 17:55:32 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`* Copyright 2000 by PostgreSQL Global Development Group`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`@@ -237,6 +237,8 @@ ConfigureNamesInt[] =`
`237`	`237`	`DEF_NBUFFERS, 16, INT_MAX},`
`238`	`238`	`{"port", PGC_POSTMASTER, &PostPortName,`
`239`	`239`	`DEF_PGPORT, 1, 65535},`
	`240`	`+ {"unixsocket", PGC_POSTMASTER, &UnixSocketName,`
	`241`	`+ DEF_PGSOCKETFILE, 1, 65535},`
`240`	`242`
`241`	`243`	`{"sort_mem", PGC_USERSET, &SortMem,`
`242`	`244`	`512, 1, INT_MAX},`
`@@ -372,7 +374,10 @@ ResetAllOptions(void)`
`372`	`374`	`}`
`373`	`375`
`374`	`376`	`if (getenv("PGPORT"))`
`375`		`- PostPortName = atoi(getenv("PGPORT"));`
	`377`	`+ PostPortNumber = atoi(getenv("PGPORT"));`
	`378`	`+`
	`379`	`+ if (UnixSocketName == NULL)`
	`380`	`+ UnixSocketName = getenv("PGUNIXSOCKET");`
`376`	`381`	`}`
`377`	`382`
`378`	`383`