FDDI compiled under glibc now, plus misc other fixes

ChangeLog

 Sun Jan 25 13:00:00 1998  Philip Blundell  <Philip.Blundell@pobox.com>
 
-	* lib/net-string.c (str_in_buff): Avoid compiler warning.
+	* lib/net-string.c (str_in_buff): Avoid compiler warning.  Remove
+ 	BSD-isms.  Tidy up.
 
 	* lib/inet6_gr.c, lib/inet_gr.c: Don't display inactive routes
 	(ie those without RTF_UP).
@@ -9,6 +10,7 @@ Sun Jan 25 13:00:00 1998  Philip Blundell  <Philip.Blundell@pobox.com>
 
 	* rarp.c: Add support for /etc/ethers.  Patch from haardt@gmd.de
  	(Michael Haardt).
+	* lib/pathnames.h: Likewise.
 
 	* config.in, lib/hw.c: Tidy up.  Add support for Rose and FDDI.
 	* lib/fddi.c, lib/rose.c, lib/rose_gr.c: New files, copied from
@@ -22,6 +24,10 @@ Sun Jan 25 13:00:00 1998  Philip Blundell  <Philip.Blundell@pobox.com>
 
 	* ifconfig.c: Don't assume ifr_qlen is defined if SIOCSIFTXQLEN
 	is.
+
+	* lib/fddi.c: Use <netinet/if_fddi.h> not <linux/if_fddi.h> for
+	glibc.
+	* lib/rose.c: Include <netrose/rose.h> for glibc.
 	
 Tue Sep 23 20:58:27 1997  Philip Blundell  <Philip.Blundell@pobox.com>
 

README

@@ -47,6 +47,10 @@ a recent 2.1.x kernel, and many devices do not support it yet.
 The documentation is slimmed down.  I think most of it was out of
 date.
 
+Some configuration options require recent 2.1.x kernels.  The defaults should
+be safe for both 2.0 and 2.1.  Some of this code may also have problems with
+glibc 2.0.
+
 
 Phil Blundell
 philb@gnu.ai.mit.edu

lib/fddi.c

@@ -14,6 +14,8 @@
  */
 #include "config.h"
 
+#include <features.h>
+
 #if HAVE_HWFDDI
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -22,7 +24,11 @@
 #error "No FDDI Support in your current Kernelsource Tree."
 #error "Disable HW Type FDDI"
 #endif
+#if __GLIBC__ >= 2
+#include <netinet/if_fddi.h>
+#else
 #include <linux/if_fddi.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>

lib/net-string.c

@@ -38,14 +38,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
-#ifndef FREEBSD
-#include <malloc.h>
-#endif
-
-#ifdef xmalloc
-#undef xmalloc
-#endif
-#define xmalloc    malloc
 
 char   *
 strsave(s)
@@ -58,7 +50,7 @@ strsave(s)
 	s = (const char *) "";
     for (p = (char *) s; *p++ != '\0';)
 	continue;
-    n = p = (char *) xmalloc((size_t)
+    n = p = (char *) malloc((size_t)
 			     ((((const char *) p) - s) * sizeof(char)));
     while ((*p++ = *s++) != '\0')
 	continue;
@@ -69,17 +61,17 @@ strsave(s)
 char *str_in_buff (char *buff, int len, char *string)
 {
   if (string)
-    if (strlen (string) >= len) /* does not include \0 */
-      {
-	strncpy (buff, string, len-1);
-	buff[len] = '\0';
-      }
-    else
-      {
+    {
+      if (strlen (string) >= len) /* does not include \0 */
+	{
+	  strncpy (buff, string, len-1);
+	  buff[len] = '\0';
+	}
+      else
 	strcpy (buff, string);
-      }
+    }
   else
-    strcpy (buff, "");
+    buff[0] = '\0';
 
   return (buff);
 }

lib/rose.c

@@ -18,6 +18,7 @@
 #include "config.h"
 
 #if HAVE_AFROSE || HAVE_HWROSE
+#include <features.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -35,6 +36,10 @@
 #define  EXTERN
 #include "net-locale.h"
 
+#if __GLIBC__ >= 2
+#include <netrose/rose.h>
+#endif
+
 static char ROSE_errmsg[128];
 
 extern struct aftype rose_aftype;