More libc5 fixups

 -Erik

8 files changed, 270 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index bde97042d..c6a232d80 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ endif
 LIBBB     = libbb
 LIBBB_LIB = libbb.a
 LIBBB_CSRC= ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
-copy_file_chunk.c daemon.c device_open.c error_msg.c \
+copy_file_chunk.c libc5.c device_open.c error_msg.c \
 error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \
 find_root_device.c full_read.c full_write.c get_console.c \
 get_last_path_component.c get_line_from_file.c gz_open.c human_readable.c \
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 68aee13c5..02b70d915 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -34,6 +34,11 @@
 #include <sys/time.h>
 #include "busybox.h"
 
+/* Teach libc5 what a uint64_t is */
+#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
+typedef unsigned long int       uint64_t;
+#endif
+
 static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
 // if fn is NULL then input is stdin and output is stdout
diff --git a/dos2unix.c b/dos2unix.c
index 68aee13c5..02b70d915 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -34,6 +34,11 @@
 #include <sys/time.h>
 #include "busybox.h"
 
+/* Teach libc5 what a uint64_t is */
+#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
+typedef unsigned long int       uint64_t;
+#endif
+
 static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
 // if fn is NULL then input is stdin and output is stdout
diff --git a/include/libbb.h b/include/libbb.h
index 70ac36a86..04ed2ae82 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -46,6 +46,8 @@
 typedef unsigned int socklen_t;
 /* libc5 doesn't implement BSD 4.4 daemon() */
 extern int daemon (int nochdir, int noclose);
+/* libc5 doesn't implement strtok_r */
+char *strtok_r(char *s, const char *delim, char **ptrptr);
 #endif  
 
 /* Some useful definitions */
diff --git a/libbb/libbb.h b/libbb/libbb.h
index 70ac36a86..04ed2ae82 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -46,6 +46,8 @@
 typedef unsigned int socklen_t;
 /* libc5 doesn't implement BSD 4.4 daemon() */
 extern int daemon (int nochdir, int noclose);
+/* libc5 doesn't implement strtok_r */
+char *strtok_r(char *s, const char *delim, char **ptrptr);
 #endif  
 
 /* Some useful definitions */
diff --git a/libbb/daemon.c b/libbb/libc5.c
index 6d4169ed5..20295fd4b 100644
--- a/libbb/daemon.c
+++ b/libbb/libc5.c
@@ -1,4 +1,77 @@
 /* vi: set sw=4 ts=4: */
+
+
+#include <features.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <unistd.h>
+
+
+#if __GNU_LIBRARY__ < 5
+
+
+/* Copyright (C) 1991 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 Library General Public License as
+published by the Free Software Foundation; either version 2 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+/*
+ * Modified by Manuel Novoa III     Mar 1, 2001
+ *
+ * Converted original strtok.c code of strtok to __strtok_r.
+ * Cleaned up logic and reduced code size.
+ */
+
+
+char *strtok_r(char *s, const char *delim, char **save_ptr)
+{
+        char *token;
+
+        token = 0;                                      /* Initialize to no token. */
+
+        if (s == 0) {                           /* If not first time called... */
+                s = *save_ptr;                  /* restart from where we left off. */
+        }
+        
+        if (s != 0) {                           /* If not finished... */
+                *save_ptr = 0;
+
+                s += strspn(s, delim);  /* Skip past any leading delimiters. */
+                if (*s != '\0') {               /* We have a token. */
+                        token = s;
+                        *save_ptr = strpbrk(token, delim); /* Find token's end. */
+                        if (*save_ptr != 0) {
+                                /* Terminate the token and make SAVE_PTR point past it.  */
+                                *(*save_ptr)++ = '\0';
+                        }
+                }
+        }
+
+        return token;
+}
+
+/* Basically getdelim() with the delimiter hard wired to '\n' */
+ssize_t getline(char **linebuf, size_t *n, FILE *file)
+{
+      return (getdelim (linebuf, n, '\n', file));
+}
+
+
 /*
  * daemon implementation for uClibc
  *
@@ -26,14 +99,6 @@
  * Original copyright notice is retained at the end of this file.
  */
 
-#include <features.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <unistd.h>
-
-
-#if __GNU_LIBRARY__ < 5
-
 int daemon( int nochdir, int noclose )
 {
     int fd;
@@ -62,7 +127,6 @@ int daemon( int nochdir, int noclose )
     }
     return(0);
 }
-#endif  
 
 
 /*-
@@ -99,3 +163,5 @@ int daemon( int nochdir, int noclose )
  */
 
 
+#endif  
+
diff --git a/networking/traceroute.c b/networking/traceroute.c
index f4c67cf41..a3abd0a00 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -81,6 +81,96 @@
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 
+ 
+ /* It turns out that libc5 doesn't have proper icmp support
+ * built into it header files, so we have to supplement it */
+#if __GNU_LIBRARY__ < 5
+static const int ICMP_MINLEN = 8;                               /* abs minimum */
+
+struct icmp_ra_addr
+{
+  u_int32_t ira_addr;
+  u_int32_t ira_preference;
+};
+
+
+struct icmp
+{
+  u_int8_t  icmp_type;  /* type of message, see below */
+  u_int8_t  icmp_code;  /* type sub code */
+  u_int16_t icmp_cksum; /* ones complement checksum of struct */
+  union
+  {
+    u_char ih_pptr;             /* ICMP_PARAMPROB */
+    struct in_addr ih_gwaddr;   /* gateway address */
+    struct ih_idseq             /* echo datagram */
+    {
+      u_int16_t icd_id;
+      u_int16_t icd_seq;
+    } ih_idseq;
+    u_int32_t ih_void;
+
+    /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
+    struct ih_pmtu
+    {
+      u_int16_t ipm_void;
+      u_int16_t ipm_nextmtu;
+    } ih_pmtu;
+
+    struct ih_rtradv
+    {
+      u_int8_t irt_num_addrs;
+      u_int8_t irt_wpa;
+      u_int16_t irt_lifetime;
+    } ih_rtradv;
+  } icmp_hun;
+#define icmp_pptr       icmp_hun.ih_pptr
+#define icmp_gwaddr     icmp_hun.ih_gwaddr
+#define icmp_id         icmp_hun.ih_idseq.icd_id
+#define icmp_seq        icmp_hun.ih_idseq.icd_seq
+#define icmp_void       icmp_hun.ih_void
+#define icmp_pmvoid     icmp_hun.ih_pmtu.ipm_void
+#define icmp_nextmtu    icmp_hun.ih_pmtu.ipm_nextmtu
+#define icmp_num_addrs  icmp_hun.ih_rtradv.irt_num_addrs
+#define icmp_wpa        icmp_hun.ih_rtradv.irt_wpa
+#define icmp_lifetime   icmp_hun.ih_rtradv.irt_lifetime
+  union
+  {
+    struct
+    {
+      u_int32_t its_otime;
+      u_int32_t its_rtime;
+      u_int32_t its_ttime;
+    } id_ts;
+    struct
+    {
+      struct ip idi_ip;
+      /* options and then 64 bits of data */
+    } id_ip;
+    struct icmp_ra_addr id_radv;
+    u_int32_t   id_mask;
+    u_int8_t    id_data[1];
+  } icmp_dun;
+#define icmp_otime      icmp_dun.id_ts.its_otime
+#define icmp_rtime      icmp_dun.id_ts.its_rtime
+#define icmp_ttime      icmp_dun.id_ts.its_ttime
+#define icmp_ip         icmp_dun.id_ip.idi_ip
+#define icmp_radv       icmp_dun.id_radv
+#define icmp_mask       icmp_dun.id_mask
+#define icmp_data       icmp_dun.id_data
+};
+
+#define ICMP_MINLEN     8                               /* abs minimum */
+#define ICMP_UNREACH            3               /* dest unreachable, codes: */
+#define ICMP_TIMXCEED           11              /* time exceeded, code: */
+#define ICMP_TIMXCEED_INTRANS   0               /* ttl==0 in transit */
+#define ICMP_UNREACH_NET                0       /* bad net */
+#define ICMP_UNREACH_HOST               1       /* bad host */
+#define ICMP_UNREACH_PROTOCOL           2       /* bad protocol */
+#define ICMP_UNREACH_PORT               3       /* bad port */
+#define ICMP_UNREACH_NEEDFRAG           4       /* IP_DF caused drop */
+#define ICMP_UNREACH_SRCFAIL            5       /* src route failed */
+#endif
 
 
 #define MAXPACKET       65535   /* max ip packet size */
diff --git a/traceroute.c b/traceroute.c
index f4c67cf41..a3abd0a00 100644
--- a/traceroute.c
+++ b/traceroute.c
@@ -81,6 +81,96 @@
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 
+ 
+ /* It turns out that libc5 doesn't have proper icmp support
+ * built into it header files, so we have to supplement it */
+#if __GNU_LIBRARY__ < 5
+static const int ICMP_MINLEN = 8;                               /* abs minimum */
+
+struct icmp_ra_addr
+{
+  u_int32_t ira_addr;
+  u_int32_t ira_preference;
+};
+
+
+struct icmp
+{
+  u_int8_t  icmp_type;  /* type of message, see below */
+  u_int8_t  icmp_code;  /* type sub code */
+  u_int16_t icmp_cksum; /* ones complement checksum of struct */
+  union
+  {
+    u_char ih_pptr;             /* ICMP_PARAMPROB */
+    struct in_addr ih_gwaddr;   /* gateway address */
+    struct ih_idseq             /* echo datagram */
+    {
+      u_int16_t icd_id;
+      u_int16_t icd_seq;
+    } ih_idseq;
+    u_int32_t ih_void;
+
+    /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
+    struct ih_pmtu
+    {
+      u_int16_t ipm_void;
+      u_int16_t ipm_nextmtu;
+    } ih_pmtu;
+
+    struct ih_rtradv
+    {
+      u_int8_t irt_num_addrs;
+      u_int8_t irt_wpa;
+      u_int16_t irt_lifetime;
+    } ih_rtradv;
+  } icmp_hun;
+#define icmp_pptr       icmp_hun.ih_pptr
+#define icmp_gwaddr     icmp_hun.ih_gwaddr
+#define icmp_id         icmp_hun.ih_idseq.icd_id
+#define icmp_seq        icmp_hun.ih_idseq.icd_seq
+#define icmp_void       icmp_hun.ih_void
+#define icmp_pmvoid     icmp_hun.ih_pmtu.ipm_void
+#define icmp_nextmtu    icmp_hun.ih_pmtu.ipm_nextmtu
+#define icmp_num_addrs  icmp_hun.ih_rtradv.irt_num_addrs
+#define icmp_wpa        icmp_hun.ih_rtradv.irt_wpa
+#define icmp_lifetime   icmp_hun.ih_rtradv.irt_lifetime
+  union
+  {
+    struct
+    {
+      u_int32_t its_otime;
+      u_int32_t its_rtime;
+      u_int32_t its_ttime;
+    } id_ts;
+    struct
+    {
+      struct ip idi_ip;
+      /* options and then 64 bits of data */
+    } id_ip;
+    struct icmp_ra_addr id_radv;
+    u_int32_t   id_mask;
+    u_int8_t    id_data[1];
+  } icmp_dun;
+#define icmp_otime      icmp_dun.id_ts.its_otime
+#define icmp_rtime      icmp_dun.id_ts.its_rtime
+#define icmp_ttime      icmp_dun.id_ts.its_ttime
+#define icmp_ip         icmp_dun.id_ip.idi_ip
+#define icmp_radv       icmp_dun.id_radv
+#define icmp_mask       icmp_dun.id_mask
+#define icmp_data       icmp_dun.id_data
+};
+
+#define ICMP_MINLEN     8                               /* abs minimum */
+#define ICMP_UNREACH            3               /* dest unreachable, codes: */
+#define ICMP_TIMXCEED           11              /* time exceeded, code: */
+#define ICMP_TIMXCEED_INTRANS   0               /* ttl==0 in transit */
+#define ICMP_UNREACH_NET                0       /* bad net */
+#define ICMP_UNREACH_HOST               1       /* bad host */
+#define ICMP_UNREACH_PROTOCOL           2       /* bad protocol */
+#define ICMP_UNREACH_PORT               3       /* bad port */
+#define ICMP_UNREACH_NEEDFRAG           4       /* IP_DF caused drop */
+#define ICMP_UNREACH_SRCFAIL            5       /* src route failed */
+#endif
 
 
 #define MAXPACKET       65535   /* max ip packet size */