From owner-p4-projects@FreeBSD.ORG  Tue Mar 11 22:17:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CD6B1065676; Tue, 11 Mar 2008 22:17:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A5A71065671
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:17:41 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 192058FC18
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:17:41 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BMHe4Z043082
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:17:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BMHeJr043080
	for perforce@freebsd.org; Tue, 11 Mar 2008 22:17:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 11 Mar 2008 22:17:40 GMT
Message-Id: <200803112217.m2BMHeJr043080@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137445 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2008 22:17:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=137445

Change 137445 by rwatson@rwatson_cinnamon on 2008/03/11 22:16:50

	If the requested timeout is 0, then we want to wait forever, so
	pass NULL to select() for its timeout rather than an
	under-initialized timeval.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#23 edit

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#23 (text+ko) ====

@@ -217,7 +217,8 @@
 		tv.tv_sec = p->to_ms / 1000;
 		tv.tv_usec = (p->to_ms * 1000) % 1000000;
 	}
-	r = select(p->fd + 1, &r_set, NULL, NULL, &tv);
+	r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv :
+	    NULL);
 	if (r < 0 && errno == EINTR)
 		return (0);
 	else if (r < 0) {