Browse Source

Patch from Andrew Ip <aip@cwlinux.com> to add ftime,
allowing openssl to be built.

Eric Andersen 24 years ago
parent
commit
becc149523
3 changed files with 82 additions and 1 deletions
  1. 45 0
      include/sys/timeb.h
  2. 1 1
      libc/misc/time/Makefile
  3. 36 0
      libc/misc/time/ftime.c

+ 45 - 0
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 <features.h>
+
+#define __need_time_t
+#include <time.h>
+
+
+__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 */

+ 1 - 1
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)

+ 36 - 0
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 <sys/timeb.h>
+#include <sys/time.h>
+
+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;
+}