Use time_t in bootlib

unix/boot/bootProto.h

@@ -1,6 +1,8 @@
 /* Copyright(c) 1986 Association of Universities for Research in Astronomy Inc.
  */
 
+#include <time.h>
+
 #define import_spp
 #define import_knames
 #include <iraf.h>
@@ -36,14 +38,14 @@ void 	os_putenv (char *name, char *value);
 int 	os_read (int fd, char *buf, int nbytes);
 int 	os_setfmode (char *fname, int mode);
 int 	os_setowner (char *fname, int uid, int gid);
-int 	os_setmtime (char *fname, long mtime);
+int 	os_setmtime (char *fname, time_t mtime);
 char   *os_strpak (XCHAR *sppstr, char *cstr, int maxch);
 XCHAR  *os_strupk (char *str, XCHAR *outstr, int maxch);
 char   *os_subdir (char *dir, char *subdir);
 int 	os_symlink (char *fname, char *valbuf, int maxch);
 int 	os_sysfile (char *sysfile, char *fname, int maxch);
 char   *os_irafpath (char *sysfile);
-long 	os_utime (long iraf_time);
-long 	os_itime (long unix_time);
+time_t 	os_utime (time_t iraf_time);
+time_t 	os_itime (time_t unix_time);
 int 	os_write (int fd, char *buf, int nbytes);
 char   *vfn2osfn (char *vfn, int new);

unix/boot/bootlib/ossettime.c

@@ -1,7 +1,7 @@
 /* Copyright(c) 1986 Association of Universities for Research in Astronomy Inc.
  */
 
-#include <unistd.h>
+#include <utime.h>
 #include "bootlib.h"
 
 
@@ -12,13 +12,12 @@
 int
 os_setmtime (
   char	*fname,
-  long	mtime 
+  time_t mtime
 )
 {
-	struct	timeval tvp[2];
+	struct	utimbuf times;
 
-	tvp[0].tv_sec  = tvp[1].tv_sec  = mtime;
-	tvp[0].tv_usec = tvp[1].tv_usec = 0L;
-
-	return (utimes (vfn2osfn(fname,0), tvp));
+	times.actime = mtime;
+	times.modtime = mtime;
+	return (utime (vfn2osfn(fname, 0), &times));
 }

unix/boot/bootlib/ostime.c

@@ -18,12 +18,12 @@ static	long os_timezone(void);
  * daylight savings time (1 hour), and file times will come out a bit off
  * but it probably won't matter.
  */
-long
-os_utime (long iraf_time)
+time_t
+os_utime (time_t iraf_time)
 {
 	time_t	time_var, lst;
 
-	lst = (time_t)iraf_time;
+	lst = iraf_time;
 
 	/* Add minutes westward from GMT */
 	time_var = lst + os_timezone();
@@ -32,20 +32,20 @@ os_utime (long iraf_time)
 	if (localtime(&lst)->tm_isdst)
 	    time_var += 60L * 60L;
 
-	return ((long)time_var + SECONDS_1970_TO_1980);
+	return (time_var + SECONDS_1970_TO_1980);
 }
 
 
 /* OS_ITIME -- Convert UNIX time (gmt, epoch 1970) to IRAF time (lst, epoch
  * 1980).	[MACHDEP]
  */
-long
-os_itime (long unix_time)
+time_t
+os_itime (time_t unix_time)
 {
 	struct	tm *localtime(const time_t *);
 	time_t	time_var, gmt;
 
-	gmt = (time_t)unix_time;
+	gmt = unix_time;
 
 	/* Subtract minutes westward from GMT */
 	time_var = gmt - os_timezone();
@@ -54,7 +54,7 @@ os_itime (long unix_time)
 	if (localtime(&gmt)->tm_isdst)
 	    time_var -= 60L * 60L;
 
-	return ((long)time_var - SECONDS_1970_TO_1980);
+	return time_var - SECONDS_1970_TO_1980;
 }
 
 

unix/boot/rtar/rtar.c

@@ -104,7 +104,7 @@ struct fheader {
 	int	gid;
 	int	isdir;
 	long	size;
-	long	mtime;
+	time_t	mtime;
 	long	chksum;
 	int	linkflag;
 	char	linkname[NAMSIZ];

unix/boot/wtar/wtar.c

@@ -71,7 +71,7 @@ struct fheader {
 	int	gid;
 	int	isdir;
 	long	size;
-	long	mtime;
+	time_t	mtime;
 	long	chksum;
 	int	linkflag;
 	char	linkname[NAMSIZ];