* on GNU gettext, only a brazilian portuguese catalog (translation)
* is present, but others are *highly* welcome!
*
-* (answer 'n' if you haye no system with GNU gettext support)
+* (answer 'n' if you have no system with GNU gettext support)
*
-bool 'Does your system support GNU gettext?' I18N y
+bool 'Does your system support GNU gettext?' I18N n
*
*
* Protocol Families.
#endif
#if HAVE_AFIPX
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netipx/ipx.h>
+#else
#include "ipx.h"
#endif
+#endif
#include "net-support.h"
#include "pathnames.h"
#include "version.h"
#include "sockets.h"
char *Release = RELEASE,
- *Version = "ifconfig 1.34 (1998-06-30)";
+ *Version = "ifconfig 1.35 (1998-08-29)";
int opt_a = 0; /* show all interfaces */
int opt_i = 0; /* show the statistics */
if (ptr->flags & IFF_MULTICAST) printf(_("MULTICAST "));
printf(_(" MTU:%d Metric:%d\n"),
ptr->mtu, ptr->metric?ptr->metric:1);
- if (ptr->tx_queue_len != -1)
- printf(_(" txqueuelen:%d\n"), ptr->tx_queue_len);
-#if 0
- else
- printf(_(" txqueuelen not available\n"));
-#endif
/* If needed, display the interface statistics. */
printf(" ");
ptr->stats.tx_packets, ptr->stats.tx_errors,
ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
ptr->stats.tx_carrier_errors);
- printf(_(" Collisions:%lu "), ptr->stats.collisions);
+ printf(_(" collisions:%lu "), ptr->stats.collisions);
if (can_compress)
printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+ if (ptr->tx_queue_len != -1)
+ printf(_("txqueuelen:%d "), ptr->tx_queue_len);
printf("\n");
if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
#include <ctype.h>
#if HAVE_AFIPX
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netipx/ipx.h>
+#else
#include "ipx.h"
#endif
+#endif
#if HAVE_AFECONET
#include <linux/if_ec.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netax25/ax25.h>
+#else
#include <linux/ax25.h>
+#endif
#include <net/if_arp.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include "net-support.h"
#include "pathnames.h"
-#define EXTERN
-#include "net-locale.h"
-
struct hwtype hdlc_hwtype = {
"hdlc", NULL, /*"(Cisco) HDLC",*/ ARPHRD_HDLC, 0,
#error "No HIPPI Support in your current Kernelsource Tree."
#error "Disable HW Type HIPPI"
#endif
-#include <linux/if_hippi.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include "net-support.h"
#include "pathnames.h"
-#define EXTERN
-#include "net-locale.h"
+#include "intl.h"
+/*
+ * HIPPI magic constants.
+ */
+
+#define HIPPI_ALEN 6 /* Bytes in one HIPPI hw-addr */
extern struct hwtype hippi_hwtype;
static char buf[64];
if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
- return(NLS_CATBUFF (catfd, hippiSet, hippi_none, "[NONE SET]", buf, 64));
+ return(strncpy(buf, _("[NONE SET]"), 64));
return(pr_hippi(sap->sa_data));
}
else if (c >= 'A' && c <= 'F') val = c - 'A' + 10;
else {
#ifdef DEBUG
- fprintf(stderr, NLS_CATGETS(catfd, hippiSet, hippi_debug1,
- "in_hippi(%s): invalid hippi address!\n"), orig);
+ fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
#endif
errno = EINVAL;
return(-1);
else if (c >= 'A' && c <= 'F') val |= c - 'A' + 10;
else {
#ifdef DEBUG
- fprintf(stderr, NLS_CATGETS(catfd, hippiSet, hippi_debug2,
- "in_hippi(%s): invalid hippi address!\n"), orig);
+ fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
#endif
errno = EINVAL;
return(-1);
if (*bufp == ':') {
if (i == HIPPI_ALEN) {
#ifdef DEBUG
- fprintf(stderr, NLS_CATGETS(catfd, hippiSet, hippi_debug3,
- "in_hippi(%s): trailing : ignored!\n"),
- orig)
+ fprintf(stderr, _("in_hippi(%s): trailing : ignored!\n"), orig)
#endif
; /* nothing */
}
/* That's it. Any trailing junk? */
if ((i == HIPPI_ALEN) && (*bufp != '\0')) {
#ifdef DEBUG
- fprintf(stderr, NLS_CATGETS(catfd, hippiSet, hippi_debug4, "in_hippi(%s): trailing junk!\n"), orig);
+ fprintf(stderr, _("in_hippi(%s): trailing junk!\n"), orig);
errno = EINVAL;
return(-1);
#endif
#include <asm/types.h>
#include <sys/types.h>
#include <sys/socket.h>
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netipx/ipx.h>
+#else
#include "ipx.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <asm/types.h>
#include <sys/types.h>
#include <sys/socket.h>
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netipx/ipx.h>
+#else
#include "ipx.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if_arp.h>
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netax25/ax25.h>
+#else
#include <linux/ax25.h>
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>