replacing func() with xfunc() where appropriate

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index b2b53a712207b70debae3b31153d5289bcab63ea..116cff459de474a459db1b524fca13b8cd2a8cb8 100644 (file)
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -454,7 +454,7 @@ DIR *xopendir(const char *path)
 /* Die with an error message if we can't daemonize. */
 void xdaemon(int nochdir, int noclose)
 {
-           if (daemon(nochdir, noclose)) bb_perror_msg_and_die("daemon");
+       if (daemon(nochdir, noclose)) bb_perror_msg_and_die("daemon");
 }
 #endif
 #endif

diff --git a/networking/arping.c b/networking/arping.c
index 5665ddb2b2522a927f1c53e8dbca3745b537a90f..08b27273fa07be48a5e9a7b7752bafd0aa44809d 100644 (file)
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -259,7 +259,7 @@ int arping_main(int argc, char **argv)
        char *source = NULL;
        char *target;
 
-       s = socket(PF_PACKET, SOCK_DGRAM, 0);
+       s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
        ifindex = errno;
 
        // Drop suid root privileges
@@ -346,11 +346,8 @@ int arping_main(int argc, char **argv)
 
        if (!(cfg&dad) || src.s_addr) {
                struct sockaddr_in saddr;
-               int probe_fd = socket(AF_INET, SOCK_DGRAM, 0); /* maybe use bb_xsocket? */
+               int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
-               if (probe_fd < 0) {
-                       bb_error_msg_and_die("socket");
-               }
                if (device) {
                        if (setsockopt
                                (probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device,

diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c
index b965147e18b07bfca980b9cea08d0359b8797933..29e09d13e10562ce5361eee6e3c49ea6665cefce 100644 (file)
--- a/networking/fakeidentd.c
+++ b/networking/fakeidentd.c
@@ -135,7 +135,7 @@ static int godaemon(void)
 
        switch (fork()) {
        case -1:
-               bb_perror_msg_and_die("Could not fork");
+               bb_perror_msg_and_die("fork");
 
        case 0:
                pw = getpwnam(nobodystr);

diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 4524d49546b5ea3d8a20d54a83d85eb861539e5b..806d8657d14ededb2c24be5759e2b52e4e7ec1fb 100644 (file)
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -43,7 +43,7 @@ static int do_ioctl_get_ifindex(char *dev)
        int fd;
 
        strcpy(ifr.ifr_name, dev);
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFINDEX, &ifr)) {
                bb_perror_msg("ioctl");
                return 0;
@@ -58,7 +58,7 @@ static int do_ioctl_get_iftype(char *dev)
        int fd;
 
        strcpy(ifr.ifr_name, dev);
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFHWADDR, &ifr)) {
                bb_perror_msg("ioctl");
                return -1;
@@ -74,7 +74,7 @@ static char *do_ioctl_get_ifname(int idx)
        int fd;
 
        ifr.ifr_ifindex = idx;
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFNAME, &ifr)) {
                bb_perror_msg("ioctl");
                return NULL;
@@ -93,7 +93,7 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p)
 
        strcpy(ifr.ifr_name, basedev);
        ifr.ifr_ifru.ifru_data = (void*)p;
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, SIOCGETTUNNEL, &ifr);
        if (err) {
                bb_perror_msg("ioctl");
@@ -114,7 +114,7 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p)
                strcpy(ifr.ifr_name, basedev);
        }
        ifr.ifr_ifru.ifru_data = (void*)p;
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, cmd, &ifr);
        if (err) {
                bb_perror_msg("ioctl");
@@ -135,7 +135,7 @@ static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p)
                strcpy(ifr.ifr_name, basedev);
        }
        ifr.ifr_ifru.ifru_data = (void*)p;
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
+       fd = xsocket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, SIOCDELTUNNEL, &ifr);
        if (err) {
                bb_perror_msg("ioctl");

diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 2c902fc01857c3e5a956720a36ce4bd6f2252b2f..c2025e588b8c2976470258f0574581b64135e5e5 100644 (file)
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -59,10 +59,7 @@ void udhcp_background(const char *pidfile)
 
        /* hold lock during fork. */
        pid_fd = pidfile_acquire(pidfile);
-       if (daemon(0, 0) == -1) { /* bb_xdaemon? */
-               perror("fork");
-               exit(1);
-       }
+       xdaemon(0, 0);
        daemonized++;
        pidfile_write_release(pid_fd);
 #endif /* __uClinux__ */

diff --git a/networking/zcip.c b/networking/zcip.c
index 8e6d8792d3d3b88185de21c032c9cd442d8bbfab..e9dd0501176bf3898e14dde2de966751dbfd0c03 100644 (file)
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -288,10 +288,7 @@ fail:
 
        // daemonize now; don't delay system startup
        if (!foreground) {
-               if (daemon(0, verbose) < 0) {
-                       why = "daemon";
-                       goto bad;
-               }
+               xdaemon(0, verbose);
                syslog(LOG_INFO, "start, interface %s", intf);
        }