summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2005-08-22 15:57:50 +0000
committerRob Landley2005-08-22 15:57:50 +0000
commit6417564eebe6b9591d9c001160d201194bd5e24a (patch)
treeb4cdfd16b6aea4804eccb72ea9f04c130074863a
parentd00b3a5e944e7499bd061c0b8f9d9f0847528fce (diff)
downloadbusybox-6417564eebe6b9591d9c001160d201194bd5e24a.zip
busybox-6417564eebe6b9591d9c001160d201194bd5e24a.tar.gz
Two FEATURE_CLEAN_UP patches from Shaun Jackman, closing filehandles.
-rw-r--r--libbb/xconnect.c1
-rw-r--r--networking/route.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 09a1daa..1e5799e 100644
--- 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 9e14944..7d4cb0b 100644
--- 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