2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>

	* libmisc/shell/hexdump-display.c:
	Eliminate bcopy, bzero, bcmp, index (Obsolete).
	* libmisc/shell/hexdump-parse.c: Eliminate index (Obsolete).
	* libmisc/shell/hexsyntax.c: Eliminate rindex (Obsolete).
	* libmisc/shell/main_hexdump.c: Eliminate rindex (Obsolete).
	* libmisc/shell/main_rm.c: Eliminate rindex (Obsolete).

6 files changed, 23 insertions, 15 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d9a52cc947..980b5988bd 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libmisc/shell/hexdump-display.c: 
+	Eliminate bcopy, bzero, bcmp, index (Obsolete).
+	* libmisc/shell/hexdump-parse.c: Eliminate index (Obsolete).
+	* libmisc/shell/hexsyntax.c: Eliminate rindex (Obsolete).
+	* libmisc/shell/main_hexdump.c: Eliminate rindex (Obsolete).
+	* libmisc/shell/main_rm.c: Eliminate rindex (Obsolete).
+
 2011-02-01	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1733/cpukit
diff --git a/cpukit/libmisc/shell/hexdump-display.c b/cpukit/libmisc/shell/hexdump-display.c
index 6e94981cda..3e33fba143 100644
--- a/cpukit/libmisc/shell/hexdump-display.c
+++ b/cpukit/libmisc/shell/hexdump-display.c
@@ -56,12 +56,14 @@ __FBSDID("$FreeBSD: src/usr.bin/hexdump/display.c,v 1.22 2004/08/04 02:47:32 tjr
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <unistd.h>
 #include "hexdump.h"
 
+#define bcmp(s1,s2,sz)	memcmp(s1,s2,sz)
+#define bcopy(s,d,sz)	memcpy(d,s,sz)
+#define bzero(s,sz)	memset(s,0,sz)
+#define index(s,c)	strchr(s,c)
+
 #if RTEMS_REMOVED
 enum _vflag vflag = FIRST;
 
diff --git a/cpukit/libmisc/shell/hexdump-parse.c b/cpukit/libmisc/shell/hexdump-parse.c
index dcb6d09770..1c35ba4649 100644
--- a/cpukit/libmisc/shell/hexdump-parse.c
+++ b/cpukit/libmisc/shell/hexdump-parse.c
@@ -51,9 +51,8 @@ __FBSDID("$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.14 2006/08/09 19:12:10 maxim
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
+#define index(s,c)	strchr(s,c)
 
 #include "hexdump.h"
 
diff --git a/cpukit/libmisc/shell/hexsyntax.c b/cpukit/libmisc/shell/hexsyntax.c
index 49d3c3eada..0f80738172 100644
--- a/cpukit/libmisc/shell/hexsyntax.c
+++ b/cpukit/libmisc/shell/hexsyntax.c
@@ -49,11 +49,10 @@ __FBSDID("$FreeBSD: src/usr.bin/hexdump/hexsyntax.c,v 1.12 2002/09/04 23:29:01 d
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <unistd.h>
 
+#define rindex(s,c)	strrchr(s,c)
+
 #include "hexdump.h"
 
 #define __need_getopt_newlib
diff --git a/cpukit/libmisc/shell/main_hexdump.c b/cpukit/libmisc/shell/main_hexdump.c
index 32dc99d2f6..8eb5a4e409 100644
--- a/cpukit/libmisc/shell/main_hexdump.c
+++ b/cpukit/libmisc/shell/main_hexdump.c
@@ -58,9 +58,9 @@ __FBSDID("$FreeBSD: src/usr.bin/hexdump/hexdump.c,v 1.7 2002/09/04 23:29:01 dwma
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
+
+#define rindex(s,c)	strrchr(s,c)
+
 #include "hexdump.h"
 
 #if RTEMS_REMOVED
diff --git a/cpukit/libmisc/shell/main_rm.c b/cpukit/libmisc/shell/main_rm.c
index fd237dd368..465a0daf46 100644
--- a/cpukit/libmisc/shell/main_rm.c
+++ b/cpukit/libmisc/shell/main_rm.c
@@ -65,11 +65,10 @@ __FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <unistd.h>
 
+#define rindex(s,c)	strrchr(s,c)
+
 /* RTEMS specific changes */
 typedef struct {
   int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;