1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-14 23:46:10 +00:00
freebsd-ports/archivers/unarj/files/patch-ac

84 lines
1.9 KiB
Plaintext
Raw Normal View History

1999-02-17 22:25:40 +00:00
--- environ.c.orig Mon Sep 29 14:00:24 1997
+++ environ.c Thu Feb 18 01:14:35 1999
@@ -430,16 +430,24 @@
#define SUBS_DEFINED
+#include <stdlib.h>
+#include <string.h>
#include <time.h>
+#include <sys/types.h>
1999-02-17 22:25:40 +00:00
+#include <utime.h>
-#ifndef time_t
-#define time_t long
-#endif
+/*#ifndef time_t
+ #define time_t long
+ #endif*/
+
+#include <sys/param.h>
+#if !(defined(BSD) && BSD >= 199306)
extern struct tm *localtime();
extern time_t time();
extern char *strcpy();
extern voidp *malloc();
+#endif
FILE *
file_open(name, mode)
1999-02-17 22:25:40 +00:00
@@ -535,8 +543,12 @@
}
long
-gettz() /* returns the offset from GMT in seconds */
+gettz(stamp) /* returns the offset from GMT in seconds */
+time_t stamp;
{
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ return -localtime(&stamp)->tm_gmtoff;
+#else
#define NOONOFFSET 43200L
#define SEC_IN_DAY (24L * 60L * 60L)
#define INV_VALUE (SEC_IN_DAY + 1L)
1999-02-17 22:25:40 +00:00
@@ -552,6 +564,7 @@
noontm = localtime(&noon);
retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
return retval;
+#endif
}
long
1999-02-17 22:25:40 +00:00
@@ -600,19 +613,29 @@
{
time_t m_time;
struct utimbuf
+#ifndef __FreeBSD__
{
time_t atime; /* New access time */
time_t mtime; /* New modification time */
} tb;
+#else
+ tb;
+#endif
(char *) name;
(uint) attribute;
(uint) host;
- m_time = mstonix(tstamp) + gettz();
+ m_time = mstonix(tstamp);
+ m_time += gettz(m_time);
1999-02-17 22:25:40 +00:00
+#ifndef __FreeBSD__
tb.mtime = m_time; /* Set modification time */
tb.atime = m_time; /* Set access time */
1999-02-17 22:25:40 +00:00
+#else
+ tb.modtime = m_time; /* Set modification time */
+ tb.actime = m_time; /* Set access time */
+#endif
/* set the time stamp on the file */
return utime(name, &tb);