From 31338352bd89439c7c55d25c13d88338fa874771 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 19 Apr 2004 17:42:59 +0000 Subject: * Most changes are to fix warnings issued when compiling win32 * removed a few redundant defines * get_user_name safe under win32 * rationalized pipe read EOF for win32 (UPDATED PATCH USED) * changed all backend instances of sleep() to pg_usleep - except for the SLEEP_ON_ASSERT in assert.c, as it would exceed a 32-bit long [Note to patcher: If a SLEEP_ON_ASSERT of 2000 seconds is acceptable, please replace with pg_usleep(2000000000L)] I added a comment to that part of the code: /* * It would be nice to use pg_usleep() here, but only does 2000 sec * or 33 minutes, which seems too short. */ sleep(1000000); Claudio Natoli --- src/bin/scripts/common.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/bin/scripts/common.c') diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index 63204ece3d7..f14e0b206e1 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.6 2003/11/29 19:52:07 pgsql Exp $ + * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.7 2004/04/19 17:42:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,10 +35,15 @@ get_user_name(const char *progname) return pw->pw_name; #else static char username[128]; /* remains after function exit */ + DWORD len = sizeof(username)-1; - GetUserName(username, sizeof(username)-1); + if (!GetUserName(username, &len)) + { + perror(progname); + exit(1); + } return username; -#endif +#endif } -- cgit v1.2.3