From owner-p4-projects@FreeBSD.ORG Mon Sep 12 12:25:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E78C516A421; Mon, 12 Sep 2005 12:25:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9B3216A41F for ; Mon, 12 Sep 2005 12:25:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 720F643D46 for ; Mon, 12 Sep 2005 12:25:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8CCPChd037782 for ; Mon, 12 Sep 2005 12:25:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8CCPC82037779 for perforce@freebsd.org; Mon, 12 Sep 2005 12:25:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Sep 2005 12:25:12 GMT Message-Id: <200509121225.j8CCPC82037779@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 83457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2005 12:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=83457 Change 83457 by rwatson@rwatson_peppercorn on 2005/09/12 12:24:23 Integrate netsmp branch from FreeBSD CVS: - Merge fifo regression test updates. - Merge fifofs "don't seek" fix. Affected files ... .. //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/netsmp/src/tools/regression/fifo/fifo_io/Makefile#1 branch .. //depot/projects/netsmp/src/tools/regression/fifo/fifo_io/fifo_io.c#1 branch .. //depot/projects/netsmp/src/tools/regression/fifo/fifo_open/fifo_open.c#2 integrate Differences ... ==== //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.118 2005/09/12 10:16:18 rwatson Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.119 2005/09/12 12:15:12 rwatson Exp $ */ #include @@ -68,7 +68,7 @@ .fo_kqfilter = fifo_kqfilter_f, .fo_stat = fifo_stat_f, .fo_close = fifo_close_f, - .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE + .fo_flags = DFLAG_PASSABLE }; /* ==== //depot/projects/netsmp/src/tools/regression/fifo/fifo_open/fifo_open.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/tools/regression/fifo/fifo_open/fifo_open.c,v 1.1 2005/09/11 13:03:36 rwatson Exp $ + * $FreeBSD: src/tools/regression/fifo/fifo_open/fifo_open.c,v 1.2 2005/09/11 17:41:32 rwatson Exp $ */ #include @@ -462,6 +462,8 @@ strcpy(temp_dir, "/tmp/fifo_create.XXXXXXXXXXX"); if (mkdtemp(temp_dir) == NULL) err(-1, "mkdtemp"); + if (chdir(temp_dir) < 0) + err(-1, "chdir: %s", temp_dir); atexit(atexit_temp_dir); test_non_blocking_reader();