From 20aab260e2f7011523402464fb079f48e5899890 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 19 Jul 2001 22:28:02 +0000
Subject: Some adjustments, mostly from David McCullough <davidm@lineo.com> to
make busybox be more uClinux friendly. I also adjusted Config.h for uClinux
so it will automagically disable apps the arn't going to work without fork()
and such. -Erik
---
libbb/gz_open.c | 4 ++--
libbb/interface.c | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
(limited to 'libbb')
diff --git a/libbb/gz_open.c b/libbb/gz_open.c
index b23920b16..ef30ff894 100644
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
@@ -15,7 +15,7 @@ extern FILE *gz_open(FILE *compressed_file, int *pid)
return(NULL);
}
if ((*pid = fork()) == -1) {
- error_msg("fork failured");
+ error_msg("fork failed");
return(NULL);
}
if (*pid==0) {
@@ -29,7 +29,7 @@ extern FILE *gz_open(FILE *compressed_file, int *pid)
}
close(unzip_pipe[1]);
if (unzip_pipe[0] == -1) {
- error_msg("Couldnt initialise gzip stream");
+ error_msg("gzip stream init failed");
}
return(fdopen(unzip_pipe[0], "r"));
}
diff --git a/libbb/interface.c b/libbb/interface.c
index 8eb03a61c..484597c5f 100644
--- a/libbb/interface.c
+++ b/libbb/interface.c
@@ -3,7 +3,7 @@
* that either displays or sets the characteristics of
* one or more of the system's networking interfaces.
*
- * Version: $Id: interface.c,v 1.3 2001/06/01 21:47:15 andersen Exp $
+ * Version: $Id: interface.c,v 1.4 2001/07/19 22:28:02 andersen Exp $
*
* Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
* and others. Copyright 1993 MicroWalt Corporation
@@ -78,7 +78,9 @@
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#if 0
#include <arpa/nameser.h>
+#endif
#include "libbb.h"
#define _(x) x
@@ -455,9 +457,11 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
#ifdef DEBUG
fprintf (stderr, "getnetbyaddr (%08lx)\n", host_ad);
#endif
+#if 0
np = getnetbyaddr(host_ad, AF_INET);
if (np != NULL)
safe_strncpy(name, np->n_name, len);
+#endif
}
if ((ent == NULL) && (np == NULL))
safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
@@ -1068,7 +1072,6 @@ static int if_readconf(void)
struct ifconf ifc;
struct ifreq *ifr;
int n, err = -1;
- /* XXX Should this re-use the global skfd? */
int skfd2;
/* SIOCGIFCONF currently seems to only work properly on AF_INET sockets
--
cgit v1.2.3-55-g6feb