database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Move PGPORT envar handling to ResetAllOptions(). Improve long options

Browse Source 
parsing to not clobber the optarg string -- so that we can bring
SetOptsFile() up to speed.
This commit is contained in:
Peter Eisentraut
2000-07-03 20:46:10 +00:00
parent 51afb9305c
commit e2d3932e0e
5 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.163 2000/06/29 07:35:57 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.164 2000/07/03 20:46:00 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -1167,18 +1167,16 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
case '-':
{
/* A little 'long argument' simulation */
/* (copy&pasted from PostmasterMain() */
size_t equal_pos = strcspn(optarg, "=");
char *cp;
char *name, *value;
if (optarg[equal_pos] != '=')
ParseLongOption(optarg, &name, &value);
if (!value)
elog(ERROR, "--%s requires argument", optarg);
optarg[equal_pos] = '\0';
for(cp = optarg; *cp; cp++)
if (*cp == '-')
*cp = '_';
SetConfigOption(optarg, optarg + equal_pos + 1, PGC_BACKEND);
SetConfigOption(name, value, PGC_BACKEND);
free(name);
if (value)
free(value);
break;
}
@ -1408,7 +1406,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.163 $ $Date: 2000/06/29 07:35:57 $\n");
puts("$Revision: 1.164 $ $Date: 2000/07/03 20:46:00 $\n");
}
/*