Better handling of collision with AIX stpncpy() function.

[gnulib.git] / lib / utime.c

diff --git a/lib/utime.c b/lib/utime.c
index f5507cb..25657ee 100644 (file)
--- a/lib/utime.c
+++ b/lib/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2001-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -27,6 +27,11 @@
 # include <utime.h>
 #endif
 
+#if !HAVE_UTIMES_NULL
+# include <sys/stat.h>
+# include <fcntl.h>
+#endif
+
 #include "full-write.h"
 #include "safe-read.h"
 
@@ -53,15 +58,15 @@ utime_null (const char *file)
   int fd;
   char c;
   int status = 0;
-  struct stat sb;
+  struct stat st;
 
   fd = open (file, O_RDWR);
   if (fd < 0
-      || fstat (fd, &sb) < 0
+      || fstat (fd, &st) < 0
       || safe_read (fd, &c, sizeof c) == SAFE_READ_ERROR
       || lseek (fd, (off_t) 0, SEEK_SET) < 0
       || full_write (fd, &c, sizeof c) != sizeof c
-      /* Maybe do this -- it's necessary on SunOS4.1.3 with some combination
+      /* Maybe do this -- it's necessary on SunOS 4.1.3 with some combination
         of patches, but that system doesn't use this code: it has utimes.
         || fsync (fd) < 0
       */