sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

r15953: our timegm() replacement still doesn't work, so grab the one from

Browse Source 
Heimdal which does work. This should fix most of the rest of the
failures on solaris
(This used to be commit acfaa98b5ea686feb81350baf09b3f4480f96edc)
This commit is contained in:
Andrew Tridgell 2006-05-30 05:57:43 +00:00 committed by Gerald (Jerry) Carter
parent 86f86f99ef
commit 0a1a19d9d9
4 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/lib/replace/config.mk
View File

@ -11,6 +11,7 @@ OBJ_FILES = \
[SUBSYSTEM::LIBREPLACE]
OBJ_FILES = replace.o \
snprintf.o \
timegm.o \
dlfcn.o \
getpass.o
PUBLIC_DEPENDENCIES = REPLACE_READDIR

13
source4/lib/replace/replace.c
View File

@ -368,19 +368,6 @@ duplicate a string
#endif /* HAVE_VSYSLOG */
#ifndef HAVE_TIMEGM
/*
yes, I know this looks insane, but its really needed. The function in the
Linux timegm() manpage does not work on solaris.
*/
time_t timegm(struct tm *tm)
{
time_t t = mktime(tm);
t -= mktime(gmtime(&t)) - (int)mktime(localtime(&t));
return t;
}
#endif
#ifndef HAVE_SETENV
int setenv(const char *name, const char *value, int overwrite)
{

4
source4/lib/replace/replace.h
View File

@ -112,6 +112,10 @@ int vasprintf(char **ptr, const char *format, va_list ap);
#define bzero(a,b) memset((a),'\0',(b))
#endif
#ifndef HAVE_TIMEGM
time_t timegm(struct tm *tm);
#endif
#ifndef PRINTF_ATTRIBUTE
#if __GNUC__ >= 3
/** Use gcc attribute to check printf fns. a1 is the 1-based index of

55
source4/heimdal/lib/asn1/timegm.c → source4/lib/replace/timegm.c
View File

@ -31,41 +31,42 @@
* SUCH DAMAGE.
*/
#include "der_locl.h"
/*
adapted for Samba4 by Andrew Tridgell
*/
RCSID("$Id: timegm.c,v 1.7 1999/12/02 17:05:02 joda Exp $");
#include "includes.h"
#include "system/time.h"
#ifndef HAVE_TIMEGM
static int
is_leap(unsigned y)
static int is_leap(unsigned y)
{
y += 1900;
return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
y += 1900;
return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
}
time_t
timegm (struct tm *tm)
time_t timegm(struct tm *tm)
{
static const unsigned ndays[2][12] ={
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
time_t res = 0;
unsigned i;
for (i = 70; i < tm->tm_year; ++i)
res += is_leap(i) ? 366 : 365;
for (i = 0; i < tm->tm_mon; ++i)
res += ndays[is_leap(tm->tm_year)][i];
res += tm->tm_mday - 1;
res *= 24;
res += tm->tm_hour;
res *= 60;
res += tm->tm_min;
res *= 60;
res += tm->tm_sec;
return res;
static const unsigned ndays[2][12] ={
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
time_t res = 0;
unsigned i;
for (i = 70; i < tm->tm_year; ++i)
res += is_leap(i) ? 366 : 365;
for (i = 0; i < tm->tm_mon; ++i)
res += ndays[is_leap(tm->tm_year)][i];
res += tm->tm_mday - 1;
res *= 24;
res += tm->tm_hour;
res *= 60;
res += tm->tm_min;
res *= 60;
res += tm->tm_sec;
return res;
}
#endif /* HAVE_TIMEGM */