[Libsysio-commit] RedStorm_merge: libsysio/drivers/native .cvsignore fs_native.c fs_native.h

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1:/tmp/cvs-serv8570/drivers/native

Modified Files:
      Tag: RedStorm_merge
	fs_native.c fs_native.h 
Added Files:
      Tag: RedStorm_merge
	.cvsignore 
Log Message:
merge changes from Mike Levenhagen

--- NEW FILE ---
.deps
Makefile

Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.6.2.1
diff -u -w -b -B -p -r1.11.4.6 -r1.11.4.6.2.1
--- fs_native.c	4 Aug 2003 15:37:05 -0000	1.11.4.6
+++ fs_native.c	5 Sep 2003 16:36:17 -0000	1.11.4.6.2.1
@@ -41,6 +41,8 @@
  * le...@sa...
  */
 
+#ident "$Id$"
+
 #ifdef __linux__
 #define _BSD_SOURCE
 #endif
@@ -1073,7 +1075,7 @@ native_inop_unlink(struct pnode *pno)
 	 * (usually .NFSXXXXXX, where the X's are replaced by the PID and some
 	 * unique characters) in order to simulate the proper semantic.
 	 */
-	if (!syscall(SYS_unlink, path))
+	if (syscall(SYS_unlink, path) != 0)
 		err = -errno;
 	free(path);
 	return err;
@@ -1127,7 +1129,7 @@ doio(ssize_t (*f)(int, const struct iove
 	 * Avoid the reposition call if we're already at the right place.
 	 * Allows us to access pipes and fifos.
 	 */
-	result = ioctx->ioctx_offset; 
+	result = nino->ni_fpos;
 	if (ioctx->ioctx_offset != nino->ni_fpos) {
 		int	err;
 

Index: fs_native.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.10.1
diff -u -w -b -B -p -r1.1.1.1 -r1.1.1.1.10.1
--- fs_native.h	22 Feb 2003 16:33:14 -0000	1.1.1.1
+++ fs_native.h	5 Sep 2003 16:36:17 -0000	1.1.1.1.10.1
@@ -45,4 +45,6 @@
  * Native file system driver support.
  */
 
+#ident "$Id$"
+
 extern int _sysio_native_init(void);