From owner-svn-src-all@FreeBSD.ORG  Mon May 14 21:58:23 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 8E4C41065742;
	Mon, 14 May 2012 21:58:23 +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 78FB28FC16;
	Mon, 14 May 2012 21:58:23 +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 q4ELwNhm053020;
	Mon, 14 May 2012 21:58:23 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4ELwN6s053018;
	Mon, 14 May 2012 21:58:23 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201205142158.q4ELwN6s053018@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Mon, 14 May 2012 21:58:23 +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: r235454 - head/cddl/contrib/dtracetoolkit
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: Mon, 14 May 2012 21:58:23 -0000

Author: gnn
Date: Mon May 14 21:58:22 2012
New Revision: 235454
URL: http://svn.freebsd.org/changeset/base/235454

Log:
  Fix opensnoop for FreeBSD by removing probes with 64 at the end as
  these are unnecessary.
  
  Reference sh in the correct location (/bin/sh)

Modified:
  head/cddl/contrib/dtracetoolkit/opensnoop

Modified: head/cddl/contrib/dtracetoolkit/opensnoop
==============================================================================
--- head/cddl/contrib/dtracetoolkit/opensnoop	Mon May 14 18:06:51 2012	(r235453)
+++ head/cddl/contrib/dtracetoolkit/opensnoop	Mon May 14 21:58:22 2012	(r235454)
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # opensnoop - snoop file opens as they occur.
 #             Written using DTrace (Solaris 10 3/05).
@@ -189,7 +189,7 @@ fi
  /*
   * Print open event
   */
- syscall::open:entry, syscall::open64:entry
+ syscall::open:entry
  {
 	/* save pathname */
 	self->pathp = arg0;
@@ -203,7 +203,7 @@ fi
 	/* OPT_file is checked on return to ensure pathp is mapped */
  }
 
- syscall::open:return, syscall::open64:return
+ syscall::open:return
  /self->ok && (! OPT_failonly || (int)arg0 < 0) && 
  ((OPT_file == 0) || (OPT_file == 1 && PATHNAME == copyinstr(self->pathp)))/
  {
@@ -235,7 +235,7 @@ fi
  /* 
   * Cleanup 
   */
- syscall::open:return, syscall::open64:return 
+ syscall::open:return
  /self->ok/
  {
 	self->pathp = 0;