Module Name: src
Committed By: kamil
Date: Fri Jun 30 03:43:57 UTC 2017
Modified Files:
src/bin/ksh: c_sh.c c_ulimit.c config.h mail.c main.c var.c
Removed Files:
src/bin/ksh: ksh_time.h
Log Message:
ksh: Drop support for systems with broken <sys/time.h> / <time.h>
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/bin/ksh/c_sh.c
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/c_ulimit.c
cvs rdiff -u -r1.49 -r1.50 src/bin/ksh/config.h
cvs rdiff -u -r1.2 -r0 src/bin/ksh/ksh_time.h
cvs rdiff -u -r1.5 -r1.6 src/bin/ksh/mail.c
cvs rdiff -u -r1.18 -r1.19 src/bin/ksh/main.c
cvs rdiff -u -r1.17 -r1.18 src/bin/ksh/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/c_sh.c
diff -u src/bin/ksh/c_sh.c:1.20 src/bin/ksh/c_sh.c:1.21
--- src/bin/ksh/c_sh.c:1.20 Fri Jun 30 03:23:18 2017
+++ src/bin/ksh/c_sh.c Fri Jun 30 03:43:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: c_sh.c,v 1.20 2017/06/30 03:23:18 kamil Exp $ */
+/* $NetBSD: c_sh.c,v 1.21 2017/06/30 03:43:57 kamil Exp $ */
/*
* built-in Bourne commands
@@ -6,14 +6,15 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: c_sh.c,v 1.20 2017/06/30 03:23:18 kamil Exp $");
+__RCSID("$NetBSD: c_sh.c,v 1.21 2017/06/30 03:43:57 kamil Exp $");
#endif
+#include <sys/time.h>
#include <sys/times.h>
+#include <time.h>
#include "sh.h"
#include "ksh_stat.h" /* umask() */
-#include "ksh_time.h"
static char *clocktos ARGS((clock_t t));
Index: src/bin/ksh/c_ulimit.c
diff -u src/bin/ksh/c_ulimit.c:1.15 src/bin/ksh/c_ulimit.c:1.16
--- src/bin/ksh/c_ulimit.c:1.15 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/c_ulimit.c Fri Jun 30 03:43:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: c_ulimit.c,v 1.15 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: c_ulimit.c,v 1.16 2017/06/30 03:43:57 kamil Exp $ */
/*
ulimit -- handle "ulimit" builtin
@@ -20,12 +20,13 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: c_ulimit.c,v 1.15 2017/06/22 14:20:46 kamil Exp $");
+__RCSID("$NetBSD: c_ulimit.c,v 1.16 2017/06/30 03:43:57 kamil Exp $");
#endif
+#include <sys/time.h>
+#include <time.h>
#include "sh.h"
-#include "ksh_time.h"
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif /* HAVE_SYS_RESOURCE_H */
Index: src/bin/ksh/config.h
diff -u src/bin/ksh/config.h:1.49 src/bin/ksh/config.h:1.50
--- src/bin/ksh/config.h:1.49 Fri Jun 30 03:35:16 2017
+++ src/bin/ksh/config.h Fri Jun 30 03:43:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.49 2017/06/30 03:35:16 kamil Exp $ */
+/* $NetBSD: config.h,v 1.50 2017/06/30 03:43:57 kamil Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -33,9 +33,6 @@
/* Define if `sys_siglist' is declared by <signal.h>. */
#define SYS_SIGLIST_DECLARED 1
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
/* Define as the return value of signal handlers (0 or ). */
#define RETSIGVAL
@@ -57,9 +54,6 @@
/* Define if C compiler groks __attribute__((...)) (const, noreturn, format) */
#define HAVE_GCC_FUNC_ATTR 1
-/* Define if time() is declared in <time.h> */
-#define TIME_DECLARED 1
-
/* Define if sys_errlist[] and sys_nerr are in the C library */
#define HAVE_SYS_ERRLIST 1
@@ -196,9 +190,6 @@
/* Define if you have the <sys/resource.h> header file. */
#define HAVE_SYS_RESOURCE_H 1
-/* Define if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
/* Define if you have the <ulimit.h> header file. */
#define HAVE_ULIMIT_H
Index: src/bin/ksh/mail.c
diff -u src/bin/ksh/mail.c:1.5 src/bin/ksh/mail.c:1.6
--- src/bin/ksh/mail.c:1.5 Sun Jan 15 18:16:30 2006
+++ src/bin/ksh/mail.c Fri Jun 30 03:43:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mail.c,v 1.5 2006/01/15 18:16:30 jschauma Exp $ */
+/* $NetBSD: mail.c,v 1.6 2017/06/30 03:43:57 kamil Exp $ */
/*
* Mailbox checking code by Robert J. Gibson, adapted for PD ksh by
@@ -7,16 +7,17 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mail.c,v 1.5 2006/01/15 18:16:30 jschauma Exp $");
+__RCSID("$NetBSD: mail.c,v 1.6 2017/06/30 03:43:57 kamil Exp $");
#endif
-
#include "config.h"
#ifdef KSH
+#include <sys/time.h>
+#include <time.h>
+
#include "sh.h"
#include "ksh_stat.h"
-#include "ksh_time.h"
#define MBMESSAGE "You have mail in $_"
Index: src/bin/ksh/main.c
diff -u src/bin/ksh/main.c:1.18 src/bin/ksh/main.c:1.19
--- src/bin/ksh/main.c:1.18 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/main.c Fri Jun 30 03:43:57 2017
@@ -1,13 +1,15 @@
-/* $NetBSD: main.c,v 1.18 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: main.c,v 1.19 2017/06/30 03:43:57 kamil Exp $ */
/*
* startup, main loop, environments and error handling
*/
#include <sys/cdefs.h>
+#include <sys/time.h>
#include <locale.h>
+#include <time.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.18 2017/06/22 14:20:46 kamil Exp $");
+__RCSID("$NetBSD: main.c,v 1.19 2017/06/30 03:43:57 kamil Exp $");
#endif
@@ -15,7 +17,6 @@ __RCSID("$NetBSD: main.c,v 1.18 2017/06/
#include "sh.h"
#include "ksh_stat.h"
-#include "ksh_time.h"
extern char **environ;
Index: src/bin/ksh/var.c
diff -u src/bin/ksh/var.c:1.17 src/bin/ksh/var.c:1.18
--- src/bin/ksh/var.c:1.17 Sun Oct 16 17:12:11 2011
+++ src/bin/ksh/var.c Fri Jun 30 03:43:57 2017
@@ -1,17 +1,18 @@
-/* $NetBSD: var.c,v 1.17 2011/10/16 17:12:11 joerg Exp $ */
+/* $NetBSD: var.c,v 1.18 2017/06/30 03:43:57 kamil Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: var.c,v 1.17 2011/10/16 17:12:11 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.18 2017/06/30 03:43:57 kamil Exp $");
#endif
+#include <sys/time.h>
+#include <time.h>
+#include <ctype.h>
#include "sh.h"
-#include "ksh_time.h"
#include "ksh_limval.h"
#include "ksh_stat.h"
-#include <ctype.h>
/*
* Variables
