Module Name: src
Committed By: kamil
Date: Thu Jun 22 23:23:27 UTC 2017
Modified Files:
src/bin/ksh: config.h sh.h
Log Message:
ksh: Drop support for systems without <string.h>
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/bin/ksh/config.h
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/sh.h
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/config.h
diff -u src/bin/ksh/config.h:1.21 src/bin/ksh/config.h:1.22
--- src/bin/ksh/config.h:1.21 Thu Jun 22 23:19:53 2017
+++ src/bin/ksh/config.h Thu Jun 22 23:23:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.21 2017/06/22 23:19:53 kamil Exp $ */
+/* $NetBSD: config.h,v 1.22 2017/06/22 23:23:27 kamil Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -289,9 +289,6 @@
/* Define if you have the <paths.h> header file. */
#define HAVE_PATHS_H 1
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
/* Define if you have the <sys/dir.h> header file. */
#define HAVE_SYS_DIR_H
Index: src/bin/ksh/sh.h
diff -u src/bin/ksh/sh.h:1.15 src/bin/ksh/sh.h:1.16
--- src/bin/ksh/sh.h:1.15 Thu Jun 22 23:19:53 2017
+++ src/bin/ksh/sh.h Thu Jun 22 23:23:27 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sh.h,v 1.15 2017/06/22 23:19:53 kamil Exp $ */
+/* $NetBSD: sh.h,v 1.16 2017/06/22 23:23:27 kamil Exp $ */
/*
* Public Domain Bourne/Korn shell
*/
-/* $Id: sh.h,v 1.15 2017/06/22 23:19:53 kamil Exp $ */
+/* $Id: sh.h,v 1.16 2017/06/22 23:23:27 kamil Exp $ */
#include "config.h" /* system and option configuration info */
@@ -22,14 +22,8 @@
#include <stddef.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# define strchr index
-# define strrchr rindex
-#endif /* HAVE_STRING_H */
#ifndef HAVE_STRSTR
char *strstr ARGS((const char *s, const char *p));
#endif /* HAVE_STRSTR */
