Two FEATURE_CLEAN_UP patches from Shaun Jackman, closing filehandles.

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 09a1daad1c03f34da690064e6469e205ddc0fcbd..1e5799e516c53ef84a5ced00878ff7d57542fe4c 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -64,6 +64,7 @@ int xconnect(struct sockaddr_in *s_addr)
        int s = socket(AF_INET, SOCK_STREAM, 0);
        if (connect(s, (struct sockaddr_in *)s_addr, sizeof(struct sockaddr_in)) < 0)
        {
+               if (ENABLE_FEATURE_CLEAN_UP) close(s);
                bb_perror_msg_and_die("Unable to connect to remote host (%s)",
                                inet_ntoa(s_addr->sin_addr));
        }

diff --git a/networking/route.c b/networking/route.c
index 9e14944c9b3183380f0a8d0bf428d744a7d234c9..7d4cb0b760f0dad3c400bc46768bda4dc7d359e2 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -329,8 +329,7 @@ static void INET_setroute(int action, char **args)
                bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
        }
 
-       /* Don't bother closing, as we're exiting after we return anyway. */
-       /* close(skfd); */
+       if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
 }
 
 #ifdef CONFIG_FEATURE_IPV6
@@ -440,8 +439,7 @@ static void INET6_setroute(int action, char **args)
                bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
        }
 
-       /* Don't bother closing, as we're exiting after we return anyway. */
-       /* close(skfd); */
+       if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
 }
 #endif