emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two FEATURE_CLEAN_UP patches from Shaun Jackman, closing filehandles.

Browse Source
This commit is contained in:
Rob Landley 2005-08-22 15:57:50 +00:00
parent d00b3a5e94
commit 6417564eeb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libbb/xconnect.c
View File

@ -64,6 +64,7 @@ int xconnect(struct sockaddr_in *s_addr)
int s = socket(AF_INET, SOCK_STREAM, 0); int s = socket(AF_INET, SOCK_STREAM, 0);
if (connect(s, (struct sockaddr_in *)s_addr, sizeof(struct sockaddr_in)) < 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)", bb_perror_msg_and_die("Unable to connect to remote host (%s)",
inet_ntoa(s_addr->sin_addr)); inet_ntoa(s_addr->sin_addr));
} }

6
networking/route.c
View File

@ -329,8 +329,7 @@ static void INET_setroute(int action, char **args)
bb_perror_msg_and_die("SIOC[ADD|DEL]RT"); bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
} }
/* Don't bother closing, as we're exiting after we return anyway. */ if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
/* close(skfd); */
} }
#ifdef CONFIG_FEATURE_IPV6 #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"); bb_perror_msg_and_die("SIOC[ADD|DEL]RT");
} }
/* Don't bother closing, as we're exiting after we return anyway. */ if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
/* close(skfd); */
} }
#endif #endif