Removed trailing \n from error_msg{,_and_die} messages.

5 files changed, 19 insertions, 19 deletions

diff --git a/networking/hostname.c b/networking/hostname.c
index a789fa0..3dba641 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.21 2001/01/27 08:24:37 andersen Exp $
+ * $Id: hostname.c,v 1.22 2001/01/31 19:00:20 kraai Exp $
  * Mini hostname implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -41,7 +41,7 @@ void do_sethostname(char *s, int isfile)
 	if (!isfile) {
 		if (sethostname(s, strlen(s)) < 0) {
 			if (errno == EPERM)
-				error_msg_and_die("you must be root to change the hostname\n");
+				error_msg_and_die("you must be root to change the hostname");
 			else
 				perror_msg_and_die("sethostname");
 		}
diff --git a/networking/nc.c b/networking/nc.c
index 7de4015..682da82 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -59,7 +59,7 @@ int nc_main(int argc, char **argv)
 		perror_msg_and_die("socket");
 
 	if ((hostinfo = gethostbyname(*argv)) == NULL)
-		error_msg_and_die("cannot resolve %s\n", *argv);
+		error_msg_and_die("cannot resolve %s", *argv);
 
 	address.sin_family = AF_INET;
 	address.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
diff --git a/networking/ping.c b/networking/ping.c
index a2e9163..15611ba 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.35 2001/01/27 08:24:37 andersen Exp $
+ * $Id: ping.c,v 1.36 2001/01/31 19:00:21 kraai Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -203,7 +203,7 @@ static void ping(const char *host)
 
 	pingaddr.sin_family = AF_INET;
 	if (!(h = gethostbyname(host))) {
-		error_msg("unknown host %s\n", host);
+		error_msg("unknown host %s", host);
 		exit(1);
 	}
 	memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
@@ -324,7 +324,7 @@ static void sendping(int junk)
 	if (i < 0)
 		perror_msg_and_die("sendto");
 	else if ((size_t)i != sizeof(packet))
-		error_msg_and_die("ping wrote %d chars; %d expected\n", i,
+		error_msg_and_die("ping wrote %d chars; %d expected", i,
 			   (int)sizeof(packet));
 
 	signal(SIGALRM, sendping);
@@ -419,7 +419,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 		printf("\n");
 	} else 
 		if (icmppkt->icmp_type != ICMP_ECHO)
-			error_msg("Warning: Got ICMP %d (%s)\n",
+			error_msg("Warning: Got ICMP %d (%s)",
 					icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
 }
 
@@ -437,7 +437,7 @@ static void ping(const char *host)
 	if ((pingsock = socket(AF_INET, SOCK_RAW,
 						   (proto ? proto->p_proto : 1))) < 0) {	/* 1 == ICMP */
 		if (errno == EPERM)
-			error_msg_and_die("permission denied. (are you root?)\n");
+			error_msg_and_die("permission denied. (are you root?)");
 		else
 			perror_msg_and_die("creating a raw socket");
 	}
@@ -449,12 +449,12 @@ static void ping(const char *host)
 
 	pingaddr.sin_family = AF_INET;
 	if (!(h = gethostbyname(host))) {
-		error_msg("unknown host %s\n", host);
+		error_msg("unknown host %s", host);
 		exit(1);
 	}
 
 	if (h->h_addrtype != AF_INET) {
-		error_msg("unknown address type; only AF_INET is currently supported.\n");
+		error_msg("unknown address type; only AF_INET is currently supported.");
 		exit(1);
 	}
 
diff --git a/networking/telnet.c b/networking/telnet.c
index 8f7bbf2..b08effe 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -584,7 +584,7 @@ static int getport(char * p)
 
 	if ((unsigned)(port - 1 ) > 65534)
 	{
-		error_msg_and_die("%s: bad port number\n", p);
+		error_msg_and_die("%s: bad port number", p);
 	}
 	return port;
 }
@@ -596,7 +596,7 @@ static struct in_addr getserver(char * host)
 	struct hostent * he;
 	if ((he = gethostbyname(host)) == NULL)
 	{
-		error_msg_and_die("%s: Unknown host\n", host);
+		error_msg_and_die("%s: Unknown host", host);
 	}
 	memcpy(&addr, he->h_addr, sizeof addr);
 
diff --git a/networking/wget.c b/networking/wget.c
index 729c6fd..70f8d1b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -148,7 +148,7 @@ int wget_main(int argc, char **argv)
 #endif
 	}
 	if (do_continue && !fname_out)
-		error_msg_and_die("cannot specify continue (-c) without a filename (-O)\n");
+		error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
 
 
 	/*
@@ -200,7 +200,7 @@ int wget_main(int argc, char **argv)
 	 */
 	if (fgets(buf, sizeof(buf), sfp) == NULL) {
 		close_and_delete_outfile(output, fname_out, do_continue);
-		error_msg_and_die("no response from server\n");
+		error_msg_and_die("no response from server");
 	}
 	for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
 		;
@@ -230,7 +230,7 @@ int wget_main(int argc, char **argv)
 		}
 		if (strcasecmp(buf, "transfer-encoding") == 0) {
 			close_and_delete_outfile(output, fname_out, do_continue);
-			error_msg_and_die("server wants to do %s transfer encoding\n", s);
+			error_msg_and_die("server wants to do %s transfer encoding", s);
 			continue;
 		}
 	}
@@ -267,7 +267,7 @@ void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path)
 	*uri_port = 80;
 
 	if (strncmp(url, "http://", 7) != 0)
-		error_msg_and_die("not an http url: %s\n", url);
+		error_msg_and_die("not an http url: %s", url);
 
 	*uri_host = url + 7;
 
@@ -297,7 +297,7 @@ FILE *open_socket(char *host, int port)
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
 	if ((hp = (struct hostent *) gethostbyname(host)) == NULL)
-		error_msg_and_die("cannot resolve %s\n", host);
+		error_msg_and_die("cannot resolve %s", host);
 	memcpy(&sin.sin_addr, hp->h_addr_list[0], hp->h_length);
 	sin.sin_port = htons(port);
 
@@ -338,7 +338,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
 
 	/* verify we are at the end of the header name */
 	if (*s != ':')
-		error_msg_and_die("bad header line: %s\n", buf);
+		error_msg_and_die("bad header line: %s", buf);
 
 	/* locate the start of the header value */
 	for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s)
@@ -532,7 +532,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.24 2001/01/31 17:49:47 andersen Exp $
+ *	$Id: wget.c,v 1.25 2001/01/31 19:00:21 kraai Exp $
  */