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

don't mess up errno

Browse Source
This commit is contained in:
Eric Andersen 2003-12-23 20:37:23 +00:00
parent 27bb79080d
commit 9cccc18141
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libbb/xconnect.c
View File

@ -27,9 +27,15 @@ unsigned short bb_lookup_port(const char *port, unsigned short default_port)
{ {
unsigned short port_nr = htons(default_port); unsigned short port_nr = htons(default_port);
if (port) { if (port) {
char *endptr; char *endptr;
long port_long = strtol(port, &endptr, 10); int old_errno;
long port_long;
/* Since this is a lib function, we're not allowed to reset errno to 0.
* Doing so could break an app that is deferring checking of errno. */
old_errno = errno;
errno = 0;
port_long = strtol(port, &endptr, 10);
if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) { if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) {
struct servent *tserv = getservbyname(port, "tcp"); struct servent *tserv = getservbyname(port, "tcp");
if (tserv) { if (tserv) {
@ -38,6 +44,7 @@ unsigned short bb_lookup_port(const char *port, unsigned short default_port)
} else { } else {
port_nr = htons(port_long); port_nr = htons(port_long);
} }
errno = old_errno;
} }
return port_nr; return port_nr;
} }