[Libsysio-commit] HEAD: libsysio/drivers/native fs_native.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19311/drivers/native

Modified Files:
	fs_native.c 
Log Message:


+Changes for Red Storm from Kevin Pedretti

+Fix in fs_native.c to conditionally compile DIR_STREAMED code properly. We
were always including it -- Even when using getdirentries. Oops.


Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -w -b -B -p -r1.37 -r1.38
--- fs_native.c	27 Apr 2004 06:33:22 -0000	1.37
+++ fs_native.c	25 May 2004 17:53:43 -0000	1.38
@@ -86,10 +86,10 @@
 #define DIR_STREAMED 0
 #define DIR_CVT_64 0
 #elif defined(SYS_getdents64)
-#define DIR_STREAMED 0
+#define DIR_STREAMED 1
 #define DIR_CVT_64 0
 #elif defined(SYS_getdents)
-#define DIR_STREAMED 0
+#define DIR_STREAMED 1
 #if defined(_LARGEFILE64_SOURCE)
 #define DIR_CVT_64 1
 /*
@@ -923,7 +921,7 @@ native_filldirentries(struct native_inod
 	if (*basep < 0)
 		return -EINVAL;
 
-#if !DIR_STREAMED
+#if DIR_STREAMED
 	/*
 	 * Stream-oriented access requires that we reposition prior to the
 	 * fill call.
@@ -939,8 +937,7 @@ native_filldirentries(struct native_inod
 		    nino->ni_fd,
 		    buf,
 		    nbytes,
-		    basep,
-		    &nino->ni_fpos);
+		    basep);
 #elif defined(SYS_getdents64)
 	    syscall(SYS_getdents64, nino->ni_fd, buf, nbytes);
 #elif defined(SYS_getdents)
@@ -949,7 +946,7 @@ native_filldirentries(struct native_inod
 
 	if (cc < 0)
 		return -errno;
-#if !DIR_STREAMED
+#if DIR_STREAMED
 	/*
 	 * Stream-oriented access requires that we discover where we are
 	 * after the call.