diff options
| author | Rob Landley <rob@landley.net> | 2006-07-12 19:17:55 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-07-12 19:17:55 +0000 |
| commit | c9c1a41c581101f53cc36efae53cd8ebb568962f (patch) | |
| tree | 0aa4024f33e22567444f78d83d7d4b7986abe795 /networking/traceroute.c | |
| parent | 801ab140132a111e9524371c9b8d425579692389 (diff) | |
| download | busybox-c9c1a41c581101f53cc36efae53cd8ebb568962f.tar.gz | |
A couple things that got tangled up in my tree, easier to check in both than
untangle them:
Rewrite u_signal_names() into get_signum() and get_signame(), plus trim the
signal list to that required by posix (they can specify the numbers for
the rest if they really need them). (This is preparatory cleanup for adding
a timeout applet like Roberto Foglietta wants.)
Export the itoa (added due to Denis Vlasenko, although it's not quite his
preferred implementation) from xfuncs.c so it's actually used, and remove
several other redundant implementations of itoa and utoa() in the tree.
Diffstat (limited to 'networking/traceroute.c')
| -rw-r--r-- | networking/traceroute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/traceroute.c b/networking/traceroute.c index 190f19ddc..79f3957a6 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -548,7 +548,7 @@ static int wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp) { fd_set fds; - struct timeval now, wait; + struct timeval now, tvwait; struct timezone tz; int cc = 0; socklen_t fromlen = sizeof(*fromp); @@ -556,12 +556,12 @@ wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp) FD_ZERO(&fds); FD_SET(sock, &fds); - wait.tv_sec = tp->tv_sec + waittime; - wait.tv_usec = tp->tv_usec; + tvwait.tv_sec = tp->tv_sec + waittime; + tvwait.tv_usec = tp->tv_usec; (void)gettimeofday(&now, &tz); - tvsub(&wait, &now); + tvsub(&tvwait, &now); - if (select(sock + 1, &fds, NULL, NULL, &wait) > 0) + if (select(sock + 1, &fds, NULL, NULL, &tvwait) > 0) cc = recvfrom(sock, (char *)packet, sizeof(packet), 0, (struct sockaddr *)fromp, &fromlen); |