libsysio-commit Mailing List for libsysio (Page 25)
Brought to you by:
lward
Menu
▾
▴
libsysio-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(25) |
May
(28) |
Jun
(25) |
Jul
(30) |
Aug
(60) |
Sep
(52) |
Oct
(100) |
Nov
(15) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(89) |
Feb
(48) |
Mar
(22) |
Apr
(59) |
May
(16) |
Jun
(15) |
Jul
(50) |
Aug
(26) |
Sep
(40) |
Oct
(27) |
Nov
(12) |
Dec
|
| 2005 |
Jan
(24) |
Feb
(11) |
Mar
|
Apr
|
May
(3) |
Jun
(6) |
Jul
|
Aug
(14) |
Sep
(21) |
Oct
(10) |
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
(5) |
Mar
(2) |
Apr
(6) |
May
(11) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2007 |
Jan
(3) |
Feb
(5) |
Mar
(20) |
Apr
(41) |
May
(21) |
Jun
(3) |
Jul
(5) |
Aug
(12) |
Sep
(21) |
Oct
(5) |
Nov
(16) |
Dec
|
| 2008 |
Jan
|
Feb
(2) |
Mar
(4) |
Apr
(23) |
May
|
Jun
(22) |
Jul
(13) |
Aug
|
Sep
|
Oct
(9) |
Nov
(3) |
Dec
(13) |
| 2009 |
Jan
(14) |
Feb
(10) |
Mar
(2) |
Apr
(11) |
May
(7) |
Jun
(1) |
Jul
(1) |
Aug
(36) |
Sep
(12) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Lee W. <lw...@us...> - 2004-07-23 15:12:11
|
Update of /cvsroot/libsysio/libsysio/drivers/native In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26760 Modified Files: fs_native.c Log Message: Previous checkin introduced a memory leak -- Altered the implementation so that an additional malloc was unnecessary. Also, localized the cache refresh so that it was done whenever a stat was done, enpassant. Couldn't convince myself it was always updated before. Just too stupid to see that I suppose. While testing these changes, a new bug appeared. Under SuSE linux 9.1 with a 2.6.5-7.95 kernel, the /proc file system can have different objects with the same i-number! Ouch! The native driver assumed such a thing would *never* happen. It does not make this assumption anymore. Index: fs_native.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -w -b -B -p -r1.41 -r1.42 --- fs_native.c 21 Jul 2004 21:22:23 -0000 1.41 +++ fs_native.c 23 Jul 2004 15:11:57 -0000 1.42 @@ -210,7 +210,7 @@ struct native_inode { int ni_oflags; /* flags, from open */ unsigned ni_nopens; /* soft ref count */ _SYSIO_OFF_T ni_fpos; /* current pos */ - struct __native_stat *ni_stat; /* cached copy of the stat */ + struct intnl_stat ni_stat; /* cached attrs */ }; /* @@ -329,15 +329,25 @@ static struct mount *native_internal_mou * stat -- by path. */ static int -native_stat(const char *path, struct intnl_stat *buf, struct __native_stat *stbuf) +native_stat(const char *path, struct native_inode *nino, struct intnl_stat *buf) { int err; + struct __native_stat stbuf; - err = syscall(__SYS_STAT, path, stbuf); - if (err) + err = syscall(__SYS_STAT, path, &stbuf); + if (err) { err = -errno; - COPY_STAT(stbuf, buf); + goto out; + } + if (!nino) { + COPY_STAT(&stbuf, buf); + goto out; + } + COPY_STAT(&stbuf, &nino->ni_stat); + if (&nino->ni_stat != buf) + (void )memcpy(buf, &nino->ni_stat, sizeof(struct intnl_stat)); +out: return err; } @@ -345,15 +355,25 @@ native_stat(const char *path, struct int * stat -- by fildes */ static int -native_fstat(int fd, struct intnl_stat *buf, struct __native_stat *stbuf) +native_fstat(int fd, struct native_inode *nino, struct intnl_stat *buf) { int err; + struct __native_stat stbuf; - err = syscall(__SYS_FSTAT, fd, stbuf); - if (err) + err = syscall(__SYS_FSTAT, fd, &stbuf); + if (err) { err = -errno; - COPY_STAT(stbuf, buf); + goto out; + } + if (!nino) { + COPY_STAT(&stbuf, buf); + goto out; + } + COPY_STAT(&stbuf, &nino->ni_stat); + if (&nino->ni_stat != buf) + (void )memcpy(buf, &nino->ni_stat, sizeof(struct intnl_stat)); +out: return err; } @@ -381,7 +401,7 @@ native_i_new(struct filesys *fs, struct nino->ni_oflags = 0; nino->ni_nopens = 0; nino->ni_fpos = 0; - nino->ni_stat = NULL; + (void )memcpy(&nino->ni_stat, buf, sizeof(struct intnl_stat)); ino = _sysio_i_new(fs, &nino->ni_fileid, @@ -429,8 +449,6 @@ create_internal_namespace() static struct qstr noname = { NULL, 0, 0 }; struct filesys *fs; struct intnl_stat stbuf; - struct __native_stat *ni_stat; - if (native_internal_mount) { /* @@ -439,8 +457,6 @@ create_internal_namespace() abort(); } - ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); - /* * We maintain an artificial, internal, name space in order to * have access to fully qualified path names in the various routines. @@ -458,7 +474,7 @@ create_internal_namespace() /* * Get root i-node. */ - err = native_stat("/", &stbuf, ni_stat); + err = native_stat("/", NULL, &stbuf); if (err) goto error; rootino = native_i_new(fs, &stbuf); @@ -466,7 +482,6 @@ create_internal_namespace() err = -ENOMEM; goto error; } - I2NI(rootino)->ni_stat = ni_stat; /* * Generate base path-node for root. @@ -598,14 +613,11 @@ native_iget(struct filesys *fs, struct intnl_stat stbuf; struct native_inode_identifier ident; struct file_identifier fileid; - struct __native_stat *ni_stat; - - ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); /* * Get file status. */ - err = native_stat(path, &stbuf, ni_stat); + err = native_stat(path, *inop ? I2NI(*inop) : NULL, &stbuf); if (err) { *inop = NULL; return err; @@ -635,9 +647,10 @@ native_iget(struct filesys *fs, fileid.fid_data = &ident; fileid.fid_len = sizeof(ident); ino = _sysio_i_find(fs, &fileid); - if (ino && forced) { + if (ino && + (forced || (ino->i_mode & S_IFMT) != (stbuf.st_mode & S_IFMT))) { /* - * Insertion was forced but it's already present! + * Insertion was forced or dup inum but it's already present! */ if (native_i_invalid(ino, stbuf)) { /* @@ -661,7 +674,6 @@ native_iget(struct filesys *fs, out: if (!err) *inop = ino; - I2NI(ino)->ni_stat = ni_stat; return err; } @@ -719,34 +731,35 @@ native_inop_lookup(struct pnode *pno, } static int -native_inop_getattr(struct pnode *pno, struct inode *ino, struct intnl_stat *stbuf) +native_inop_getattr(struct pnode *pno, + struct inode *ino, + struct intnl_stat *stbuf) { char *path; + struct native_inode *nino; int err; - struct __native_stat *ni_stat; - path = NULL; - ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); - if (!ino || I2NI(ino)->ni_fd < 0) { - if (pno) + nino = ino ? I2NI(ino) : NULL; + err = 0; /* compiler cookie */ + if (!ino) { path = _sysio_pb_path(pno->p_base, '/'); - else if (ino) { - COPY_STAT(I2NI(ino)->ni_stat, stbuf); - return 0; - } if (!path) return -ENOMEM; - /* if no pno, copy stat and return success */ - } - err = - path - ? native_stat(path, stbuf, ni_stat) - : native_fstat(I2NI(ino)->ni_fd, stbuf, ni_stat); - if (path) + err = native_stat(path, nino, stbuf); free(path); - - /* Cache a copy of the stat */ - I2NI(ino)->ni_stat = ni_stat; + } else if (nino->ni_fd >= 0) + err = native_fstat(nino->ni_fd, nino, stbuf); + else { + /* + * Dev inodes don't open in this driver. We won't have + * a file descriptor with which to do the deed then. Satisfy + * the request from the cached copy of the attributes. + */ + (void )memcpy(stbuf, + &nino->ni_stat, + sizeof(struct intnl_stat)); + err = 0; + } return err; } @@ -758,13 +771,19 @@ native_inop_setattr(struct pnode *pno, struct intnl_stat *stbuf) { char *path; + struct native_inode *nino; int fd; - struct intnl_stat st; - struct __native_stat *ni_stat; + struct intnl_stat *stbp, _stbuf; int err; path = NULL; - fd = ino ? I2NI(ino)->ni_fd : -1; + nino = ino ? I2NI(ino) : NULL; + fd = -1; + stbp = &_stbuf; + if (nino) { + fd = nino->ni_fd; + stbp = &nino->ni_stat; + } if (fd < 0 || mask & (SETATTR_MTIME|SETATTR_ATIME)) { if (!pno) return -EEXIST; @@ -776,14 +795,10 @@ native_inop_setattr(struct pnode *pno, /* * Get current status for undo. */ - ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); err = fd < 0 - ? native_stat(path, &st, ni_stat) - : native_fstat(fd, &st, ni_stat); - if (ino) - I2NI(ino)->ni_stat = ni_stat; - + ? native_stat(path, nino, stbp) + : native_fstat(fd, nino, stbp); if (err) goto out; @@ -809,8 +824,8 @@ native_inop_setattr(struct pnode *pno, /* * Alter access and/or modify time attributes. */ - ut.actime = st.st_atime; - ut.modtime = st.st_mtime; + ut.actime = stbuf->st_atime; + ut.modtime = stbuf->st_mtime; if (mask & SETATTR_MTIME) ut.modtime = stbuf->st_mtime; if (mask & SETATTR_ATIME) @@ -868,33 +883,40 @@ native_inop_setattr(struct pnode *pno, ? syscall(SYS_chown, path, mask & SETATTR_UID - ? st.st_uid + ? stbp->st_uid : (uid_t )-1, mask & SETATTR_GID - ? st.st_gid + ? stbp->st_gid : (gid_t )-1) : syscall(SYS_fchown, fd, mask & SETATTR_UID - ? st.st_uid + ? stbp->st_uid : (uid_t )-1, mask & SETATTR_GID - ? st.st_gid + ? stbp->st_gid : (gid_t )-1)); } if (mask & (SETATTR_MTIME|SETATTR_ATIME)) { struct utimbuf ut; - ut.actime = st.st_atime; - ut.modtime = st.st_mtime; + ut.actime = stbp->st_atime; + ut.modtime = stbp->st_mtime; (void )syscall(__SYS_UTIME, path, &ut); } if (mask & SETATTR_MODE) { fd < 0 - ? syscall(SYS_chmod, path, st.st_mode & 07777) - : syscall(SYS_fchmod, fd, st.st_mode & 07777); + ? syscall(SYS_chmod, path, stbp->st_mode & 07777) + : syscall(SYS_fchmod, stbp->st_mode & 07777); } out: + /* + * We must refresh the cached attributes on success. + */ + if (!err && (fd < 0 + ? native_stat(path, nino, stbp) + : native_fstat(fd, nino, stbp)) != 0) + abort(); if (path) free(path); return err; @@ -1738,9 +1760,6 @@ native_inop_gone(struct inode *ino) if (nino->ni_fd >= 0) (void )syscall(SYS_close, nino->ni_fd); - if (nino->ni_stat) - free(nino->ni_stat); - free(ino->i_private); } |
|
From: Sonja T. <so...@us...> - 2004-07-21 21:22:33
|
Update of /cvsroot/libsysio/libsysio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv514/include Modified Files: dev.h inode.h Log Message: Fixing bugs to do with device files. Now, you cant open devices that do not have an associated driver. Also, you can now do an fstat() on a device Index: dev.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/dev.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- dev.h 16 Apr 2004 20:38:34 -0000 1.7 +++ dev.h 21 Jul 2004 21:22:24 -0000 1.8 @@ -100,7 +100,7 @@ extern const struct inode_ops _sysio_nod #define _sysio_nodev_inop_open \ (int (*)(struct pnode *, \ int, \ - mode_t))_sysio_do_enoent + mode_t))_sysio_do_enodev #define _sysio_nodev_inop_close \ (int (*)(struct inode *))_sysio_do_ebadf #define _sysio_nodev_inop_link \ Index: inode.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -w -b -B -p -r1.18 -r1.19 --- inode.h 28 May 2004 12:48:26 -0000 1.18 +++ inode.h 21 Jul 2004 21:22:24 -0000 1.19 @@ -460,6 +460,7 @@ extern void _sysio_do_illop(void); extern int _sysio_do_ebadf(void); extern int _sysio_do_einval(void); extern int _sysio_do_enoent(void); +extern int _sysio_do_enodev(void); extern int _sysio_do_espipe(void); extern int _sysio_do_eisdir(void); extern int _sysio_do_enosys(void); |
|
From: Sonja T. <so...@us...> - 2004-07-21 21:22:33
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv514/src Modified Files: inode.c Log Message: Fixing bugs to do with device files. Now, you cant open devices that do not have an associated driver. Also, you can now do an fstat() on a device Index: inode.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- inode.c 3 Jul 2004 05:47:13 -0000 1.17 +++ inode.c 21 Jul 2004 21:22:24 -0000 1.18 @@ -957,3 +957,14 @@ _sysio_do_enosys() return -ENOSYS; } + + +/* + * Return -ENODEV + */ +int +_sysio_do_enodev() +{ + + return -ENODEV; +} |
|
From: Sonja T. <so...@us...> - 2004-07-21 21:22:32
|
Update of /cvsroot/libsysio/libsysio/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv514/misc Modified Files: init-env.sh Log Message: Fixing bugs to do with device files. Now, you cant open devices that do not have an associated driver. Also, you can now do an fstat() on a device Index: init-env.sh =================================================================== RCS file: /cvsroot/libsysio/libsysio/misc/init-env.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- init-env.sh 24 Jun 2004 19:58:28 -0000 1.5 +++ init-env.sh 21 Jul 2004 21:22:24 -0000 1.6 @@ -24,6 +24,9 @@ fi export SYSIO_NAMESPACE="\ {mnt, dev=\"native:/\",dir=/,fl=${_root_flags:-0}} \ {mnt, dev=\"incore:0755+0+0\",dir=\"/dev\"} \ + {mnt, dev=\"incore:0755+0+0\",dir=\"/mnt\",fl=2} + {creat, ft=dir,nm=\"/mnt/dev\",pm=04755,ow=0,gr=0} \ + {mnt, dev=\"native:/dev\",dir=\"/mnt/dev\"} \ {creat, ft=chr,nm=\"/dev/stdin\",pm=0400,mm=0+0} \ {creat, ft=chr,nm=\"/dev/stdout\",pm=0200,mm=0+1} \ {creat, ft=chr,nm=\"/dev/stderr\",pm=0200,mm=0+2} \ |
|
From: Sonja T. <so...@us...> - 2004-07-21 21:22:32
|
Update of /cvsroot/libsysio/libsysio/drivers/native In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv514/drivers/native Modified Files: fs_native.c Log Message: Fixing bugs to do with device files. Now, you cant open devices that do not have an associated driver. Also, you can now do an fstat() on a device Index: fs_native.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -w -b -B -p -r1.40 -r1.41 --- fs_native.c 16 Jul 2004 20:10:07 -0000 1.40 +++ fs_native.c 21 Jul 2004 21:22:23 -0000 1.41 @@ -210,6 +210,7 @@ struct native_inode { int ni_oflags; /* flags, from open */ unsigned ni_nopens; /* soft ref count */ _SYSIO_OFF_T ni_fpos; /* current pos */ + struct __native_stat *ni_stat; /* cached copy of the stat */ }; /* @@ -328,15 +329,14 @@ static struct mount *native_internal_mou * stat -- by path. */ static int -native_stat(const char *path, struct intnl_stat *buf) +native_stat(const char *path, struct intnl_stat *buf, struct __native_stat *stbuf) { int err; - struct __native_stat stbuf; - err = syscall(__SYS_STAT, path, &stbuf); + err = syscall(__SYS_STAT, path, stbuf); if (err) err = -errno; - COPY_STAT(&stbuf, buf); + COPY_STAT(stbuf, buf); return err; } @@ -345,15 +345,14 @@ native_stat(const char *path, struct int * stat -- by fildes */ static int -native_fstat(int fd, struct intnl_stat *buf) +native_fstat(int fd, struct intnl_stat *buf, struct __native_stat *stbuf) { int err; - struct __native_stat stbuf; - err = syscall(__SYS_FSTAT, fd, &stbuf); + err = syscall(__SYS_FSTAT, fd, stbuf); if (err) err = -errno; - COPY_STAT(&stbuf, buf); + COPY_STAT(stbuf, buf); return err; } @@ -382,6 +381,7 @@ native_i_new(struct filesys *fs, struct nino->ni_oflags = 0; nino->ni_nopens = 0; nino->ni_fpos = 0; + nino->ni_stat = NULL; ino = _sysio_i_new(fs, &nino->ni_fileid, @@ -390,7 +390,7 @@ native_i_new(struct filesys *fs, struct #else buf->st_mode, /* all of the bits! */ #endif - 0, + buf->st_rdev, 0, &native_i_ops, nino); @@ -429,6 +429,8 @@ create_internal_namespace() static struct qstr noname = { NULL, 0, 0 }; struct filesys *fs; struct intnl_stat stbuf; + struct __native_stat *ni_stat; + if (native_internal_mount) { /* @@ -437,6 +439,8 @@ create_internal_namespace() abort(); } + ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); + /* * We maintain an artificial, internal, name space in order to * have access to fully qualified path names in the various routines. @@ -454,7 +458,7 @@ create_internal_namespace() /* * Get root i-node. */ - err = native_stat("/", &stbuf); + err = native_stat("/", &stbuf, ni_stat); if (err) goto error; rootino = native_i_new(fs, &stbuf); @@ -462,6 +466,7 @@ create_internal_namespace() err = -ENOMEM; goto error; } + I2NI(rootino)->ni_stat = ni_stat; /* * Generate base path-node for root. @@ -593,11 +598,14 @@ native_iget(struct filesys *fs, struct intnl_stat stbuf; struct native_inode_identifier ident; struct file_identifier fileid; + struct __native_stat *ni_stat; + + ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); /* * Get file status. */ - err = native_stat(path, &stbuf); + err = native_stat(path, &stbuf, ni_stat); if (err) { *inop = NULL; return err; @@ -653,6 +661,7 @@ native_iget(struct filesys *fs, out: if (!err) *inop = ino; + I2NI(ino)->ni_stat = ni_stat; return err; } @@ -714,19 +723,31 @@ native_inop_getattr(struct pnode *pno, s { char *path; int err; + struct __native_stat *ni_stat; path = NULL; + ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); if (!ino || I2NI(ino)->ni_fd < 0) { + if (pno) path = _sysio_pb_path(pno->p_base, '/'); + else if (ino) { + COPY_STAT(I2NI(ino)->ni_stat, stbuf); + return 0; + } if (!path) return -ENOMEM; + /* if no pno, copy stat and return success */ } err = path - ? native_stat(path, stbuf) - : native_fstat(I2NI(ino)->ni_fd, stbuf); + ? native_stat(path, stbuf, ni_stat) + : native_fstat(I2NI(ino)->ni_fd, stbuf, ni_stat); if (path) free(path); + + /* Cache a copy of the stat */ + I2NI(ino)->ni_stat = ni_stat; + return err; } @@ -739,6 +760,7 @@ native_inop_setattr(struct pnode *pno, char *path; int fd; struct intnl_stat st; + struct __native_stat *ni_stat; int err; path = NULL; @@ -754,10 +776,14 @@ native_inop_setattr(struct pnode *pno, /* * Get current status for undo. */ + ni_stat = (struct __native_stat *)malloc(sizeof(struct __native_stat)); err = fd < 0 - ? native_stat(path, &st) - : native_fstat(fd, &st); + ? native_stat(path, &st, ni_stat) + : native_fstat(fd, &st, ni_stat); + if (ino) + I2NI(ino)->ni_stat = ni_stat; + if (err) goto out; @@ -1711,6 +1737,10 @@ native_inop_gone(struct inode *ino) if (nino->ni_fd >= 0) (void )syscall(SYS_close, nino->ni_fd); + + if (nino->ni_stat) + free(nino->ni_stat); + free(ino->i_private); } |
|
From: Lee W. <lw...@us...> - 2004-07-21 00:45:53
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11301 Modified Files: fcntl.c Log Message: Hmm. I don't know how to use the RETURN macro. Back to the way it was checked in originally. Thanks Ruth. Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- fcntl.c 20 Jul 2004 22:50:44 -0000 1.15 +++ fcntl.c 21 Jul 2004 00:45:44 -0000 1.16 @@ -133,7 +133,7 @@ SYSIO_INTERFACE_NAME(fcntl)(int fd, int } out: - SYSIO_INTERFACE_RETURN((err < 0) ? -1 : err, err); + SYSIO_INTERFACE_RETURN((err < 0) ? -1 : err, (err < 0) ? err : 0); } #ifdef __GLIBC__ |
|
From: Lee W. <lw...@us...> - 2004-07-20 22:50:53
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22448 Modified Files: fcntl.c Log Message: Trivially unnecessary to trouble ourselves with passing the return macro a zero errno when no error is indicated. Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- fcntl.c 20 Jul 2004 22:41:52 -0000 1.14 +++ fcntl.c 20 Jul 2004 22:50:44 -0000 1.15 @@ -133,7 +133,7 @@ SYSIO_INTERFACE_NAME(fcntl)(int fd, int } out: - SYSIO_INTERFACE_RETURN((err < 0) ? -1 : err, (err < 0) ? err : 0); + SYSIO_INTERFACE_RETURN((err < 0) ? -1 : err, err); } #ifdef __GLIBC__ |
|
From: Ruth K. <rk...@us...> - 2004-07-20 22:42:01
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20719 Modified Files: fcntl.c Log Message: fcntl may have a non-zero return Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- fcntl.c 3 Jul 2004 05:47:13 -0000 1.13 +++ fcntl.c 20 Jul 2004 22:41:52 -0000 1.14 @@ -133,7 +133,7 @@ SYSIO_INTERFACE_NAME(fcntl)(int fd, int } out: - SYSIO_INTERFACE_RETURN(err ? -1 : 0, err); + SYSIO_INTERFACE_RETURN((err < 0) ? -1 : err, (err < 0) ? err : 0); } #ifdef __GLIBC__ |
|
From: MeiJia <me...@us...> - 2004-07-18 15:57:54
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11273/src Modified Files: stdlib.c Log Message: lustre hack code only: disable scandir interception. Index: stdlib.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stdlib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- stdlib.c 3 Jul 2004 05:47:13 -0000 1.3 +++ stdlib.c 18 Jul 2004 15:57:45 -0000 1.4 @@ -216,6 +216,7 @@ void rewinddir(DIR *dir) dir->effective = 0; } +#if 0 int scandir(const char *dir, struct dirent ***namelist, int(*select)(const struct dirent *), int(*compar)(const void *, const void *)) @@ -231,6 +232,7 @@ int scandir64(const char *dir, struct di errno = ENOSYS; return -1; } +#endif /*********************************************************** * FIXME workaround for linux only * |
|
From: Ruth K. <rk...@us...> - 2004-07-16 20:10:16
|
Update of /cvsroot/libsysio/libsysio/drivers/native In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25589 Modified Files: fs_native.c Log Message: native_inop_fcntl missing breaks in switch Index: fs_native.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -w -b -B -p -r1.39 -r1.40 --- fs_native.c 3 Jul 2004 05:47:12 -0000 1.39 +++ fs_native.c 16 Jul 2004 20:10:07 -0000 1.40 @@ -1582,6 +1582,7 @@ native_inop_fcntl(struct inode *ino, err = syscall(SYS_fcntl, nino->ni_fd, cmd); if (err < 0) err = -errno; + break; case F_DUPFD: case F_SETFD: case F_SETFL: @@ -1593,6 +1594,7 @@ native_inop_fcntl(struct inode *ino, err = syscall(SYS_fcntl, nino->ni_fd, cmd, arg); if (err) err = -errno; + break; default: err = -EINVAL; } |
|
From: Lee W. <lw...@us...> - 2004-07-16 13:34:52
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11534 Modified Files: Makefile.am Log Message: From Eric Mei: with the current head of libsysio, flag OPTIONAL_LUSTRE_SRCDIR_SRCS actually resulting the src/stdlib.o was linked twice into final library. Could we simply remove this as the attached patch? Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- Makefile.am 3 Jul 2004 05:47:12 -0000 1.14 +++ Makefile.am 16 Jul 2004 13:34:43 -0000 1.15 @@ -48,18 +48,14 @@ OPTIONAL_YOD_SRCS = endif if WITH_LUSTRE_HACK -OPTIONAL_LUSTRE_SRCDIR_SRCS = $(LUSTRE_SRCDIR_SRCS) # it would be better that let configure script check this OPTIONAL_LUSTRE_CFLAGS = -fPIC -else -OPTIONAL_LUSTRE_SRCDIR_SRCS = endif AM_CFLAGS = $(OPTIONAL_LUSTRE_CFLAGS) __LIBBUILD_DIR__libsysio_a_SOURCES = \ $(SRCDIR_SRCS) \ - $(OPTIONAL_LUSTRE_SRCDIR_SRCS) \ $(OPTIONAL_STDFD_SRCS) \ $(OPTIONAL_INCORE_SRCS) \ $(OPTIONAL_SOCKETS_SRCS) \ |
|
From: Ruth K. <rk...@us...> - 2004-07-15 20:27:13
|
Update of /cvsroot/libsysio/libsysio/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17118 Modified Files: test_getcwd.pl test_path.pl Log Message: alpha compatability changes Index: test_getcwd.pl =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_getcwd.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- test_getcwd.pl 12 Mar 2004 21:18:18 -0000 1.6 +++ test_getcwd.pl 15 Jul 2004 20:27:02 -0000 1.7 @@ -6,7 +6,7 @@ use strict; use FindBin; use lib "$FindBin::Bin"; use helper; -use Fcntl ':mode'; +use Fcntl; sub usage Index: test_path.pl =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_path.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- test_path.pl 12 Mar 2004 20:42:41 -0000 1.5 +++ test_path.pl 15 Jul 2004 20:27:02 -0000 1.6 @@ -12,7 +12,7 @@ use FindBin; use lib "$FindBin::Bin"; use helper; use POSIX; -use Fcntl ':mode'; +use Fcntl; sub usage { |
|
From: Ruth K. <rk...@us...> - 2004-07-15 20:17:56
|
Update of /cvsroot/libsysio/libsysio/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15603 Modified Files: test_path.c Log Message: pick up S_ISLNK def on alpha Index: test_path.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_path.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- test_path.c 3 Jul 2004 05:47:13 -0000 1.9 +++ test_path.c 15 Jul 2004 20:17:38 -0000 1.10 @@ -41,6 +41,8 @@ * le...@sa... */ +#define _BSD_SOURCE + #include <stdio.h> #include <stdlib.h> #include <string.h> |
|
From: Lee W. <lw...@us...> - 2004-07-12 22:52:00
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3641/src Modified Files: ioctx.c Log Message: From Ruth; If, for list IO via {read,write}x an iovec entry was larger or same than a matched xtvec then _sysio_enumerate_extents would go one entry too far. We had forgotten to decrement the vector length in this case. Fixed. By inspection; When trying to satisfy an xtvec, we could deref a bad/invalid ptr. Fixed. Some cleanup to do with spacing and braces -- style stuff. Index: ioctx.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctx.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- ioctx.c 3 Jul 2004 05:47:13 -0000 1.17 +++ ioctx.c 12 Jul 2004 22:51:51 -0000 1.18 @@ -385,9 +385,8 @@ _sysio_enumerate_extents(const struct in while (xtvec.xtv_len) { if (iovec.iov_len) { tmp = iovec.iov_len; - if (iovec.iov_len > xtvec.xtv_len) { + if (iovec.iov_len > xtvec.xtv_len) iovec.iov_len = xtvec.xtv_len; - } cc = (*f)(&iovec, 1, xtvec.xtv_off, @@ -404,7 +403,7 @@ _sysio_enumerate_extents(const struct in if (acc && tmp <= acc) abort(); /* paranoia */ acc = tmp; - } else { + } else if (iovlen) { start = iov; n = xtvec.xtv_len; do { @@ -419,18 +418,14 @@ _sysio_enumerate_extents(const struct in } while (--iovlen); if (iov == start) { iovec = *iov++; -#if 0 - if (iovec.iov_len > n) { - iovec.iov_len = n; - } -#endif + iovlen--; continue; } remain = xtvec.xtv_len - n; cc = (*f)(start, iov - start, xtvec.xtv_off, - xtvec.xtv_len - n, + remain, arg); if (cc <= 0) { if (acc) @@ -443,13 +438,11 @@ _sysio_enumerate_extents(const struct in abort(); /* paranoia */ acc = tmp; - if (remain && !iovlen) - return acc; - remain -= cc; if (remain) return acc; /* short */ - } + } else + return acc; /* short out */ xtvec.xtv_off += cc; xtvec.xtv_len -= cc; } |
|
From: Lee W. <lw...@us...> - 2004-07-07 23:16:37
|
Update of /cvsroot/libsysio/libsysio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6365 Modified Files: xtio.h Log Message: Bob Glossman at Cray discovered that the symbol to protect us from problems caused by redundant/recursive inclusion of this file was not ever defined. It is now. Then, that symbol was called _RSIO_H_. This is legacy from development and is changed to reflect the actual, final, file name; _XTIO_H_. Index: xtio.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/xtio.h,v retrieving revision 2.0 retrieving revision 2.1 diff -u -w -b -B -p -r2.0 -r2.1 --- xtio.h 3 Jul 2004 05:46:46 -0000 2.0 +++ xtio.h 7 Jul 2004 23:16:28 -0000 2.1 @@ -46,7 +46,8 @@ * and the other current SUNMos/Puma/Cougar/Catamount systems. */ -#ifndef _RSIO_H_ +#ifndef _XTIO_H_ +#define _XTIO_H_ #ifndef _IOID_T_DEFINED #define _IOID_T_DEFINED @@ -324,4 +325,4 @@ extern ssize_t write64x(int fd, const struct xtvec64 *xtv, size_t xtv_count); #endif -#endif /* ! __RSIO_H_ */ +#endif /* ! _XTIO_H_ */ |
|
From: Lee W. <le...@sa...> - 2004-07-07 20:51:39
|
All, I didn't make it very clear in my checkin message that this new file must be included before any of the internals includes. That is so, though, and I apologize for the confusion. --Lee |
|
From: Lee W. <lw...@us...> - 2004-07-06 14:01:13
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12024 Modified Files: Rules.make Log Message: From Kevin Pedretti; Previous change broke builds with --with-lustre-hack. Changed the X/Open source define to 600 from 500 in order to get definitions of F_GETOWN and F_SETOWN in fcntl.c Index: Rules.make =================================================================== RCS file: /cvsroot/libsysio/libsysio/Rules.make,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- Rules.make 3 Jul 2004 05:47:12 -0000 1.7 +++ Rules.make 6 Jul 2004 14:01:03 -0000 1.8 @@ -14,6 +14,6 @@ endif DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS) AM_CPPFLAGS = \ - -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 \ + -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=600 \ $(AUTOMOUNT) $(ZERO_SUM_MEMORY) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \ -I$(top_srcdir)/include |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:52:16
|
Update of /cvsroot/libsysio/libsysio/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11652 Modified Files: startup.c Log Message: Nope. Changed it to mount native file system root unless SYSIO_MANUAL is set in the environment. We just don't have the manual thing around in the tests anymore. Index: startup.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/startup.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- startup.c 3 Jul 2004 05:47:13 -0000 1.4 +++ startup.c 3 Jul 2004 05:52:07 -0000 1.5 @@ -24,13 +24,13 @@ _test_sysio_startup() s = getenv("SYSIO_NAMESPACE"); if (s) return _sysio_boot(s); - s = getenv("SYSIO_NATIVE"); + s = getenv("SYSIO_MANUAL"); if (s) - return _sysio_boot("{mnt,dev=\"native:/\",dir=/,fl=0}"); + return 0; /* - * Compatibility with the older tests: They did it all themselves. + * Assume a native mount at root. */ - return 0; + return _sysio_boot("{mnt,dev=\"native:/\",dir=/,fl=0}"); } void |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:24
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/src Modified Files: access.c chdir.c chmod.c chown.c dev.c dup.c fcntl.c file.c file_hack.c fs.c fsync.c getdirentries.c init.c inode.c ioctl.c ioctx.c iowait.c link.c lseek.c mkdir.c mknod.c mount.c namei.c open.c readlink.c rename.c rmdir.c rw.c stat.c stat64.c statvfs.c statvfs64.c stdlib.c symlink.c truncate.c unlink.c utime.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: access.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/access.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- access.c 30 Apr 2004 19:24:46 -0000 1.6 +++ access.c 3 Jul 2004 05:47:13 -0000 1.7 @@ -43,12 +43,14 @@ #include <stdlib.h> #include <errno.h> +#include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> +#include <sys/queue.h> -#include "sysio-symbols.h" +#include "xtio.h" #include "sysio.h" +#include "sysio-symbols.h" int SYSIO_INTERFACE_NAME(access)(const char *path, int amode) Index: chdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- chdir.c 30 Apr 2004 19:24:46 -0000 1.17 +++ chdir.c 3 Jul 2004 05:47:13 -0000 1.18 @@ -73,6 +73,7 @@ #include <assert.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "mount.h" Index: chmod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chmod.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- chmod.c 30 Apr 2004 19:24:46 -0000 1.12 +++ chmod.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -49,6 +49,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: chown.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chown.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- chown.c 30 Apr 2004 19:24:46 -0000 1.11 +++ chown.c 3 Jul 2004 05:47:13 -0000 1.12 @@ -49,6 +49,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: dev.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/dev.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- dev.c 16 Apr 2004 20:38:34 -0000 1.7 +++ dev.c 3 Jul 2004 05:47:13 -0000 1.8 @@ -48,6 +48,7 @@ #include <sys/stat.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "dev.h" Index: dup.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/dup.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -b -B -p -r1.8 -r1.9 --- dup.c 30 Apr 2004 19:24:46 -0000 1.8 +++ dup.c 3 Jul 2004 05:47:13 -0000 1.9 @@ -46,6 +46,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "file.h" #include "sysio-symbols.h" Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- fcntl.c 20 May 2004 19:31:48 -0000 1.12 +++ fcntl.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -47,6 +47,7 @@ #include <fcntl.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: file.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/file.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- file.c 28 Apr 2004 12:23:19 -0000 1.11 +++ file.c 3 Jul 2004 05:47:13 -0000 1.12 @@ -47,10 +47,10 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "file.h" #include "inode.h" -#include "xtio.h" /* * Support for file IO. Index: file_hack.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/file_hack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- file_hack.c 25 May 2004 05:56:58 -0000 1.2 +++ file_hack.c 3 Jul 2004 05:47:13 -0000 1.3 @@ -48,10 +48,10 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "file.h" #include "inode.h" -#include "xtio.h" /* * Support for file IO. Index: fs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fs.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- fs.c 28 Apr 2004 11:21:30 -0000 1.11 +++ fs.c 3 Jul 2004 05:47:13 -0000 1.12 @@ -48,6 +48,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "inode.h" Index: fsync.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fsync.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- fsync.c 28 Apr 2004 11:21:30 -0000 1.5 +++ fsync.c 3 Jul 2004 05:47:13 -0000 1.6 @@ -46,6 +46,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "file.h" #include "inode.h" Index: getdirentries.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- getdirentries.c 25 May 2004 17:53:43 -0000 1.15 +++ getdirentries.c 3 Jul 2004 05:47:13 -0000 1.16 @@ -75,6 +75,7 @@ #include <dirent.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: init.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/init.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- init.c 24 Jun 2004 19:58:28 -0000 1.10 +++ init.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -51,19 +51,17 @@ #include <assert.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/queue.h> -#include <sys/uio.h> - -#include <sys/stat.h> #include <fcntl.h> +#include <sys/uio.h> +#include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" #include "mount.h" #include "file.h" #include "dev.h" -#include "xtio.h" #ifdef STDFD_DEV #include "stdfd.h" Index: inode.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -b -B -p -r1.16 -r1.17 --- inode.c 20 Apr 2004 07:20:19 -0000 1.16 +++ inode.c 3 Jul 2004 05:47:13 -0000 1.17 @@ -45,10 +45,11 @@ #include <string.h> #include <errno.h> #include <assert.h> -#include <sys/queue.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "mount.h" Index: ioctl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctl.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- ioctl.c 30 Apr 2004 19:24:46 -0000 1.9 +++ ioctl.c 3 Jul 2004 05:47:13 -0000 1.10 @@ -46,6 +46,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: ioctx.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctx.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -b -B -p -r1.16 -r1.17 --- ioctx.c 24 Jun 2004 19:53:31 -0000 1.16 +++ ioctx.c 3 Jul 2004 05:47:13 -0000 1.17 @@ -45,13 +45,13 @@ #include <string.h> #include <errno.h> #include <assert.h> -#include <sys/types.h> #include <sys/uio.h> +#include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" -#include "xtio.h" #if defined(REDSTORM) Index: iowait.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/iowait.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- iowait.c 28 Apr 2004 11:21:30 -0000 1.7 +++ iowait.c 3 Jul 2004 05:47:13 -0000 1.8 @@ -45,6 +45,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" Index: link.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/link.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -b -B -p -r1.8 -r1.9 --- link.c 30 Apr 2004 19:24:46 -0000 1.8 +++ link.c 3 Jul 2004 05:47:13 -0000 1.9 @@ -49,6 +49,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "mount.h" #include "inode.h" Index: lseek.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -w -b -B -p -r1.21 -r1.22 --- lseek.c 24 Jun 2004 12:32:50 -0000 1.21 +++ lseek.c 3 Jul 2004 05:47:13 -0000 1.22 @@ -48,6 +48,7 @@ #include <sys/stat.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: mkdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mkdir.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- mkdir.c 30 Apr 2004 19:24:46 -0000 1.11 +++ mkdir.c 3 Jul 2004 05:47:13 -0000 1.12 @@ -47,6 +47,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" Index: mknod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mknod.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- mknod.c 30 Apr 2004 19:24:46 -0000 1.13 +++ mknod.c 3 Jul 2004 05:47:13 -0000 1.14 @@ -52,6 +52,7 @@ #include <sys/stat.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" Index: mount.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mount.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- mount.c 28 May 2004 12:48:26 -0000 1.14 +++ mount.c 3 Jul 2004 05:47:13 -0000 1.15 @@ -53,13 +53,11 @@ #endif #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "mount.h" #include "inode.h" -#ifdef AUTOMOUNT_FILE_NAME -#include "xtio.h" -#endif /* * File system and volume mount support. Index: namei.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/namei.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- namei.c 5 Mar 2004 13:07:19 -0000 1.12 +++ namei.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -50,10 +50,11 @@ #include <errno.h> #include <assert.h> #include <sys/param.h> -#include <sys/queue.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "mount.h" #include "inode.h" Index: open.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/open.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -w -b -B -p -r1.20 -r1.21 --- open.c 20 May 2004 19:31:48 -0000 1.20 +++ open.c 3 Jul 2004 05:47:13 -0000 1.21 @@ -55,6 +55,7 @@ #include <fcntl.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" @@ -62,8 +63,6 @@ #include "mount.h" #include "sysio-symbols.h" -#include "sysio-symbols.h" - /* * Open file support. */ Index: readlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/readlink.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -b -B -p -r1.1 -r1.2 --- readlink.c 28 May 2004 11:52:27 -0000 1.1 +++ readlink.c 3 Jul 2004 05:47:13 -0000 1.2 @@ -47,6 +47,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "sysio-symbols.h" Index: rename.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rename.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- rename.c 28 Apr 2004 11:21:46 -0000 1.5 +++ rename.c 3 Jul 2004 05:47:13 -0000 1.6 @@ -50,6 +50,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "mount.h" #include "inode.h" Index: rmdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rmdir.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- rmdir.c 30 Apr 2004 19:24:46 -0000 1.13 +++ rmdir.c 3 Jul 2004 05:47:13 -0000 1.14 @@ -47,6 +47,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" Index: rw.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rw.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- rw.c 4 Jun 2004 14:05:38 -0000 1.10 +++ rw.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -50,10 +50,10 @@ #include <sys/uio.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "file.h" #include "inode.h" -#include "xtio.h" #include "sysio-symbols.h" Index: stat.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- stat.c 30 Apr 2004 19:24:46 -0000 1.14 +++ stat.c 3 Jul 2004 05:47:13 -0000 1.15 @@ -48,6 +48,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: stat64.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- stat64.c 30 Apr 2004 19:24:46 -0000 1.10 +++ stat64.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -50,6 +50,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: statvfs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/statvfs.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- statvfs.c 30 Apr 2004 19:24:46 -0000 1.10 +++ statvfs.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -50,6 +50,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: statvfs64.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/statvfs64.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- statvfs64.c 30 Apr 2004 19:24:46 -0000 1.12 +++ statvfs64.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -49,6 +49,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: stdlib.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stdlib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- stdlib.c 20 May 2004 19:31:48 -0000 1.2 +++ stdlib.c 3 Jul 2004 05:47:13 -0000 1.3 @@ -35,6 +35,7 @@ #include <fcntl.h> #include <dirent.h> +#include "xtio.h" #include <sysio.h> #include "sysio-symbols.h" Index: symlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/symlink.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- symlink.c 30 Apr 2004 19:24:46 -0000 1.9 +++ symlink.c 3 Jul 2004 05:47:13 -0000 1.10 @@ -47,6 +47,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" Index: truncate.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- truncate.c 30 Apr 2004 19:24:46 -0000 1.10 +++ truncate.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -49,6 +49,7 @@ #include <sys/stat.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" Index: unlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- unlink.c 30 Apr 2004 19:24:46 -0000 1.12 +++ unlink.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -47,6 +47,7 @@ #include <sys/types.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "fs.h" Index: utime.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/utime.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- utime.c 28 Apr 2004 11:21:46 -0000 1.4 +++ utime.c 3 Jul 2004 05:47:13 -0000 1.5 @@ -51,6 +51,7 @@ #include <unistd.h> #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "inode.h" #include "file.h" |
Update of /cvsroot/libsysio/libsysio/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/tests Modified Files: startup.c sysio_stubs.c sysio_tests.c test.h test_copy.c test_driver.c test_getcwd.c test_link.c test_list.c test_path.c test_regions.c test_rename.c test_stats.c test_unlink.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: startup.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/startup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- startup.c 30 Jun 2004 13:40:43 -0000 1.3 +++ startup.c 3 Jul 2004 05:47:13 -0000 1.4 @@ -4,10 +4,11 @@ #include <sys/types.h> #include <sys/queue.h> -#include "sysio.h" - +#include "xtio.h" #include "test.h" +#include "sysio.h" + int _test_sysio_startup() { @@ -31,3 +32,10 @@ _test_sysio_startup() */ return 0; } + +void +_test_sysio_shutdown() +{ + + _sysio_shutdown(); +} Index: sysio_stubs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/sysio_stubs.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -b -B -p -r1.12 -r1.13 --- sysio_stubs.c 12 Mar 2004 20:42:41 -0000 1.12 +++ sysio_stubs.c 3 Jul 2004 05:47:13 -0000 1.13 @@ -10,10 +10,11 @@ #include <sys/mount.h> #include <sys/stat.h> #include <sys/statvfs.h> +#include <sys/queue.h> -#include "test_driver.h" -#include "sysio.h" #include "xtio.h" +#include "sysio.h" +#include "test_driver.h" /* * ################################################ Index: sysio_tests.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/sysio_tests.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- sysio_tests.c 14 Apr 2004 18:46:25 -0000 1.9 +++ sysio_tests.c 3 Jul 2004 05:47:13 -0000 1.10 @@ -11,9 +11,11 @@ #include <sys/statvfs.h> #include <fcntl.h> #include <sys/queue.h> +#include <unistd.h> #include <dirent.h> +#include <sys/mount.h> -#include "sysio.h" +#include "xtio.h" #include "mount.h" #include "test.h" #include "test_driver.h" Index: test.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- test.h 14 Feb 2004 19:43:00 -0000 1.2 +++ test.h 3 Jul 2004 05:47:13 -0000 1.3 @@ -44,3 +44,5 @@ extern int (*drvinits[])(void); extern int drv_init_all(void); +extern int _test_sysio_startup(void); +extern void _test_sysio_shutdown(void); Index: test_copy.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_copy.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- test_copy.c 14 Feb 2004 19:43:00 -0000 1.9 +++ test_copy.c 3 Jul 2004 05:47:13 -0000 1.10 @@ -46,20 +46,14 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifndef REDSTORM -#include <getopt.h> -#endif #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <sys/uio.h> #include <sys/queue.h> -#include "sysio.h" -#include "mount.h" - -#include "fs_native.h" - +#include "xtio.h" #include "test.h" /* @@ -81,7 +75,6 @@ main(int argc, char * const argv[]) int i; int err; const char *spath, *dpath; - extern int _test_sysio_startup(void); /* * Parse command-line args. @@ -123,7 +116,7 @@ main(int argc, char * const argv[]) err = copy_file(spath, dpath); - _sysio_shutdown(); + _test_sysio_shutdown(); return err; } Index: test_driver.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_driver.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- test_driver.c 29 Jun 2004 18:49:41 -0000 1.10 +++ test_driver.c 3 Jul 2004 05:47:13 -0000 1.11 @@ -1,5 +1,9 @@ +#ifndef _BSD_SOURCE #define _BSD_SOURCE -#define _XOPEN_SOURCE 600 +#endif +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif #include <stdio.h> #include <stdlib.h> @@ -11,12 +15,13 @@ #include <sys/uio.h> #include <sys/statvfs.h> #include <fcntl.h> -#include <sys/queue.h> #include <dirent.h> #include <unistd.h> #include <ctype.h> +#include <sys/uio.h> +#include <sys/queue.h> -#include "sysio.h" +#include "xtio.h" #include "mount.h" #include "test.h" #include "test_driver.h" Index: test_getcwd.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_getcwd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- test_getcwd.c 14 Feb 2004 19:43:00 -0000 1.4 +++ test_getcwd.c 3 Jul 2004 05:47:13 -0000 1.5 @@ -44,19 +44,16 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef REDSTORM -#include <getopt.h> -#else #include <unistd.h> -#endif #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <sys/uio.h> #include <sys/queue.h> #include <dirent.h> -#include "sysio.h" +#include "xtio.h" #include "mount.h" #include "test.h" @@ -137,7 +134,7 @@ main(int argc, char *const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return 0; } Index: test_link.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_link.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- test_link.c 14 Feb 2004 19:43:00 -0000 1.2 +++ test_link.c 3 Jul 2004 05:47:13 -0000 1.3 @@ -44,21 +44,17 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef REDSTORM -#include <getopt.h> -#endif #include <unistd.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/queue.h> #if 0 #include <dirent.h> #endif +#include <sys/uio.h> +#include <sys/queue.h> -#include "sysio.h" -#include "mount.h" - +#include "xtio.h" #include "test.h" /* @@ -123,7 +119,7 @@ main(int argc, char *const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return err ? -1 : 0; } Index: test_list.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_list.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -b -B -p -r1.8 -r1.9 --- test_list.c 24 Feb 2004 14:58:26 -0000 1.8 +++ test_list.c 3 Jul 2004 05:47:13 -0000 1.9 @@ -41,24 +41,21 @@ * le...@sa... */ +#define _BSD_SOURCE + #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef REDSTORM -#include <getopt.h> -#else #include <unistd.h> -#endif #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/queue.h> #include <dirent.h> +#include <sys/uio.h> +#include <sys/queue.h> -#include "sysio.h" -#include "mount.h" - +#include "xtio.h" #include "test.h" /* @@ -138,7 +135,7 @@ main(int argc, char *const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return 0; } Index: test_path.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_path.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -b -B -p -r1.8 -r1.9 --- test_path.c 28 May 2004 11:51:53 -0000 1.8 +++ test_path.c 3 Jul 2004 05:47:13 -0000 1.9 @@ -44,21 +44,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef REDSTORM -#include <getopt.h> -#else -#include <unistd.h> -#endif #include <errno.h> - -#include <assert.h> -#include <sys/queue.h> #include <sys/types.h> #include <sys/stat.h> +#include <unistd.h> +#include <sys/uio.h> -#include "sysio.h" -#include "mount.h" - +#include "xtio.h" #include "test.h" /* @@ -138,7 +130,7 @@ main(int argc, char *const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return 0; } Index: test_regions.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_regions.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- test_regions.c 17 May 2004 14:03:37 -0000 1.4 +++ test_regions.c 3 Jul 2004 05:47:13 -0000 1.5 @@ -58,19 +58,14 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifndef REDSTORM -#include <getopt.h> -#endif #include <limits.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/queue.h> - -#include "sysio.h" -#include "mount.h" +#include <sys/uio.h> +#include "xtio.h" #include "test.h" /* @@ -278,7 +273,7 @@ error: perror(path); free(buf); out: - _sysio_shutdown(); + _test_sysio_shutdown(); return err; } Index: test_rename.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_rename.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -b -B -p -r1.4 -r1.5 --- test_rename.c 14 Feb 2004 19:43:00 -0000 1.4 +++ test_rename.c 3 Jul 2004 05:47:13 -0000 1.5 @@ -46,20 +46,13 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifndef REDSTORM -#include <getopt.h> -#endif #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/queue.h> - -#include "sysio.h" -#include "mount.h" - -#include "fs_native.h" +#include <sys/uio.h> +#include "xtio.h" #include "test.h" /* @@ -121,7 +114,7 @@ main(int argc, char * const argv[]) if (err) perror("rename"); - _sysio_shutdown(); + _test_sysio_shutdown(); return err; } Index: test_stats.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_stats.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- test_stats.c 14 Feb 2004 19:43:00 -0000 1.6 +++ test_stats.c 3 Jul 2004 05:47:13 -0000 1.7 @@ -46,21 +46,16 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifndef REDSTORM -#include <getopt.h> -#endif #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/queue.h> #ifdef notdef #include <sys/statvfs.h> #endif +#include <sys/uio.h> -#include "sysio.h" -#include "mount.h" - +#include "xtio.h" #include "test.h" /* @@ -104,7 +99,7 @@ main(int argc, char * const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return 0; } Index: test_unlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/tests/test_unlink.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- test_unlink.c 14 Feb 2004 19:43:00 -0000 1.3 +++ test_unlink.c 3 Jul 2004 05:47:13 -0000 1.4 @@ -44,21 +44,15 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifndef REDSTORM -#include <getopt.h> -#else #include <unistd.h> -#endif #include <errno.h> #include <sys/types.h> -#include <sys/queue.h> #if 0 #include <dirent.h> #endif +#include <sys/uio.h> -#include "sysio.h" -#include "mount.h" - +#include "xtio.h" #include "test.h" /* @@ -138,7 +132,7 @@ main(int argc, char *const argv[]) /* * Clean up. */ - _sysio_shutdown(); + _test_sysio_shutdown(); return 0; } |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:21
|
Update of /cvsroot/libsysio/libsysio/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/include Modified Files: sysio.h Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: sysio.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -w -b -B -p -r1.25 -r1.26 --- sysio.h 24 Jun 2004 19:53:31 -0000 1.25 +++ sysio.h 3 Jul 2004 05:47:13 -0000 1.26 @@ -48,18 +48,6 @@ #include <limits.h> #include <stdarg.h> -#ifndef _IOID_T_DEFINED -#define _IOID_T_DEFINED -/* - * FIXME: - * - * This section about ioid_t and it's failure belong in <sys/types.h> - */ -typedef void *ioid_t; - -#define IOID_FAIL 0 -#endif - #if !defined(__IS_UNUSED) && defined(__GNUC__) #define __IS_UNUSED __attribute__ ((unused)) #else @@ -259,71 +247,6 @@ extern int SYSIO_INTERFACE_NAME(rename)( extern int SYSIO_INTERFACE_NAME(fdatasync)(int fd); extern int SYSIO_INTERFACE_NAME(ioctl)(int fd, unsigned long request, ...); extern mode_t SYSIO_INTERFACE_NAME(umask)(mode_t mask); -extern int SYSIO_INTERFACE_NAME(iodone)(ioid_t ioid); -extern ssize_t SYSIO_INTERFACE_NAME(iowait)(ioid_t ioid); -extern ioid_t SYSIO_INTERFACE_NAME(ipreadv)(int fd, const struct iovec *iov, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ioid_t SYSIO_INTERFACE_NAME(ipread64v)(int fd, const struct iovec *iov, - size_t count, off64_t offset); -#endif -extern ioid_t SYSIO_INTERFACE_NAME(ipread)(int fd, void *buf, size_t count, - off_t offset); -#if _LARGEFILE64_SOURCE -extern ioid_t SYSIO_INTERFACE_NAME(ipread64)(int fd, void *buf, size_t count, - off64_t offset); -#endif -extern ssize_t SYSIO_INTERFACE_NAME(preadv)(int fd, const struct iovec *iov, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ssize_t SYSIO_INTERFACE_NAME(pread64v)(int fd, const struct iovec *iov, - size_t count, off64_t offset); -#endif -extern ssize_t SYSIO_INTERFACE_NAME(pread)(int fd, void *buf, size_t count, - off_t offset); -#if _LARGEFILE64_SOURCE -extern ssize_t SYSIO_INTERFACE_NAME(pread64)(int fd, void *buf, size_t count, - off64_t offset); -#endif -extern ioid_t SYSIO_INTERFACE_NAME(ireadv)(int fd, const struct iovec *iov, - int count); -extern ioid_t SYSIO_INTERFACE_NAME(iread)(int fd, void *buf, size_t count); -extern ssize_t SYSIO_INTERFACE_NAME(readv)(int fd, const struct iovec *iov, - int count); -extern ssize_t SYSIO_INTERFACE_NAME(read)(int fd, void *buf, size_t count); -extern ioid_t SYSIO_INTERFACE_NAME(ipwritev)(int fd, const struct iovec *iov, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ioid_t SYSIO_INTERFACE_NAME(ipwrite64v)(int fd, const struct iovec *iov, - size_t count, off64_t offset); -#endif -extern ioid_t SYSIO_INTERFACE_NAME(ipwrite)(int fd, const void *buf, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ioid_t SYSIO_INTERFACE_NAME(ipwrite64)(int fd, const void *buf, - size_t count, off64_t offset); -#endif -extern ssize_t SYSIO_INTERFACE_NAME(pwritev)(int fd, const struct iovec *iov, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ssize_t SYSIO_INTERFACE_NAME(pwrite64v)(int fd, const struct iovec *iov, - size_t count, off64_t offset); -#endif -extern ssize_t SYSIO_INTERFACE_NAME(pwrite)(int fd, const void *buf, - size_t count, off_t offset); -#if _LARGEFILE64_SOURCE -extern ssize_t SYSIO_INTERFACE_NAME(pwrite64)(int fd, const void *buf, - size_t count, off64_t offset); -#endif -extern ioid_t SYSIO_INTERFACE_NAME(iwritev)(int fd, - const struct iovec *iov, - int count); -extern ioid_t SYSIO_INTERFACE_NAME(iwrite)(int fd, const void *buf, - size_t count); -extern ssize_t SYSIO_INTERFACE_NAME(writev)(int fd, const struct iovec *iov, - int count); -extern ssize_t SYSIO_INTERFACE_NAME(write)(int fd, const void *buf, - size_t count); extern int SYSIO_INTERFACE_NAME(mknod)(const char *path, mode_t mode, dev_t dev); extern int SYSIO_INTERFACE_NAME(utime)(const char *path, |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:21
|
Update of /cvsroot/libsysio/libsysio/drivers/sockets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/drivers/sockets Modified Files: sockets.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: sockets.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/sockets/sockets.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- sockets.c 20 May 2004 19:31:48 -0000 1.3 +++ sockets.c 3 Jul 2004 05:47:12 -0000 1.4 @@ -57,11 +57,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/fcntl.h> -#include <sys/queue.h> #include <sys/syscall.h> #include <sys/socket.h> #include <linux/net.h> +#include <sys/uio.h> +#include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "inode.h" |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:21
|
Update of /cvsroot/libsysio/libsysio/drivers/yod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/drivers/yod Modified Files: fs_yod.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: fs_yod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/yod/fs_yod.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- fs_yod.c 22 Apr 2004 18:59:04 -0000 1.14 +++ fs_yod.c 3 Jul 2004 05:47:12 -0000 1.15 @@ -65,8 +65,8 @@ #endif #include <utime.h> #include <sys/queue.h> -#include <sys/uio.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "mount.h" |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:21
|
Update of /cvsroot/libsysio/libsysio/drivers/incore In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/drivers/incore Modified Files: fs_incore.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: fs_incore.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/incore/fs_incore.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -b -B -p -r1.17 -r1.18 --- fs_incore.c 16 Apr 2004 20:38:33 -0000 1.17 +++ fs_incore.c 3 Jul 2004 05:47:12 -0000 1.18 @@ -61,6 +61,7 @@ #endif #include <sys/queue.h> +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "mount.h" |
|
From: Lee W. <lw...@us...> - 2004-07-03 05:47:21
|
Update of /cvsroot/libsysio/libsysio/drivers/native In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11075/drivers/native Modified Files: fs_native.c Log Message: A new, major change, to .../include/xtio.h. This is intended to be the include file for applications. It prototype all of the extended API available as well as the necessary structures. Other shanges to support this. We now need it most everywhere to build the library as well. Index: fs_native.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -w -b -B -p -r1.38 -r1.39 --- fs_native.c 25 May 2004 17:53:43 -0000 1.38 +++ fs_native.c 3 Jul 2004 05:47:12 -0000 1.39 @@ -51,6 +51,9 @@ #include <string.h> #endif #include <unistd.h> +#if !(defined(REDSTORM) || defined(MAX_IOVEC)) +#include <limits.h> +#endif #include <errno.h> #include <assert.h> #include <syscall.h> @@ -65,16 +68,14 @@ #include <sys/statfs.h> #endif #include <utime.h> +#include <sys/uio.h> #include <sys/queue.h> -#if !(defined(REDSTORM) || defined(MAX_IOVEC)) -#include <limits.h> -#endif +#include "xtio.h" #include "sysio.h" #include "fs.h" #include "mount.h" #include "inode.h" -#include "xtio.h" #include "fs_native.h" |
