diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-02-25 19:41:23 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-02-25 19:41:23 +0000 |
| commit | c672aa823bdc02831ae60f403b2069107de675f7 (patch) | |
| tree | 0d5566d0df4056250b3a7d74d21a7d69b58f28b2 /src/backend/commands/user.c | |
| parent | 5ada9ef088ae0151a2f6efe48203100ef5b51113 (diff) | |
| download | postgresql-c672aa823bdc02831ae60f403b2069107de675f7.tar.gz postgresql-c672aa823bdc02831ae60f403b2069107de675f7.zip | |
For application to HEAD, following community review.
* Changes incorrect CYGWIN defines to __CYGWIN__
* Some localtime returns NULL checks (when unchecked cause SEGVs under
Win32
regression tests)
* Rationalized CreateSharedMemoryAndSemaphores and
AttachSharedMemoryAndSemaphores (Bruce, I finally remembered to do it);
requires attention.
Claudio Natoli
Diffstat (limited to 'src/backend/commands/user.c')
| -rw-r--r-- | src/backend/commands/user.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 9352aeb0ec0..88af5d19693 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.137 2004/02/10 01:55:25 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.138 2004/02/25 19:41:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -140,11 +140,11 @@ write_group_file(Relation grel) bufsize = strlen(filename) + 12; tempname = (char *) palloc(bufsize); snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid); -#if defined(WIN32) || defined(CYGWIN) +#if defined(WIN32) || defined(__CYGWIN__) filename = repalloc(filename, strlen(filename) + 1 + strlen(".new")); strcat(filename, ".new"); #endif - + oumask = umask((mode_t) 077); fp = AllocateFile(tempname, "w"); umask(oumask); @@ -291,7 +291,7 @@ write_user_file(Relation urel) bufsize = strlen(filename) + 12; tempname = (char *) palloc(bufsize); snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid); -#if defined(WIN32) || defined(CYGWIN) +#if defined(WIN32) || defined(__CYGWIN__) filename = repalloc(filename, strlen(filename) + 1 + strlen(".new")); strcat(filename, ".new"); #endif @@ -466,7 +466,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit) user_file_update_needed = false; write_user_file(urel); heap_close(urel, NoLock); -#if defined(WIN32) || defined(CYGWIN) +#if defined(WIN32) || defined(__CYGWIN__) { /* Rename active file while not holding an exclusive lock */ char *filename = user_getfilename(), *filename_new; @@ -485,7 +485,7 @@ AtEOXact_UpdatePasswordFile(bool isCommit) group_file_update_needed = false; write_group_file(grel); heap_close(grel, NoLock); -#if defined(WIN32) || defined(CYGWIN) +#if defined(WIN32) || defined(__CYGWIN__) { /* Rename active file while not holding an exclusive lock */ char *filename = group_getfilename(), *filename_new; |