Merge commit 'upstream/1.7.6p1'

[debian/sudo] / utimes.c

diff --git a/utimes.c b/utimes.c
index ae163cd592e68b56750f679adf08471cb0ee62de..5ff4379c0f9fb682a11e70d7553026f7c7a257a3 100644 (file)
--- a/utimes.c
+++ b/utimes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2004-2005, 2007 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,20 +20,16 @@
 #include <sys/time.h>
 #include <stdio.h>
 #if TIME_WITH_SYS_TIME
-#include <time.h>
+# include <time.h>
 #endif
 
 #ifdef HAVE_UTIME_H
 # include <utime.h>
 #else
-# include <emul/utime.h>
+# include "emul/utime.h"
 #endif
 
-#include <compat.h>
-
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: utimes.c,v 1.8.2.3 2007/06/12 00:56:43 millert Exp $";
-#endif /* lint */
+#include "missing.h"
 
 #ifndef HAVE_UTIMES
 /*
@@ -49,9 +45,9 @@ utimes(file, times)
 
        utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000);
        utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000);
-       return(utime(file, &utb));
+       return utime(file, &utb);
     } else
-       return(utime(file, NULL));
+       return utime(file, NULL);
 }
 #endif /* !HAVE_UTIMES */
 
@@ -69,8 +65,8 @@ futimes(fd, times)
 
        utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000);
        utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000);
-       return(futime(fd, &utb));
+       return futime(fd, &utb);
     } else
-       return(futime(fd, NULL));
+       return futime(fd, NULL);
 }
 #endif /* HAVE_FUTIME */