diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libpq/pqcomm.c | 7 | ||||
| -rw-r--r-- | src/backend/storage/ipc/ipc.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 204578cb64b..41280c8bbc4 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.39 1998/02/26 04:31:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.40 1998/03/02 05:41:53 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -564,8 +564,8 @@ static char sock_path[MAXPGPATH + 1] = ""; * Shutdown routine for backend connection * If a Unix socket is used for communication, explicitly close it. */ -static void -do_unlink() +void +StreamDoUnlink() { if (sock_path[0]) unlink(sock_path); @@ -645,7 +645,6 @@ StreamServerPort(char *hostName, short portName, int *fdP) if (family == AF_UNIX) { chmod(sock_path, 0777); - atexit(do_unlink); } return (STATUS_OK); } diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index b0219b5635b..28fbd87a99d 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.19 1998/02/26 04:35:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.20 1998/03/02 05:41:55 scrappy Exp $ * * NOTES * @@ -38,6 +38,7 @@ #include <sys/sem.h> #include <sys/shm.h> #include "utils/memutils.h" +#include "libpq/libpq.h" #if defined(sparc_solaris) #include <string.h> @@ -136,6 +137,7 @@ exitpg(int code) for (i = onexit_index - 1; i >= 0; --i) (*onexit_list[i].function) (code, onexit_list[i].arg); + StreamDoUnlink(); exit(code); } |