[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-serv8149/drivers/native

Modified Files:
	fs_native.c 
Log Message:


Merging in the defer-cwd branch. These changes include:

+ Carry full stat info in the inode now
+ Use that stat info (careful with intents!) instead of calling getattr
+ Cached attributes for the native driver
+ Abstracted and localized system call defs (see .../include/native.h)
+ The ability to defer path traversal to the "current working directory" unless
	and until a relative pathname is specified. This alters _sysio_boot
	to take an extra parameter (the init cwd) and must be configured
	with "--with-defer-init-cwd".


Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -w -b -B -p -r1.51 -r1.52
--- fs_native.c	30 Sep 2004 15:31:55 -0000	1.51
+++ fs_native.c	14 Oct 2004 14:59:28 -0000	1.52
@@ -74,6 +74,7 @@
 
 #include "xtio.h"
 #include "sysio.h"
+#include "native.h"
 #include "fs.h"
 #include "mount.h"
 #include "inode.h"
@@ -84,13 +85,13 @@
 #include <sys/uio.h>
 #endif
 
[...1061 lines suppressed...]
+	assert(nino->ni_fd >= 0);
 	arg1 = va_arg(ap, long);
 	arg2 = va_arg(ap, long);
 	arg3 = va_arg(ap, long);
 	arg4 = va_arg(ap, long);
 
-	return syscall(SYS_ioctl, I2NI(ino)->ni_fd, request,
+	return syscall(SYSIO_SYS_ioctl, I2NI(ino)->ni_fd, request,
 		       arg1, arg2, arg3, arg4);
 }
 #else
@@ -1781,7 +1777,7 @@ native_inop_gone(struct inode *ino)
 	struct native_inode *nino = I2NI(ino);
 
 	if (nino->ni_fd >= 0)
-		(void )syscall(SYS_close, nino->ni_fd);
+		(void )syscall(SYSIO_SYS_close, nino->ni_fd);
 
 	free(ino->i_private);
 }