12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 |
- $OpenBSD: patch-environ_c,v 1.2 2011/11/04 10:00:19 jasper Exp $
- --- environ.c.orig Mon Sep 29 12:00:24 1997
- +++ environ.c Fri Nov 4 10:57:45 2011
- @@ -40,11 +40,14 @@
-
- #define SUBS_DEFINED
-
- +#include <stdlib.h>
- #include <string.h>
- #include <dos.h>
- #include <io.h>
- #include <fcntl.h>
- #include <alloc.h>
- +#include <sys/types.h>
- +#include <utime.h>
-
- FILE *
- file_open(name, mode)
- @@ -432,14 +435,17 @@ uint host;
-
- #include <time.h>
-
- +#if !(defined(__OpenBSD__))
- #ifndef time_t
- #define time_t long
- #endif
- +#endif
-
- +#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)
- @@ -535,8 +541,12 @@ uint mode;
- }
-
- 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)
- @@ -552,6 +562,7 @@ gettz() /* returns the offset from GMT in seco
- noontm = localtime(&noon);
- retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
- return retval;
- +#endif
- }
-
- long
- @@ -609,7 +620,8 @@ uint host;
- (uint) attribute;
- (uint) host;
-
- - m_time = mstonix(tstamp) + gettz();
- + m_time = mstonix(tstamp);
- + m_time += gettz(m_time);
-
- tb.mtime = m_time; /* Set modification time */
- tb.atime = m_time; /* Set access time */
|