From 4b00639c3b7f0c0c7aec8621f37835bd2b91ddd9 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 19 May 1997 03:05:02 +0000
Subject: [PATCH] removed herror, strchr, and strrchr

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1739 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/roken/Makefile.in | 18 +++++++++---------
 lib/roken/roken.h     | 11 -----------
 lib/roken/roken.h.in  | 11 -----------
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index f328c43e3..67667211b 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -33,16 +33,16 @@ LDSHARED = @LDSHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
 SOURCES = \
-	chown.c err.c errx.c fchown.c getcwd.c \
-	getdtablesize.c getopt.c getusershell.c \
-	herror.c hstrerror.c inaddr2str.c inet_aton.c \
+	chown.c err.c errx.c fchown.c get_window_size.c \
+	getcwd.c getdtablesize.c getopt.c getusershell.c \
+	hstrerror.c inaddr2str.c inet_aton.c \
 	initgroups.c k_getpwnam.c k_getpwuid.c lstat.c \
-	memmove.c mini_inetd.c putenv.c rcmd.c setegid.c setenv.c \
-	seteuid.c signal.c snprintf.c strcasecmp.c strchr.c strdup.c \
-	strerror.c strftime.c strlwr.c strnlen.c strrchr.c \
-	strupr.c tm2time.c unsetenv.c verify.c verr.c \
-	verrx.c vwarn.c vwarnx.c warn.c warnx.c \
-	warnerr.c get_window_size.c
+	memmove.c mini_inetd.c putenv.c rcmd.c setegid.c \
+	setenv.c seteuid.c signal.c snprintf.c \
+	strcasecmp.c strdup.c strerror.c strftime.c \
+	strlwr.c strnlen.c strtok_r.c strupr.c tm2time.c \
+	unsetenv.c verify.c verr.c verrx.c vwarn.c \
+	vwarnx.c warn.c warnerr.c warnx.c
 
 OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \
 	  verify.o inaddr2str.o mini_inetd.o get_window_size.o \
diff --git a/lib/roken/roken.h b/lib/roken/roken.h
index ad53d899a..025d0433e 100644
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -172,10 +172,6 @@ char *hstrerror(int herr);
 extern int h_errno;
 #endif
 
-#ifndef HAVE_HERROR
-void herror(char *s);
-#endif
-
 #ifndef HAVE_INET_ATON
 /* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
 int inet_aton(const char *cp, struct in_addr *adr);
@@ -203,13 +199,6 @@ int seteuid(int euid);
 int setegid(int egid);
 #endif
 
-#if !defined(HAVE_STRCHR) && defined(HAVE_INDEX)
-char *strchr(const char *s, int c);
-#endif
-#if !defined(HAVE_STRRCHR) && defined(HAVE_RINDEX)
-char *strrchr(const char *s, int c);
-#endif
-
 #ifndef HAVE_LSTAT
 int lstat(const char *path, struct stat *buf);
 #endif
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index ad53d899a..025d0433e 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -172,10 +172,6 @@ char *hstrerror(int herr);
 extern int h_errno;
 #endif
 
-#ifndef HAVE_HERROR
-void herror(char *s);
-#endif
-
 #ifndef HAVE_INET_ATON
 /* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
 int inet_aton(const char *cp, struct in_addr *adr);
@@ -203,13 +199,6 @@ int seteuid(int euid);
 int setegid(int egid);
 #endif
 
-#if !defined(HAVE_STRCHR) && defined(HAVE_INDEX)
-char *strchr(const char *s, int c);
-#endif
-#if !defined(HAVE_STRRCHR) && defined(HAVE_RINDEX)
-char *strrchr(const char *s, int c);
-#endif
-
 #ifndef HAVE_LSTAT
 int lstat(const char *path, struct stat *buf);
 #endif