PERFORCE change 83457 for review

Robert Watson rwatson at FreeBSD.org
Mon Sep 12 05:25:13 PDT 2005


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

Change 83457 by rwatson at 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 <sys/param.h>
@@ -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 <sys/types.h>
@@ -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();


More information about the p4-projects mailing list