Thread: [Libsysio-commit] RedStorm_merge: libsysio/src .cvsignore access.c chdir.c chmod.c chown.c dev.c dup
Brought to you by:
lward
From: Ruth K. <rk...@us...> - 2003-09-05 16:36:30
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1:/tmp/cvs-serv8570/src Modified Files: Tag: RedStorm_merge access.c chdir.c chmod.c chown.c dev.c dup.c fcntl.c file.c fs.c fsync.c getdirentries.c init.c inode.c ioctl.c ioctx.c iowait.c lseek.c mkdir.c mknod.c mount.c namei.c open.c read.c rmdir.c stat.c stat64.c statvfs.c symlink.c truncate.c unlink.c write.c Added Files: Tag: RedStorm_merge .cvsignore Log Message: merge changes from Mike Levenhagen --- NEW FILE --- .deps Makefile Index: access.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/access.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.1.2.1 diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.1.2.1 --- access.c 29 Jul 2003 20:17:22 -0000 1.1.2.1 +++ access.c 5 Sep 2003 16:36:17 -0000 1.1.2.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <errno.h> #include <sys/types.h> Index: chdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v retrieving revision 1.3 retrieving revision 1.3.14.1 diff -u -w -b -B -p -r1.3 -r1.3.14.1 --- chdir.c 9 Mar 2003 16:57:47 -0000 1.3 +++ chdir.c 5 Sep 2003 16:36:17 -0000 1.3.14.1 @@ -63,6 +63,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -238,7 +240,11 @@ _sysio_p_path(struct pnode *pno, char ** } char * +#if defined(BSD) || defined(REDSTORM) +__getcwd(char *buf, size_t size) +#else getcwd(char *buf, size_t size) +#endif { int err; Index: chmod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chmod.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- chmod.c 24 Mar 2003 22:09:06 -0000 1.3 +++ chmod.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <string.h> #include <errno.h> #include <assert.h> Index: chown.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chown.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- chown.c 24 Mar 2003 22:09:06 -0000 1.3 +++ chown.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <string.h> #include <errno.h> #include <assert.h> Index: dev.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/dev.c,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.c 12 May 2003 11:48:45 -0000 1.2.6.1 +++ dev.c 5 Sep 2003 16:36:17 -0000 1.2.6.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <errno.h> #include <assert.h> Index: dup.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/dup.c,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 --- dup.c 22 Feb 2003 16:33:05 -0000 1.1.1.1 +++ dup.c 5 Sep 2003 16:36:17 -0000 1.1.1.1.10.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <sys/types.h> Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.3 retrieving revision 1.3.8.1 diff -u -w -b -B -p -r1.3 -r1.3.8.1 --- fcntl.c 4 Apr 2003 20:09:47 -0000 1.3 +++ fcntl.c 5 Sep 2003 16:36:17 -0000 1.3.8.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <sys/types.h> @@ -50,6 +52,7 @@ #include "sysio.h" #include "inode.h" #include "file.h" +#include "sysio-symbols.h" int fcntl(int fd, int cmd, ...) @@ -95,3 +98,7 @@ out: } return err; } + +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(fcntl, _fcntl) +#endif Index: file.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/file.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -w -b -B -p -r1.4 -r1.4.6.1 --- file.c 9 Mar 2003 17:18:57 -0000 1.4 +++ file.c 5 Sep 2003 16:36:17 -0000 1.4.6.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <assert.h> #include <errno.h> Index: fs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fs.c,v retrieving revision 1.8 retrieving revision 1.8.10.1 diff -u -w -b -B -p -r1.8 -r1.8.10.1 --- fs.c 24 Apr 2003 02:15:29 -0000 1.8 +++ fs.c 5 Sep 2003 16:36:17 -0000 1.8.10.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <string.h> #include <errno.h> Index: fsync.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fsync.c,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -w -b -B -p -r1.2 -r1.2.6.1 --- fsync.c 9 Mar 2003 06:22:43 -0000 1.2 +++ fsync.c 5 Sep 2003 16:36:17 -0000 1.2.6.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <sys/types.h> Index: getdirentries.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v retrieving revision 1.1.10.2 retrieving revision 1.1.10.2.2.1 diff -u -w -b -B -p -r1.1.10.2 -r1.1.10.2.2.1 --- getdirentries.c 19 May 2003 14:05:34 -0000 1.1.10.2 +++ getdirentries.c 5 Sep 2003 16:36:17 -0000 1.1.10.2.2.1 @@ -1,3 +1,5 @@ +#ident "$Id$" + #include <stdlib.h> #ifdef __GLIBC__ #include <alloca.h> @@ -215,3 +217,6 @@ out: sysio_sym_strong_alias(getdirentries64, getdirentries) #endif +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(getdirentries, _getdirentries) +#endif Index: init.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/init.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- init.c 24 Mar 2003 22:09:06 -0000 1.3 +++ init.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <errno.h> #include <sys/types.h> Index: inode.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.1.2.1 diff -u -w -b -B -p -r1.7.4.1 -r1.7.4.1.2.1 --- inode.c 29 Jul 2003 19:05:08 -0000 1.7.4.1 +++ inode.c 5 Sep 2003 16:36:17 -0000 1.7.4.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <string.h> #include <errno.h> @@ -281,7 +283,6 @@ _sysio_i_gone(struct inode *ino) void _sysio_i_undead(struct inode *ino) { - LIST_REMOVE(ino, i_link); ino->i_zombie = 1; } Index: ioctl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctl.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.18.1 diff -u -w -b -B -p -r1.1.1.1 -r1.1.1.1.18.1 --- ioctl.c 22 Feb 2003 16:33:07 -0000 1.1.1.1 +++ ioctl.c 5 Sep 2003 16:36:17 -0000 1.1.1.1.18.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <errno.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -49,6 +51,7 @@ #include "sysio.h" #include "inode.h" #include "file.h" +#include "sysio-symbols.h" int ioctl(int fd, unsigned long request, ...) @@ -75,3 +78,7 @@ out: } return err; } + +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(ioctl, _ioctl) +#endif Index: ioctx.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctx.c,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -u -w -b -B -p -r1.2 -r1.2.8.1 --- ioctx.c 7 Mar 2003 03:31:36 -0000 1.2 +++ ioctx.c 5 Sep 2003 16:36:17 -0000 1.2.8.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <string.h> #include <errno.h> Index: iowait.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/iowait.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -w -b -B -p -r1.3 -r1.3.6.1 --- iowait.c 9 Mar 2003 06:25:45 -0000 1.3 +++ iowait.c 5 Sep 2003 16:36:17 -0000 1.3.6.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <errno.h> #include <sys/types.h> #include <sys/queue.h> Index: lseek.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.1.2.1 diff -u -w -b -B -p -r1.4.4.1 -r1.4.4.1.2.1 --- lseek.c 12 May 2003 11:48:45 -0000 1.4.4.1 +++ lseek.c 5 Sep 2003 16:36:17 -0000 1.4.4.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <errno.h> #include <unistd.h> #include <sys/types.h> Index: mkdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mkdir.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- mkdir.c 24 Mar 2003 22:09:06 -0000 1.3 +++ mkdir.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <assert.h> Index: mknod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mknod.c,v retrieving revision 1.3.6.1 retrieving revision 1.3.6.1.2.1 diff -u -w -b -B -p -r1.3.6.1 -r1.3.6.1.2.1 --- mknod.c 12 May 2003 11:48:45 -0000 1.3.6.1 +++ mknod.c 5 Sep 2003 16:36:17 -0000 1.3.6.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #if defined(__linux__) #define _BSD_SOURCE #endif Index: mount.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mount.c,v retrieving revision 1.5 retrieving revision 1.5.10.1 diff -u -w -b -B -p -r1.5 -r1.5.10.1 --- mount.c 18 Apr 2003 20:24:05 -0000 1.5 +++ mount.c 5 Sep 2003 16:36:17 -0000 1.5.10.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <string.h> #include <errno.h> @@ -57,6 +59,7 @@ #include "fs.h" #include "mount.h" #include "inode.h" +#include "sysio-symbols.h" /* * File system and volume mount support. @@ -270,7 +273,7 @@ _sysio_mount_root(const char *source, } int -mount(const char *source, +do_mount(const char *source, const char *target, const char *filesystemtype, unsigned long mountflags, @@ -357,6 +360,20 @@ out: } return err; } + +#if defined(BSD) || defined(REDSTORM) +int +mount(const char *type, + const char *dir, + int flags, + void *data) +{ + return do_mount( data, dir, type, 0, NULL ); +} + +#else +sysio_sym_weak_alias(do_mount, mount) +#endif /* * Unmount all file systems -- Usually as part of shutting everything down. Index: namei.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/namei.c,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 --- namei.c 29 Jul 2003 19:05:09 -0000 1.5.6.1 +++ namei.c 5 Sep 2003 16:36:17 -0000 1.5.6.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #if defined(AUTOMOUNT_FILE_NAME) && defined(__linux__) #define _BSD_SOURCE #endif Index: open.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/open.c,v retrieving revision 1.7.4.1 retrieving revision 1.7.4.1.2.1 diff -u -w -b -B -p -r1.7.4.1 -r1.7.4.1.2.1 --- open.c 19 May 2003 13:51:20 -0000 1.7.4.1 +++ open.c 5 Sep 2003 16:36:17 -0000 1.7.4.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <stdlib.h> #include <string.h> #include <errno.h> @@ -55,6 +57,7 @@ #include "file.h" #include "fs.h" #include "mount.h" +#include "sysio-symbols.h" /* * Open file support. @@ -203,6 +206,10 @@ error: return -1; } +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(open, _open) +#endif + int close(int fd) { @@ -213,6 +220,10 @@ close(int fd) errno = -err; return err ? -1 : 0; } + +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(close, _close) +#endif int creat(const char *path, mode_t mode) Index: read.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/read.c,v retrieving revision 1.2 retrieving revision 1.2.14.1 diff -u -w -b -B -p -r1.2 -r1.2.14.1 --- read.c 9 Mar 2003 06:36:37 -0000 1.2 +++ read.c 5 Sep 2003 16:36:17 -0000 1.2.14.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <sys/types.h> @@ -52,6 +54,7 @@ #include "sysio.h" #include "file.h" #include "inode.h" +#include "sysio-symbols.h" /* * Schedule asynchronous read of iovec at some file extent. @@ -209,6 +212,10 @@ read(int fd, void *buf, size_t count) return -1; return iowait(ioid); } + +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(read, _read) +#endif #ifdef notdef int Index: rmdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rmdir.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- rmdir.c 24 Mar 2003 22:09:06 -0000 1.3 +++ rmdir.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <assert.h> Index: stat.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v retrieving revision 1.3.6.2 retrieving revision 1.3.6.2.2.1 diff -u -w -b -B -p -r1.3.6.2 -r1.3.6.2.2.1 --- stat.c 19 May 2003 13:51:20 -0000 1.3.6.2 +++ stat.c 5 Sep 2003 16:36:17 -0000 1.3.6.2.2.1 @@ -41,12 +41,18 @@ * le...@sa... */ +#ident "$Id$" + #include <errno.h> #include <assert.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <sys/queue.h> +#if defined(BSD) || defined(REDSTORM) +#include <sys/param.h> +#include <sys/mount.h> +#endif #include "sysio.h" #include "inode.h" @@ -106,7 +112,10 @@ __fstat(int fd, struct stat *buf) return __fxstat(_STAT_VER, fd, buf); } +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(__fstat, _fstat) sysio_sym_weak_alias(__fstat, fstat) +#endif int __xstat(int __ver, const char *__filename, struct stat *__stat_buf) @@ -140,13 +149,21 @@ out: } int +#if defined(BSD) || defined(REDSTORM) +_stat(const char *filename, struct stat *buf) +#else __stat(const char *filename, struct stat *buf) +#endif { return __xstat(_STAT_VER, filename, buf); } +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(_stat, stat) +#else sysio_sym_weak_alias(__stat, stat) +#endif int __lxstat(int __ver, const char *__filename, struct stat *__stat_buf) Index: stat64.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v retrieving revision 1.3.6.1 retrieving revision 1.3.6.1.2.1 diff -u -w -b -B -p -r1.3.6.1 -r1.3.6.1.2.1 --- stat64.c 12 May 2003 11:48:45 -0000 1.3.6.1 +++ stat64.c 5 Sep 2003 16:36:17 -0000 1.3.6.1.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #ifdef _LARGFILE64_SOURCE #include <errno.h> Index: statvfs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/statvfs.c,v retrieving revision 1.3.6.1 retrieving revision 1.3.6.1.2.1 diff -u -w -b -B -p -r1.3.6.1 -r1.3.6.1.2.1 --- statvfs.c 12 May 2003 11:48:45 -0000 1.3.6.1 +++ statvfs.c 5 Sep 2003 16:36:17 -0000 1.3.6.1.2.1 @@ -41,7 +41,7 @@ * le...@sa... */ -#if !(defined(BSD) || defined(REDSTORM)) +#ident "$Id$" #include <unistd.h> #include <errno.h> @@ -138,4 +138,3 @@ err: out: return err; } -#endif /* if !(defined(BSD) || defined(REDSTORM)) */ Index: symlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/symlink.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- symlink.c 24 Mar 2003 22:09:07 -0000 1.3 +++ symlink.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <assert.h> Index: truncate.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- truncate.c 24 Mar 2003 22:09:07 -0000 1.3 +++ truncate.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <string.h> #include <errno.h> Index: unlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -w -b -B -p -r1.3 -r1.3.2.1 --- unlink.c 24 Mar 2003 22:09:07 -0000 1.3 +++ unlink.c 5 Sep 2003 16:36:17 -0000 1.3.2.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <assert.h> Index: write.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/write.c,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -w -b -B -p -r1.2 -r1.2.16.1 --- write.c 7 Mar 2003 03:31:36 -0000 1.2 +++ write.c 5 Sep 2003 16:36:17 -0000 1.2.16.1 @@ -41,6 +41,8 @@ * le...@sa... */ +#ident "$Id$" + #include <unistd.h> #include <errno.h> #include <sys/types.h> @@ -54,6 +56,7 @@ #include "inode.h" #include "fs.h" #include "mount.h" +#include "sysio-symbols.h" /* * Schedule asynchronous write of iovec at some file extent. @@ -205,6 +208,10 @@ writev(int fd, const struct iovec *iov, return iowait(ioid); } +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias( writev, _writev ) +#endif + ssize_t write(int fd, const void *buf, size_t count) { @@ -215,6 +222,10 @@ write(int fd, const void *buf, size_t co return -1; return iowait(ioid); } + +#if defined(BSD) || defined(REDSTORM) +sysio_sym_weak_alias(write, _write) +#endif #ifdef notdef int |