|
6 | 6 | * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group |
7 | 7 | * Portions Copyright (c) 1994, Regents of the University of California |
8 | 8 | * |
9 | | - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.138 2004/02/25 19:41:22 momjian Exp $ |
| 9 | + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.139 2004/03/16 05:05:57 momjian Exp $ |
10 | 10 | * |
11 | 11 | *------------------------------------------------------------------------- |
12 | 12 | */ |
@@ -140,10 +140,6 @@ write_group_file(Relation grel) |
140 | 140 | bufsize=strlen(filename)+12; |
141 | 141 | tempname= (char*)palloc(bufsize); |
142 | 142 | snprintf(tempname,bufsize,"%s.%d",filename,MyProcPid); |
143 | | -#if defined(WIN32)|| defined(__CYGWIN__) |
144 | | -filename=repalloc(filename,strlen(filename)+1+strlen(".new")); |
145 | | -strcat(filename,".new"); |
146 | | -#endif |
147 | 143 |
|
148 | 144 | oumask=umask((mode_t)077); |
149 | 145 | fp=AllocateFile(tempname,"w"); |
@@ -291,10 +287,6 @@ write_user_file(Relation urel) |
291 | 287 | bufsize=strlen(filename)+12; |
292 | 288 | tempname= (char*)palloc(bufsize); |
293 | 289 | snprintf(tempname,bufsize,"%s.%d",filename,MyProcPid); |
294 | | -#if defined(WIN32)|| defined(__CYGWIN__) |
295 | | -filename=repalloc(filename,strlen(filename)+1+strlen(".new")); |
296 | | -strcat(filename,".new"); |
297 | | -#endif |
298 | 290 |
|
299 | 291 | oumask=umask((mode_t)077); |
300 | 292 | fp=AllocateFile(tempname,"w"); |
@@ -466,37 +458,13 @@ AtEOXact_UpdatePasswordFile(bool isCommit) |
466 | 458 | user_file_update_needed= false; |
467 | 459 | write_user_file(urel); |
468 | 460 | heap_close(urel,NoLock); |
469 | | -#if defined(WIN32)|| defined(__CYGWIN__) |
470 | | -{ |
471 | | -/* Rename active file while not holding an exclusive lock */ |
472 | | -char*filename=user_getfilename(),*filename_new; |
473 | | - |
474 | | -filename_new=palloc(strlen(filename)+1+strlen(".new")); |
475 | | -sprintf(filename_new,"%s.new",filename); |
476 | | -rename(filename_new,filename); |
477 | | -pfree(filename); |
478 | | -pfree(filename_new); |
479 | | -} |
480 | | -#endif |
481 | 461 | } |
482 | 462 |
|
483 | 463 | if (group_file_update_needed) |
484 | 464 | { |
485 | 465 | group_file_update_needed= false; |
486 | 466 | write_group_file(grel); |
487 | 467 | heap_close(grel,NoLock); |
488 | | -#if defined(WIN32)|| defined(__CYGWIN__) |
489 | | -{ |
490 | | -/* Rename active file while not holding an exclusive lock */ |
491 | | -char*filename=group_getfilename(),*filename_new; |
492 | | - |
493 | | -filename_new=palloc(strlen(filename)+1+strlen(".new")); |
494 | | -sprintf(filename_new,"%s.new",filename); |
495 | | -rename(filename_new,filename); |
496 | | -pfree(filename); |
497 | | -pfree(filename_new); |
498 | | -} |
499 | | -#endif |
500 | 468 | } |
501 | 469 |
|
502 | 470 | /* |
|