From becc149523160d35e75b84359220f5e24cfb80c2 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 6 Sep 2001 19:42:48 +0000 Subject: Patch from Andrew Ip to add ftime, allowing openssl to be built. --- include/sys/timeb.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ libc/misc/time/Makefile | 2 +- libc/misc/time/ftime.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 include/sys/timeb.h create mode 100644 libc/misc/time/ftime.c diff --git a/include/sys/timeb.h b/include/sys/timeb.h new file mode 100644 index 000000000..52e5486b3 --- /dev/null +++ b/include/sys/timeb.h @@ -0,0 +1,45 @@ +/* Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _SYS_TIMEB_H +#define _SYS_TIMEB_H 1 + +#include + +#define __need_time_t +#include + + +__BEGIN_DECLS + +/* Structure returned by the `ftime' function. */ + +struct timeb { + time_t time; /* Seconds since epoch, as from `time'. */ + unsigned short int millitm; /* Additional milliseconds. */ + short int timezone; /* Minutes west of GMT. */ + short int dstflag; /* Nonzero if Daylight Savings Time used. */ +}; + +/* Fill in TIMEBUF with information about the current time. */ + +extern int ftime(struct timeb *__timebuf); + +__END_DECLS + +#endif /* sys/timeb.h */ diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile index 4ac8976a1..a3f8ae231 100644 --- a/libc/misc/time/Makefile +++ b/libc/misc/time/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)Rules.mak CSRC=localtime.c gmtime.c asctime.c ctime.c asc_conv.c tm_conv.c mktime.c \ localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c \ - clock.c difftime.c strftime.c time.c + clock.c difftime.c strftime.c time.c ftime.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) diff --git a/libc/misc/time/ftime.c b/libc/misc/time/ftime.c new file mode 100644 index 000000000..24789c9eb --- /dev/null +++ b/libc/misc/time/ftime.c @@ -0,0 +1,36 @@ +/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +int ftime(timebuf) +struct timeb *timebuf; +{ + struct timeval tv; + struct timezone tz; + + if (gettimeofday (&tv, &tz) < 0) + return -1; + + timebuf->time = tv.tv_sec; + timebuf->millitm = (tv.tv_usec + 999) / 1000; + timebuf->timezone = tz.tz_minuteswest; + timebuf->dstflag = tz.tz_dsttime; + return 0; +} -- cgit v1.2.3