Commit6a9627e

committed

Last minute clean up for SunOS...

From: t-ishii@sra.co.jp

1 parent86d1343 commit6a9627eCopy full SHA for 6a9627e

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.39 1998/02/26 04:31:53momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.40 1998/03/02 05:41:53scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -564,8 +564,8 @@ static char sock_path[MAXPGPATH + 1] = "";`
`564`	`564`	`* Shutdown routine for backend connection`
`565`	`565`	`* If a Unix socket is used for communication, explicitly close it.`
`566`	`566`	`*/`
`567`		`-staticvoid`
`568`		`-do_unlink()`
	`567`	`+void`
	`568`	`+StreamDoUnlink()`
`569`	`569`	`{`
`570`	`570`	`if (sock_path[0])`
`571`	`571`	`unlink(sock_path);`
`@@ -645,7 +645,6 @@ StreamServerPort(char hostName, short portName, int fdP)`
`645`	`645`	`if (family==AF_UNIX)`
`646`	`646`	`{`
`647`	`647`	`chmod(sock_path,0777);`
`648`		`-atexit(do_unlink);`
`649`	`648`	`}`
`650`	`649`	`return (STATUS_OK);`
`651`	`650`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.19 1998/02/26 04:35:38 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.20 1998/03/02 05:41:55 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*`
`@@ -38,6 +38,7 @@`
`38`	`38`	`#include<sys/sem.h>`
`39`	`39`	`#include<sys/shm.h>`
`40`	`40`	`#include"utils/memutils.h"`
	`41`	`+#include"libpq/libpq.h"`
`41`	`42`
`42`	`43`	`#if defined(sparc_solaris)`
`43`	`44`	`#include<string.h>`
`@@ -136,6 +137,7 @@ exitpg(int code)`
`136`	`137`	`for (i=onexit_index-1;i >=0;--i)`
`137`	`138`	`(*onexit_list[i].function) (code,onexit_list[i].arg);`
`138`	`139`
	`140`	`+StreamDoUnlink();`
`139`	`141`	`exit(code);`
`140`	`142`	`}`
`141`	`143`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: libpq.h,v 1.12 1998/02/26 04:41:51 momjian Exp $`
	`9`	`+ * $Id: libpq.h,v 1.13 1998/03/02 05:42:06 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -282,5 +282,6 @@ extern void pq_async_notify(void);`
`282`	`282`	`externintStreamServerPort(charhostName,shortportName,intfdP);`
`283`	`283`	`externintStreamConnection(intserver_fd,Port*port);`
`284`	`284`	`externvoidStreamClose(intsock);`
	`285`	`+externvoidStreamDoUnlink(void);`
`285`	`286`
`286`	`287`	`#endif/* LIBPQ_H */`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: pqcomm.h,v 1.23 1998/02/26 04:41:53 momjian Exp $`
	`9`	`+ * $Id: pqcomm.h,v 1.24 1998/03/02 05:42:15 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -35,8 +35,9 @@ typedef union SockAddr`
`35`	`35`	`/* Configure the UNIX socket address for the well known port. */`
`36`	`36`
`37`	`37`	`#defineUNIXSOCK_PATH(sun,port) \`
`38`		`-(sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)) + \`
`39`		`-offsetof(struct sockaddr_un, sun_path))`
	`38`	`+ (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), \`
	`39`	`+ strlen((sun).sun_path)+ offsetof(struct sockaddr_un, sun_path))`
	`40`	`+`
`40`	`41`	`/*`
`41`	`42`	`*We do this because sun_len is in BSD's struct, while others don't.`
`42`	`43`	`*We never actually set BSD's sun_len, and I can't think of a`

Comments

(0)