00c051e42

Rob Landley

2006-06-30

SOURCE BUG Duration: 41s

Subject

Bug http://bugs.busybox.net/view.php?id=723 - initialize tv1 the first time through the loop.

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

networking/zcip.c +9 -9

networking/zcip.c+9 -9

@@ -307,20 +307,20 @@ fail:
	fds[0].revents = 0;

	// poll, being ready to adjust current timeout
-	if (timeout > 0) {
-	gettimeofday(&tv1, NULL);
-	tv1.tv_usec += (timeout % 1000) * 1000;
-	while (tv1.tv_usec > 1000000) {
-	tv1.tv_usec -= 1000000;
-	tv1.tv_sec++;
-	}
-	tv1.tv_sec += timeout / 1000;
-	} else if (timeout == 0) {
+	if (!timeout) {
	timeout = ms_rdelay(PROBE_WAIT);
	// FIXME setsockopt(fd, SO_ATTACH_FILTER, ...) to
	// make the kernel filter out all packets except
	// ones we'd care about.
	}
+	gettimeofday(&tv1, NULL);
+	tv1.tv_usec += (timeout % 1000) * 1000;
+	while (tv1.tv_usec > 1000000) {
+	tv1.tv_usec -= 1000000;
+	tv1.tv_sec++;
+	}
+	tv1.tv_sec += timeout / 1000;
+
	VDBG("...wait %ld %s nprobes=%d, nclaims=%d\n",
	timeout, intf, nprobes, nclaims);
	switch (poll(fds, 1, timeout)) {