From e3d97c779d907e3556a40a69b84f001d95cf4d6a Mon Sep 17 00:00:00 2001 From: David Nugent Date: Tue, 23 Feb 1999 07:15:11 +0000 Subject: 1) Do not blindly ignore file update errors which may occur due to concurrent updating 2) Add -V , which allows maintaining user/group database in alternate locations other than /etc. --- pw/fileupd.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'pw/fileupd.c') diff --git a/pw/fileupd.c b/pw/fileupd.c index fe46480..d76259b 100644 --- a/pw/fileupd.c +++ b/pw/fileupd.c @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$Id: fileupd.c,v 1.5 1997/10/10 06:23:31 charnier Exp $"; + "$Id: fileupd.c,v 1.6 1998/07/16 17:18:24 nate Exp $"; #endif /* not lint */ #include @@ -175,16 +175,11 @@ fileupdate(char const * filename, mode_t fmode, char const * newline, char const * corrupted the original file * Unfortunately, it will lose the inode * and hence the lock. - * - * The implications of this is that this invocation of pw - * won't have the file locked and concurrent copies - * of pw, vipw etc could clobber what this one is doing. - * - * It should probably just return an error instead - * of going on like nothing is wrong. */ - if (fflush(infp) == EOF || ferror(infp)) - rc = rename(file, filename) == 0; + if (fflush(infp) == EOF || ferror(infp)) { + rc = errno; /* Preserve errno for return */ + rename(file, filename); + } else ftruncate(infd, ftell(infp)); } -- cgit v1.2.3