From owner-svn-src-all@FreeBSD.ORG  Wed Jul 25 17:49:01 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9FEA8106566B;
	Wed, 25 Jul 2012 17:49:01 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A81D8FC08;
	Wed, 25 Jul 2012 17:49:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PHn1n3083721;
	Wed, 25 Jul 2012 17:49:01 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PHn16Y083719;
	Wed, 25 Jul 2012 17:49:01 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201207251749.q6PHn16Y083719@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Wed, 25 Jul 2012 17:49:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238776 - head/cddl/contrib/opensolaris/cmd/dtrace
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jul 2012 17:49:01 -0000

Author: gnn
Date: Wed Jul 25 17:49:01 2012
New Revision: 238776
URL: http://svn.freebsd.org/changeset/base/238776

Log:
  Revert previous commit.  The bug was actually caused by an issue
  in pre 1.8.5 versions of sudo which were sending too many
  SIGINTs to processes when the user hit Ctrl-C.
  
  Pointed out by:	avg@, rpaulo@, sbruno@

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Wed Jul 25 17:42:57 2012	(r238775)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Wed Jul 25 17:49:01 2012	(r238776)
@@ -70,8 +70,6 @@ typedef struct dtrace_cmd {
 #define	E_ERROR		1
 #define	E_USAGE		2
 
-#define IMPATIENT_LIMIT	2
-
 static const char DTRACE_OPTSTR[] =
 	"3:6:aAb:Bc:CD:ef:FGhHi:I:lL:m:n:o:p:P:qs:SU:vVwx:X:Z";
 
@@ -1204,7 +1202,7 @@ intr(int signo)
 	if (!g_intr)
 		g_newline = 1;
 
-	if (g_intr++ > IMPATIENT_LIMIT)
+	if (g_intr++)
 		g_impatient = 1;
 }