[Libsysio-commit] RedStorm_merge: libsysio/include dev.h file.h fs.h inode.h mount.h sysio-symbols.h sysio.h

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

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

Modified Files:
      Tag: RedStorm_merge
	dev.h file.h fs.h inode.h mount.h sysio-symbols.h sysio.h 
Log Message:
merge changes from Mike Levenhagen

Index: dev.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/dev.h,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.1.2.1
diff -u -w -b -B -p -r1.2.6.1 -r1.2.6.1.2.1
--- dev.h	12 May 2003 11:48:45 -0000	1.2.6.1
+++ dev.h	5 Sep 2003 16:36:17 -0000	1.2.6.1.2.1
@@ -49,6 +49,8 @@
  * Make a device number, composed of major and minor parts. We *assume* that
  * the system version of a dev_t is 16 bits or more.
  */
+#ident "$Id$"
+
 #define SYSIO_MKDEV(major, minor) \
 	((((major) & 0xff) << 8) | ((minor) & 0xff))
 

Index: file.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/file.h,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.1.2.1
diff -u -w -b -B -p -r1.5.6.1 -r1.5.6.1.2.1
--- file.h	12 May 2003 11:48:45 -0000	1.5.6.1
+++ file.h	5 Sep 2003 16:36:17 -0000	1.5.6.1.2.1
@@ -50,6 +50,8 @@
  * all the info necessary to track the context and parameters for the
  * operations that may be performed.
  */
+#ident "$Id$"
+
 struct file {
 	struct inode *f_ino;				/* path node */
 	_SYSIO_OFF_T f_pos;				/* current stream pos */

Index: fs.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/fs.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -w -b -B -p -r1.4 -r1.4.2.1
--- fs.h	24 Mar 2003 22:09:05 -0000	1.4
+++ fs.h	5 Sep 2003 16:36:17 -0000	1.4.2.1
@@ -45,6 +45,8 @@
  * File system or volume support.
  */
 
+#ident "$Id$"
+
 struct filesys;
 
 struct pnode;

Index: inode.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.2.2.1
diff -u -w -b -B -p -r1.6.4.2 -r1.6.4.2.2.1
--- inode.h	29 Jul 2003 19:05:08 -0000	1.6.4.2
+++ inode.h	5 Sep 2003 16:36:17 -0000	1.6.4.2.2.1
@@ -41,6 +41,8 @@
  * le...@sa...
  */
 
+#ident "$Id$"
+
 #if defined(AUTOMOUNT_FILE_NAME) && !defined(MAX_MOUNT_DEPTH)
 /*
  * Maximum number of automounts to attempt in path traversal.

Index: mount.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/mount.h,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -w -b -B -p -r1.3 -r1.3.8.1
--- mount.h	7 Mar 2003 03:31:36 -0000	1.3
+++ mount.h	5 Sep 2003 16:36:17 -0000	1.3.8.1
@@ -41,6 +41,10 @@
  * le...@sa...
  */
 
+#ident "$Id$"
+
+#include <sys/queue.h>
+
 /*
  * Mount support.
  */

Index: sysio-symbols.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio-symbols.h,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -w -b -B -p -r1.2 -r1.2.8.1
--- sysio-symbols.h	7 Mar 2003 03:31:36 -0000	1.2
+++ sysio-symbols.h	5 Sep 2003 16:36:17 -0000	1.2.8.1
@@ -1,3 +1,5 @@
+#ident "$Id$"
+
 #if defined(HAVE_ASM_WEAK_DIRECTIVE) || defined(HAVE_ASM_WEAKEXT_DIRECTIVE)
 #define HAVE_WEAK_SYMBOLS
 #endif

Index: sysio.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v
retrieving revision 1.7.6.2
retrieving revision 1.7.6.2.2.1
diff -u -w -b -B -p -r1.7.6.2 -r1.7.6.2.2.1
--- sysio.h	29 Jul 2003 20:17:22 -0000	1.7.6.2
+++ sysio.h	5 Sep 2003 16:36:17 -0000	1.7.6.2.2.1
@@ -45,8 +45,17 @@
  * System IO common information.
  */
 
+#ident "$Id$"
+
 #include <stdarg.h>
 
+#if defined(BSD) || defined(REDSTORM)
+#include <sys/param.h>
+#include <sys/mount.h>
+#else
+#include <sys/vfs.h>
+#endif
+
 #ifndef _IOID_T_DEFINED
 #define _IOID_T_DEFINED
 /*
@@ -162,6 +171,7 @@ extern int stat(const char *path, struct
 extern int statvfs(const char *path, struct statvfs *buf);
 extern int fstatvfs(int fd, struct statvfs *buf);
 #endif
+extern int fstatfs(int fd, struct statfs *buf);
 extern int truncate(const char *path, off_t length);
 extern int rmdir(const char *path);
 extern int symlink(const char *path1, const char *path2);
@@ -193,8 +203,12 @@ extern ioid_t iwrite(int fd, const void 
 extern ssize_t writev(int fd, const struct iovec *iov, int count);
 extern ssize_t write(int fd, const void *buf, size_t count);
 extern int mknod(const char *path, mode_t mode, dev_t dev);
+#if defined(BSD) || defined(REDSTORM)
+extern int mount(const char *, const char *, int, void *);
+#else
 extern int mount(const char *source, const char *target,
 		 const char *filesystemtype,
 		 unsigned long mountflags,
 		 const void *data);
+#endif
 extern int umount(const char *target);