Minor change. init now uses dup2.

 -Erik

diff --git a/init.c b/init.c
index dd92854b4f803494808e2ebbb32a0c21bdd0a6f4..722ccd21701fa45d54a5da12eef862dae25a60cb 100644 (file)
--- a/init.c
+++ b/init.c
@@ -366,8 +366,9 @@ static pid_t run(char* command,
            message(LOG|CONSOLE, "Bummer, can't open %s\r\n", terminal);
            exit(1);
        }
-       dup(fd);
-       dup(fd);
+       dup2(fd, 0);
+       dup2(fd, 1);
+       dup2(fd, 2);
        tcsetpgrp (0, getpgrp());
        set_term(0);
 

diff --git a/init/init.c b/init/init.c
index dd92854b4f803494808e2ebbb32a0c21bdd0a6f4..722ccd21701fa45d54a5da12eef862dae25a60cb 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -366,8 +366,9 @@ static pid_t run(char* command,
            message(LOG|CONSOLE, "Bummer, can't open %s\r\n", terminal);
            exit(1);
        }
-       dup(fd);
-       dup(fd);
+       dup2(fd, 0);
+       dup2(fd, 1);
+       dup2(fd, 2);
        tcsetpgrp (0, getpgrp());
        set_term(0);
 

diff --git a/networking/ping.c b/networking/ping.c
index 5cadac3e8658672d7f43f96b04f98129c48ffe04..5b680195ac0981911988dab910216684f952c37c 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ping.c,v 1.8 2000/01/29 05:52:40 erik Exp $
+ * $Id: ping.c,v 1.9 2000/01/29 06:29:32 erik Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -312,14 +312,17 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 
 static void ping(char *host)
 {
-    struct protoent *proto=NULL;
+    struct protoent *proto;
     struct hostent *h;
     char buf[MAXHOSTNAMELEN];
     char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
     int sockopt;
     
     proto = getprotobyname("icmp");
-    if ((pingsock = socket(AF_INET, SOCK_RAW, (proto)? proto->p_proto : 1 )) < 0) { /* 1 == ICMP */
+    /* if getprotobyname failed, just silently force 
+     * proto->p_proto to have the correct value for "icmp" */
+    if ((pingsock = socket(AF_INET, SOCK_RAW, 
+                           (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */
        if (errno == EPERM) {
            fprintf(stderr, "ping: permission denied. (are you root?)\n");
        } else {

diff --git a/ping.c b/ping.c
index 5cadac3e8658672d7f43f96b04f98129c48ffe04..5b680195ac0981911988dab910216684f952c37c 100644 (file)
--- a/ping.c
+++ b/ping.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ping.c,v 1.8 2000/01/29 05:52:40 erik Exp $
+ * $Id: ping.c,v 1.9 2000/01/29 06:29:32 erik Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -312,14 +312,17 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 
 static void ping(char *host)
 {
-    struct protoent *proto=NULL;
+    struct protoent *proto;
     struct hostent *h;
     char buf[MAXHOSTNAMELEN];
     char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
     int sockopt;
     
     proto = getprotobyname("icmp");
-    if ((pingsock = socket(AF_INET, SOCK_RAW, (proto)? proto->p_proto : 1 )) < 0) { /* 1 == ICMP */
+    /* if getprotobyname failed, just silently force 
+     * proto->p_proto to have the correct value for "icmp" */
+    if ((pingsock = socket(AF_INET, SOCK_RAW, 
+                           (proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */
        if (errno == EPERM) {
            fprintf(stderr, "ping: permission denied. (are you root?)\n");
        } else {