diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 4 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 0d31b4a7dc3..a7d0effb803 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.325 2003/05/08 20:43:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.326 2003/05/09 15:57:24 momjian Exp $ * * NOTES * @@ -2431,7 +2431,7 @@ BackendFinalize(Port *port) #ifdef EXEC_BACKEND Assert(UsedShmemSegID != 0 && UsedShmemSegAddr != NULL); /* database name at the end because it might contain commas */ - snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%p,%s", port->sock, + snprintf(pbuf, NAMEDATALEN + 256, "%d,%d,%d,%p,%s", port->sock, canAcceptConnections(), UsedShmemSegID, UsedShmemSegAddr, port->database_name); av[ac++] = pbuf; #else diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 63b08dc969e..dd235e8765a 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.340 2003/05/08 18:16:36 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.341 2003/05/09 15:57:24 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2142,16 +2142,15 @@ PostgresMain(int argc, char *argv[], const char *username) { #ifdef EXEC_BACKEND char *p; - - sscanf(optarg, "%d,%d,%p,", &MyProcPort->sock, + int i; + int PMcanAcceptConnections; /* will eventually be global or static, when fork */ + + sscanf(optarg, "%d,%d,%d,%p,", &MyProcPort->sock, &PMcanAcceptConnections, &UsedShmemSegID, &UsedShmemSegAddr); /* Grab dbname as last param */ - p = strchr(optarg, ','); - if (p) - p = strchr(p+1, ','); - if (p) + for (i = 0, p = optarg-1; i < 4 && p; i++) p = strchr(p+1, ','); - if (p) + if (i == 4 && p) dbname = strdup(p+1); #else dbname = strdup(optarg); @@ -2512,7 +2511,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.340 $ $Date: 2003/05/08 18:16:36 $\n"); + puts("$Revision: 1.341 $ $Date: 2003/05/09 15:57:24 $\n"); } /* |