aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
commit5d61e71c3a8ac3296afbfe9a014c62050c5a9234 (patch)
treee9ab2cd35d1f2d51b26a678551a0439b1719928b /networking/udhcp
parentc9dc2ac578278e86be248cc21e53081f7054da83 (diff)
downloadbusybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.gz
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.bz2
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.zip
introduce safe_poll (fixes a problem in top)
function old new delta safe_poll - 77 +77 svlogd_main 1470 1466 -4 zcip_main 1530 1524 -6 forkexec 1345 1338 -7 decode_format_string 795 788 -7 collect_blk 474 467 -7 buffer_pread 540 532 -8 tftp 1182 1172 -10 microcom_main 763 749 -14 arpping 441 424 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/9 up/down: 77/-80) Total: -3 bytes text data bss dec hex filename 770162 1034 10404 781600 bed20 busybox_old 770158 1034 10404 781596 bed1c busybox_unstripped
Diffstat (limited to 'networking/udhcp')
-rw-r--r--networking/udhcp/arpping.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 33518077b..7b702d8f3 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -81,12 +81,9 @@ int arpping(uint32_t test_ip, uint32_t from_ip, uint8_t *from_mac, const char *i
81 unsigned prevTime = monotonic_us(); 81 unsigned prevTime = monotonic_us();
82 82
83 pfd[0].events = POLLIN; 83 pfd[0].events = POLLIN;
84 r = poll(pfd, 1, timeout_ms); 84 r = safe_poll(pfd, 1, timeout_ms);
85 if (r < 0) { 85 if (r < 0) {
86 if (errno != EINTR) { 86 break;
87 bb_perror_msg("poll");
88 break;
89 }
90 } else if (r) { 87 } else if (r) {
91 if (read(s, &arp, sizeof(arp)) < 0) 88 if (read(s, &arp, sizeof(arp)) < 0)
92 break; 89 break;