remove openbsd-compat/utime.h openbsd-compat/utimes.c

4 files changed, 6 insertions, 110 deletions

diff --git a/openbsd-compat/Makefile.am b/openbsd-compat/Makefile.am
index 332bfdfc..4148b6a0 100644
--- a/openbsd-compat/Makefile.am
+++ b/openbsd-compat/Makefile.am
@@ -3,12 +3,11 @@ noinst_LIBRARIES = libopenbsd-compat.a
 libopenbsd_compat_a_SOURCES =							\
 		base64.c basename.c bsd-arc4random.c bsd-closefrom.c		\
 		bsd-getpeereid.c bsd-waitpid.c daemon.c dirname.c entropy.c	\
-		fgetln.c getopt.c fmt_scaled.c fparseln.c imsg.c		\
-		imsg-buffer.c mktemp.c setresguid.c setproctitle.c strlcat.c	\
-		strlcpy.c strmode.c strtonum.c strsep.c utimes.c vis.c xmalloc.c
+		fgetln.c getopt.c fmt_scaled.c fparseln.c imsg.c imsg-buffer.c	\
+		mktemp.c setresguid.c setproctitle.c strlcat.c strlcpy.c	\
+		strmode.c strtonum.c strsep.c vis.c xmalloc.c
 
-EXTRA_DIST =	base64.h bsd-waitpid.h defines.h entropy.h imsg.h		\
-		includes.h openbsd-compat.h sys-queue.h sys-tree.h utime.h vis.h\
-		xmalloc.h
+EXTRA_DIST =	base64.h bsd-waitpid.h defines.h entropy.h imsg.h includes.h	\
+		openbsd-compat.h sys-queue.h sys-tree.h vis.h xmalloc.h
 
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/openbsd-compat
diff --git a/openbsd-compat/NOTES b/openbsd-compat/NOTES
index 5dd59a64..537af38e 100644
--- a/openbsd-compat/NOTES
+++ b/openbsd-compat/NOTES
@@ -19,7 +19,7 @@ imsg.{c,h}		part of /usr/src/libutil/imsg.c
 includes.h		portable openssh
 log.h
 mktemp.c		portable openssh
-openbsd-compat.h	
+openbsd-compat.h	portable openssh
 setproctitle.c		portable openssh
 strlcat.c		portable openssh
 strlcpy.c		portable openssh
@@ -28,7 +28,5 @@ strsep.c		portable openssh
 strtonum.c		portable openssh
 sys-queue.h		portable openssh
 sys-tree.h		portable openssh
-utime.h			http://www.sudo.ws/cgi-bin/cvsweb/~checkout~/sudo/emul/utime.h?rev=1.25
-utimes.c		http://www.sudo.ws/cgi-bin/cvsweb/~checkout~/sudo/utimes.c?rev=1.9
 vis.{c,h}		portable openssh
 xmalloc.{c,h}		portable openssh
diff --git a/openbsd-compat/utime.h b/openbsd-compat/utime.h
deleted file mode 100644
index e5c63a5b..00000000
--- a/openbsd-compat/utime.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1996, 1998-2005 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
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef	_UTIME_H
-#define	_UTIME_H
-
-struct	utimbuf {
-	time_t	actime;		/* access time */
-	time_t	modtime;	/* mod time */
-};
-
-#ifdef __STDC__
-int utime(const char *, const struct utimbuf *);
-#else
-int utime();
-#endif
-
-#endif	/* _UTIME_H */
diff --git a/openbsd-compat/utimes.c b/openbsd-compat/utimes.c
deleted file mode 100644
index a4c8a165..00000000
--- a/openbsd-compat/utimes.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2004-2005 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
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "includes.h"
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#if TIME_WITH_SYS_TIME
-# include <time.h>
-#endif
-
-#ifdef HAVE_UTIME_H
-# include <utime.h>
-#else
-# include "utime.h"
-#endif
-
-#ifndef HAVE_UTIMES
-/*
- * Emulate utimes() via utime()
- */
-int
-utimes(file, times)
-    const char *file;
-    const struct timeval *times;
-{
-    if (times != NULL) {
-	struct utimbuf utb;
-
-	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));
-    } else
-	return(utime(file, NULL));
-}
-#endif /* !HAVE_UTIMES */
-
-#ifdef HAVE_FUTIME
-/*
- * Emulate futimes() via futime()
- */
-int
-futimes(fd, times)
-    int fd;
-    const struct timeval *times;
-{
-    if (times != NULL) {
-	struct utimbuf utb;
-
-	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));
-    } else
-	return(futime(fd, NULL));
-}
-#endif /* HAVE_FUTIME */