summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorMatt Kraai2001-02-01 16:49:30 +0000
committerMatt Kraai2001-02-01 16:49:30 +0000
commit05e782ddd3dc58245c889529bb8aeeaddf24bf71 (patch)
tree8fbb91ca75358923724889a558c954cffdf10136 /networking
parentbd018b1babf0521b8e740abb6473133c1c4c35d2 (diff)
downloadbusybox-05e782ddd3dc58245c889529bb8aeeaddf24bf71.zip
busybox-05e782ddd3dc58245c889529bb8aeeaddf24bf71.tar.gz
Fix wget error message and add (and use) chomp library function.
Diffstat (limited to 'networking')
-rw-r--r--networking/hostname.c5
-rw-r--r--networking/wget.c3
2 files changed, 4 insertions, 4 deletions
diff --git a/networking/hostname.c b/networking/hostname.c
index 3dba641..ce17ba9 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: hostname.c,v 1.22 2001/01/31 19:00:20 kraai Exp $
+ * $Id: hostname.c,v 1.23 2001/02/01 16:49:29 kraai Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -49,8 +49,7 @@ void do_sethostname(char *s, int isfile)
f = xfopen(s, "r");
fgets(buf, 255, f);
fclose(f);
- if (buf[strlen(buf) - 1] == '\n')
- buf[strlen(buf) - 1] = 0;
+ chomp(buf);
if (sethostname(buf, strlen(buf)) < 0)
perror_msg_and_die("sethostname");
}
diff --git a/networking/wget.c b/networking/wget.c
index 70f8d1b..c134427 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -216,6 +216,7 @@ int wget_main(int argc, char **argv)
/*FALLTHRU*/
default:
close_and_delete_outfile(output, fname_out, do_continue);
+ chomp(buf);
error_msg_and_die("server returned error %d: %s", atoi(s), buf);
}
@@ -532,7 +533,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.25 2001/01/31 19:00:21 kraai Exp $
+ * $Id: wget.c,v 1.26 2001/02/01 16:49:30 kraai Exp $
*/