[Libsysio-commit] HEAD: libsysio/src access.c chdir.c chmod.c chown.c dup.c fcntl.c fsync.c getdiren
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] HEAD: libsysio/src access.c chdir.c chmod.c chown.c dup.c fcntl.c fsync.c getdirentries.c ioctl.c iowait.c link.c lseek.c mkdir.c mknod.c mount.c open.c rename.c rmdir.c rw.c stat.c stat64.c statvfs.c statvfs64.c symlink.c truncate.c unlink.c utime.c
|
From: Ruth K. <rk...@us...> - 2004-04-27 22:11:30
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17893 Modified Files: access.c chdir.c chmod.c chown.c dup.c fcntl.c fsync.c getdirentries.c ioctl.c iowait.c link.c lseek.c mkdir.c mknod.c mount.c open.c rename.c rmdir.c rw.c stat.c stat64.c statvfs.c statvfs64.c symlink.c truncate.c unlink.c utime.c Log Message: From Cray 728488 MAJOR ERRNO=2/"NO SUCH FILE OR DIRECTORY" INSTEAD OF SUCCESS ON CREATE OPERATIONS Added macros to preserve the initial errno value across all successful calls. Also added macros to allow compile time construction of interface names unique to sysio library. This facility can be turned on by setting SYSIO_LABEL_NAMES to 1 in sysio.h. Index: access.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/access.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- access.c 26 Jan 2004 16:34:54 -0000 1.3 +++ access.c 27 Apr 2004 22:10:54 -0000 1.4 @@ -48,16 +48,19 @@ #include <unistd.h> #include "sysio-symbols.h" +#include "sysio.h" int -access(const char *path, int amode) +SYSIO_INTERFACE_NAME(access)(const char *path, int amode) { gid_t *list, *entry; size_t n; int err = 0; unsigned mask, mode; struct stat stbuf; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; n = getgroups(0, NULL); @@ -108,10 +111,10 @@ out: if (list) free(list); - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __access -sysio_sym_weak_alias(access, __access) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(access), __access) #endif Index: chdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- chdir.c 31 Mar 2004 17:43:18 -0000 1.14 +++ chdir.c 27 Apr 2004 22:10:55 -0000 1.15 @@ -114,29 +114,26 @@ _sysio_p_chdir(struct pnode *pno) } int -chdir(const char *path) +SYSIO_INTERFACE_NAME(chdir)(const char *path) { int err; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) { errno = -err; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, err); } err = _sysio_p_chdir(pno); - if (err) - P_RELE(pno); - - SYSIO_LEAVE; if (err) { + P_RELE(pno); errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM @@ -232,28 +229,27 @@ _sysio_p_path(struct pnode *pno, char ** } char * -getcwd(char *buf, size_t size) +SYSIO_INTERFACE_NAME(getcwd)(char *buf, size_t size) { int err; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_p_path(_sysio_cwd, &buf, buf ? size : 0); if (err) { errno = -err; - SYSIO_LEAVE; - return NULL; + SYSIO_INTERFACE_RETURN(NULL, err); } - SYSIO_LEAVE; - return buf; + SYSIO_INTERFACE_RETURN(buf, err); } #ifdef __GLIBC__ -sysio_sym_weak_alias(getcwd, __getcwd) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(getcwd), __getcwd) #endif #if defined(PATH_MAX) && !(defined(REDSTORM)) char * -getwd(char *buf) +SYSIO_INTERFACE_NAME(getwd)(char *buf) { if (!buf) { Index: chmod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chmod.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- chmod.c 25 Feb 2004 16:23:59 -0000 1.7 +++ chmod.c 27 Apr 2004 22:10:55 -0000 1.8 @@ -69,12 +69,13 @@ do_chmod(struct pnode *pno, struct inode } int -chmod(const char *path, mode_t mode) +SYSIO_INTERFACE_NAME(chmod)(const char *path, mode_t mode) { int err; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -85,21 +86,22 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __chmod -sysio_sym_weak_alias(chmod, __chmod) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(chmod)), __chmod) #endif int -fchmod(int fd, mode_t mode) +SYSIO_INTERFACE_NAME(fchmod)(int fd, mode_t mode) { int err; struct file *fil; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; fil = _sysio_fd_find(fd); if (!fil) { @@ -113,10 +115,10 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __fchmod -sysio_sym_weak_alias(fchmod, __fchmod) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fchmod)), __chmod) #endif Index: chown.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chown.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- chown.c 31 Mar 2004 17:43:18 -0000 1.7 +++ chown.c 27 Apr 2004 22:10:55 -0000 1.8 @@ -60,7 +60,6 @@ _do_chown(struct pnode *pno, struct inod int err; struct intnl_stat stbuf; unsigned mask; - SYSIO_ENTER; (void )memset(&stbuf, 0, sizeof(struct intnl_stat)); mask = 0; @@ -77,11 +76,13 @@ _do_chown(struct pnode *pno, struct inod } int -chown(const char *path, uid_t owner, gid_t group) +SYSIO_INTERFACE_NAME(chown)(const char *path, uid_t owner, gid_t group) { int err; struct pnode *pno; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -93,21 +94,23 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __chown -sysio_sym_weak_alias(chown, __chown) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(chown)), __chown) #endif int -fchown(int fd, uid_t owner, gid_t group) +SYSIO_INTERFACE_NAME(fchown)(int fd, uid_t owner, gid_t group) { int err; struct file *fil; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; fil = _sysio_fd_find(fd); if (!fil) { @@ -122,11 +125,11 @@ out: err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __fchown -sysio_sym_weak_alias(fchown, __fchown) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fchown)), __fchown) #endif Index: dup.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/dup.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- dup.c 6 Feb 2004 20:07:30 -0000 1.5 +++ dup.c 27 Apr 2004 22:10:55 -0000 1.6 @@ -50,56 +50,54 @@ #include "file.h" #include "sysio-symbols.h" -#include "sysio-symbols.h" - int -dup2(int oldfd, int newfd) +SYSIO_INTERFACE_NAME(dup2)(int oldfd, int newfd) { int rc; - SYSIO_ENTER; + int err; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; + err = 0; if (newfd < 0) { errno = EBADF; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, -EBADF); } - if (oldfd == newfd) { - SYSIO_LEAVE; - return newfd; - } + if (oldfd == newfd) + SYSIO_INTERFACE_RETURN(newfd, 0); rc = _sysio_fd_dup2(oldfd, newfd); if (rc < 0) { - errno = -rc; + errno = err = -rc; rc = -1; } - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, err); } #ifdef REDSTORM #undef __dup2 -sysio_sym_weak_alias(dup2, __dup2) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(dup2), __dup2) #endif int -dup(int oldfd) +SYSIO_INTERFACE_NAME(dup)(int oldfd) { int rc; - SYSIO_ENTER; + int err; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; + err = 0; rc = _sysio_fd_dup2(oldfd, -1); if (rc < 0) { - errno = -rc; + errno = err = -rc; rc = -1; } - - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, err); } #ifdef __GLIBC__ #undef __dup -sysio_sym_weak_alias(dup, __dup) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(dup), __dup) #endif Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -b -B -p -r1.8 -r1.9 --- fcntl.c 26 Jan 2004 16:34:54 -0000 1.8 +++ fcntl.c 27 Apr 2004 22:10:55 -0000 1.9 @@ -54,13 +54,14 @@ #include "sysio-symbols.h" int -fcntl(int fd, int cmd, ...) +SYSIO_INTERFACE_NAME(fcntl)(int fd, int cmd, ...) { int err; struct file *fil; va_list ap; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; fil = _sysio_fd_find(fd); if (!fil) { @@ -84,8 +85,7 @@ fcntl(int fd, int cmd, ...) } rc = _sysio_fd_dup2(fd, (int )newfd); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, err); } break; default: @@ -100,16 +100,15 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef __GLIBC__ #undef __fcntl -sysio_sym_weak_alias(fcntl, __fcntl) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fcntl), __fcntl) #endif #ifdef BSD #undef _fcntl -sysio_sym_weak_alias(fcntl, _fcntl) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fcntl), _fcntl) #endif Index: fsync.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fsync.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- fsync.c 21 Jan 2004 14:44:53 -0000 1.3 +++ fsync.c 27 Apr 2004 22:10:55 -0000 1.4 @@ -51,49 +51,43 @@ #include "inode.h" int -fsync(int fd) +SYSIO_INTERFACE_NAME(fsync)(int fd) { struct file *fil; int err; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; fil = _sysio_fd_find(fd); if (!(fil && fil->f_ino)) { errno = -EBADF; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, -EBADF); } err = (*fil->f_ino->i_ops.inop_sync)(fil->f_ino); if (err) { errno = -err; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, err); } - - SYSIO_LEAVE; - return 0; + SYSIO_INTERFACE_RETURN(err, err); } int -fdatasync(int fd) +SYSIO_INTERFACE_NAME(fdatasync)(int fd) { struct file *fil; int err; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; fil = _sysio_fd_find(fd); if (!(fil && fil->f_ino)) { errno = -EBADF; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, -EBADF); } err = (*fil->f_ino->i_ops.inop_datasync)(fil->f_ino); if (err) { errno = -err; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, err); } - - SYSIO_LEAVE; - return 0; + SYSIO_INTERFACE_RETURN(err, err); } Index: getdirentries.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- getdirentries.c 14 Apr 2004 16:05:36 -0000 1.11 +++ getdirentries.c 27 Apr 2004 22:10:55 -0000 1.12 @@ -119,7 +119,7 @@ _getdirentries64(int fd, #if _LARGEFILE64_SOURCE #undef getdirentries64 -sysio_sym_strong_alias(_getdirentries64, getdirentries64) +sysio_sym_strong_alias(_getdirentries64, SYSIO_INTERFACE_NAME(getdirentries64)) #endif #undef getdirentries @@ -143,13 +143,13 @@ sysio_sym_strong_alias(_getdirentries64, #ifndef BSD ssize_t -getdirentries(int fd, +SYSIO_INTERFACE_NAME(getdirentries)(int fd, char *buf, size_t nbytes, off_t * __restrict basep) #else int -getdirentries(int fd, +SYSIO_INTERFACE_NAME(getdirentries)(int fd, char *buf, int nbytes, long * __restrict basep) @@ -167,7 +167,7 @@ getdirentries(int fd, size_t n; size_t reclen; char *cp; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; #define _dbaselen ((size_t )&((struct dirent *)0)->d_name[0]) @@ -188,6 +188,7 @@ getdirentries(int fd, #define _fast_free(p) free(p) #endif + SYSIO_INTERFACE_ENTER; #if defined(BSD) || defined(REDSTORM) if (nbytes < 0) { errno = -EINVAL; @@ -277,8 +278,7 @@ out: if (dp == (struct dirent *)buf && cc < 0) { errno = (int )-cc; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, cc); } cc = (char *)dp - buf; if (cc) @@ -288,8 +288,7 @@ out: #else off; #endif - SYSIO_LEAVE; - return cc; + SYSIO_INTERFACE_RETURN(cc, cc >= 0 ? 0 : -1); #ifdef __GLIBC__ #undef _fast_alloc @@ -304,9 +303,9 @@ sysio_sym_strong_alias(_getdirentries64, #ifdef REDSTORM #undef __getdirentries -sysio_sym_weak_alias(getdirentries, __getdirentries) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(getdirentries)), __getdirentries) #endif #if defined(BSD) || defined(REDSTORM) #undef _getdirentries -sysio_sym_weak_alias(getdirentries, _getdirentries) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(getdirentries)), _getdirentries) #endif Index: ioctl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/ioctl.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- ioctl.c 26 Jan 2004 16:34:54 -0000 1.6 +++ ioctl.c 27 Apr 2004 22:10:55 -0000 1.7 @@ -53,13 +53,14 @@ #include "sysio-symbols.h" int -ioctl(int fd, unsigned long request, ...) +SYSIO_INTERFACE_NAME(ioctl)(int fd, unsigned long request, ...) { int err; struct file *fil; va_list ap; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; fil = _sysio_fd_find(fd); if (!fil) { @@ -72,21 +73,20 @@ ioctl(int fd, unsigned long request, ... va_end(ap); out: - if (err) { + if (err < 0) { errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef __GLIBC__ #undef __ioctl -sysio_sym_weak_alias(ioctl, __ioctl) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(ioctl), __ioctl) #endif #ifdef BSD #undef _ioctl -sysio_sym_weak_alias(ioctl, _ioctl) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(ioctl), _ioctl) #endif Index: iowait.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/iowait.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- iowait.c 21 Jan 2004 14:44:53 -0000 1.5 +++ iowait.c 27 Apr 2004 22:10:55 -0000 1.6 @@ -67,22 +67,21 @@ lookup_ioid(ioid_t ioid) * Poll status of asynch IO request. */ int -iodone(ioid_t ioid) +SYSIO_INTERFACE_NAME(iodone)(ioid_t ioid) { struct ioctx *ioctx; int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; ioctx = lookup_ioid(ioid); - if (!ioctx) { - SYSIO_LEAVE; - return -1; - } + if (!ioctx) + SYSIO_INTERFACE_RETURN(-1, -1); rc = (ioctx->ioctx_done || (*ioctx->ioctx_ino->i_ops.inop_iodone)(ioctx)); - SYSIO_LEAVE; - return rc; + + SYSIO_INTERFACE_RETURN(rc, rc >= 0 ? 0 : -1); } /* @@ -92,23 +91,21 @@ iodone(ioid_t ioid) * The identifier is no longer valid after return. */ ssize_t -iowait(ioid_t ioid) +SYSIO_INTERFACE_NAME(iowait)(ioid_t ioid) { struct ioctx *ioctx; ssize_t cc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; ioctx = lookup_ioid(ioid); - if (!ioctx) { - SYSIO_LEAVE; - return -1; - } + if (!ioctx) + SYSIO_INTERFACE_RETURN(-1, -1); cc = _sysio_ioctx_wait(ioctx); if (cc < 0) { errno = -(int )cc; cc = -1; } - SYSIO_LEAVE; - return cc; + SYSIO_INTERFACE_RETURN(cc, cc >= 0 ? 0 : -1); } Index: link.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/link.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- link.c 27 Apr 2004 16:03:17 -0000 1.5 +++ link.c 27 Apr 2004 22:10:55 -0000 1.6 @@ -55,12 +55,14 @@ #include "sysio-symbols.h" int -link(const char *oldpath, const char *newpath) +SYSIO_INTERFACE_NAME(link)(const char *oldpath, const char *newpath) { struct intent intent; int err; struct pnode *old, *new; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; INTENT_INIT(&intent, 0, NULL, NULL); err = _sysio_namei(_sysio_cwd, oldpath, 0, &intent, &old); if (err) @@ -101,10 +103,10 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __link -sysio_sym_weak_alias(link, __link) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(link), __link) #endif Index: lseek.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -b -B -p -r1.15 -r1.16 --- lseek.c 16 Apr 2004 20:38:34 -0000 1.15 +++ lseek.c 27 Apr 2004 22:10:55 -0000 1.16 @@ -60,7 +60,9 @@ _sysio_lseek(int fd, _SYSIO_OFF_T offset struct file *fil; _SYSIO_OFF_T off, pos; struct intnl_stat stbuf; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; fil = _sysio_fd_find(fd); if (!fil) return -EBADF; @@ -83,7 +85,8 @@ _sysio_lseek(int fd, _SYSIO_OFF_T offset fil->f_ino, &stbuf); if (err) - return err; + SYSIO_INTERFACE_RETURN(err, err); + } off = stbuf.st_size; break; @@ -93,24 +96,26 @@ _sysio_lseek(int fd, _SYSIO_OFF_T offset pos = off + offset; if ((offset < 0 && -offset >= off) || (offset > 0 && pos <= off)) - return -EINVAL; + SYSIO_INTERFACE_RETURN(-EINVAL, -EINVAL); + #ifdef O_LARGEFILE if (pos >= ((fil->f_flags & O_LARGEFILE) ? _SYSIO_OFF_T_MAX : LONG_MAX)) - return -EOVERFLOW; + SYSIO_INTERFACE_RETURN(-EOVERFLOW, -EOVERFLOW); #else if (pos >= _SYSIO_OFF_T_MAX) - return -EOVERFLOW; + SYSIO_INTERFACE_RETURN(-EOVERFLOW, -EOVERFLOW); #endif pos = (fil->f_ino->i_ops.inop_pos)(fil->f_ino, pos); if (pos < 0) return pos; + fil->f_pos = pos; - return fil->f_pos = pos; + SYSIO_INTERFACE_RETURN(pos, -1); } #if _LARGEFILE64_SOURCE #undef lseek64 -sysio_sym_weak_alias(_sysio_lseek, lseek64) +sysio_sym_weak_alias(_sysio_lseek, SYSIO_INTERFACE_NAME(lseek64)) #ifdef __GLIBC__ #undef __lseek64 sysio_sym_weak_alias(_sysio_lseek, __lseek64) @@ -124,34 +129,33 @@ sysio_sym_weak_alias(_sysio_lseek, __lib #undef lseek extern off_t -lseek(int fd, off_t offset, int whence) +SYSIO_INTERFACE_NAME(lseek)(int fd, off_t offset, int whence) { _SYSIO_OFF_T off; off_t rtn; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; off = _sysio_lseek(fd, offset, whence); if (off < 0) { errno = -off; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN((off_t )-1, off); } rtn = (off_t )off; assert(rtn == off); - SYSIO_LEAVE; - return rtn; + SYSIO_INTERFACE_RETURN(rtn, 0); } #ifdef __GLIBC__ #undef __lseek -sysio_sym_weak_alias(lseek, __lseek) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(lseek), __lseek) #endif #if 0 #ifdef __linux__ #undef llseek int -llseek(unsigned int fd __IS_UNUSED, +SYSIO_INTERFACE_NAME(llseek)(unsigned int fd __IS_UNUSED, unsigned long offset_high __IS_UNUSED, unsigned long offset_low __IS_UNUSED, loff_t *result __IS_UNUSED, @@ -166,6 +170,6 @@ llseek(unsigned int fd __IS_UNUSED, } #undef __llseek -sysio_sym_weak_alias(llseek, __llseek) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(llseek), __llseek) #endif #endif Index: mkdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mkdir.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- mkdir.c 6 Feb 2004 20:07:30 -0000 1.6 +++ mkdir.c 27 Apr 2004 22:10:55 -0000 1.7 @@ -54,13 +54,14 @@ #include "sysio-symbols.h" int -mkdir(const char *path, mode_t mode) +SYSIO_INTERFACE_NAME(mkdir)(const char *path, mode_t mode) { int err; struct intent intent; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; INTENT_INIT(&intent, INT_CREAT, &mode, NULL); err = _sysio_namei(_sysio_cwd, path, ND_NEGOK, &intent, &pno); if (err) @@ -82,12 +83,11 @@ out: errno = -err; err = -1; } - - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __mkdir sysio_sym_weak_alias(mkdir, __mkdir) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(mkdir)), __mkdir) #endif Index: mknod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mknod.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- mknod.c 19 Apr 2004 19:54:25 -0000 1.10 +++ mknod.c 27 Apr 2004 22:10:55 -0000 1.11 @@ -67,12 +67,17 @@ #endif int -__xmknod(int __ver, const char *path, mode_t mode, dev_t *dev) +PREPEND(__,SYSIO_INTERFACE_NAME(xmknod))(int __ver, + const char *path, + mode_t mode, + dev_t *dev) { int err; struct intent intent; struct pnode *pno; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; if (__ver != _MKNOD_VER) { err = -ENOSYS; goto out; @@ -108,24 +113,28 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef _xmknod -sysio_sym_weak_alias(__xmknod, _xmknod) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(xmknod)), _xmknod) #endif static int -__mknod(const char *path, mode_t mode, dev_t dev) +PREPEND(__,SYSIO_INTERFACE_NAME(mknod))(const char *path, + mode_t mode, + dev_t dev) { int rc; - SYSIO_ENTER; - rc = __xmknod(_MKNOD_VER, path, mode, &dev); + rc = PREPEND(__,SYSIO_INTERFACE_NAME(xmknod))(_MKNOD_VER, + path, + mode, + &dev); - SYSIO_LEAVE; return rc; } -sysio_sym_weak_alias(__mknod, mknod) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(mknod)), \ + SYSIO_INTERFACE_NAME(mknod)) Index: mount.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mount.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- mount.c 14 Feb 2004 19:42:59 -0000 1.11 +++ mount.c 27 Apr 2004 22:10:55 -0000 1.12 @@ -323,14 +323,16 @@ _sysio_mount(struct pnode *cwd, } int -mount(const char *source, +SYSIO_INTERFACE_NAME(mount)(const char *source, const char *target, const char *filesystemtype, unsigned long mountflags, const void *data) { int err; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_mount(_sysio_cwd, source, @@ -342,15 +344,17 @@ mount(const char *source, errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } int -umount(const char *target) +SYSIO_INTERFACE_NAME(umount)(const char *target) { int err; struct pnode *pno; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; /* * Look up the target path node. */ @@ -376,7 +380,7 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } /* Index: open.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/open.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -b -B -p -r1.16 -r1.17 --- open.c 2 Apr 2004 14:27:46 -0000 1.16 +++ open.c 27 Apr 2004 22:10:55 -0000 1.17 @@ -127,7 +127,7 @@ _sysio_open(struct pnode *pno, int flags #undef open int -open(const char *path, int flags, ...) +SYSIO_INTERFACE_NAME(open)(const char *path, int flags, ...) { mode_t mode; unsigned ndflags; @@ -135,8 +135,9 @@ open(const char *path, int flags, ...) int err; struct pnode *pno; struct file *fil; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; /* * Get mode argument and determine parameters for namei */ @@ -207,8 +208,7 @@ open(const char *path, int flags, ...) P_RELE(pno); - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, 0); error: if (fil) @@ -216,54 +216,53 @@ error: if (pno) P_RELE(pno); errno = -err; - SYSIO_LEAVE; - return -1; + SYSIO_INTERFACE_RETURN(-1, err); } #ifdef __GLIBC__ #undef __open -sysio_sym_weak_alias(open, __open) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(open), __open) #undef open64 -sysio_sym_weak_alias(open, open64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(open), open64) #undef __open64 -sysio_sym_weak_alias(open, __open64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(open), __open64) #endif #ifdef REDSTORM #undef __libc_open64 -sysio_sym_weak_alias(open, __libc_open64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(open), __libc_open64) #endif #ifdef BSD #undef _open -sysio_sym_weak_alias(open, _open) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(open), _open) #endif int -close(int fd) +SYSIO_INTERFACE_NAME(close)(int fd) { int err; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_fd_close(fd); if (err) errno = -err; - SYSIO_LEAVE; - return err ? -1 : 0; + SYSIO_INTERFACE_RETURN(err ? -1 : 0, err); } #ifdef __GLIBC__ #undef __close -sysio_sym_weak_alias(close, __close) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(close), __close) #endif #ifdef BSD #undef _close -sysio_sym_weak_alias(close, _close) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(close), _close) #endif int -creat(const char *path, mode_t mode) +SYSIO_INTERFACE_NAME(creat)(const char *path, mode_t mode) { return open(path, O_CREAT|O_WRONLY|O_TRUNC, mode); @@ -271,25 +270,25 @@ creat(const char *path, mode_t mode) #ifdef __GLIBC__ #undef __creat -sysio_sym_weak_alias(creat, __creat) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), __creat) #undef creat64 -sysio_sym_weak_alias(creat, creat64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), creat64) #undef __creat64 -sysio_sym_weak_alias(creat, __creat64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), __creat64) #endif #ifdef REDSTORM #undef __libc_creat -sysio_sym_weak_alias(creat, __libc_creat) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), __libc_creat) #endif #ifdef BSD #undef _creat -sysio_sym_weak_alias(creat, _creat) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(creat), _creat) #endif mode_t -umask(mode_t mask) +SYSIO_INTERFACE_NAME(umask)(mode_t mask) { mode_t omask; @@ -300,5 +299,5 @@ umask(mode_t mask) #ifdef REDSTORM #undef __umask -sysio_sym_weak_alias(umask, __umask) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(umask), __umask) #endif Index: rename.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rename.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -b -B -p -r1.3 -r1.4 --- rename.c 14 Feb 2004 19:42:59 -0000 1.3 +++ rename.c 27 Apr 2004 22:10:55 -0000 1.4 @@ -55,14 +55,16 @@ #include "inode.h" int -rename(const char *oldpath, const char *newpath) +SYSIO_INTERFACE_NAME(rename)(const char *oldpath, const char *newpath) { struct intent intent; int err; struct pnode *old, *new; struct pnode_base *nxtpb, *pb; struct intnl_stat ostbuf, nstbuf; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; /* * Resolve oldpath to a path node. */ @@ -178,5 +180,5 @@ error3: } _sysio_p_gone(old); /* kill it! */ out: - return err; + SYSIO_INTERFACE_RETURN(err, err); } Index: rmdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rmdir.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- rmdir.c 26 Apr 2004 19:02:03 -0000 1.9 +++ rmdir.c 27 Apr 2004 22:10:55 -0000 1.10 @@ -60,8 +60,9 @@ rmdir(const char *path) int err; struct pnode *pno; struct inode *ino; + SYSIO_INTERFACE_DISPLAY_BLOCK; - SYSIO_ENTER; + SYSIO_INTERFACE_ENTER; INTENT_INIT(&intent, INT_UPDPARENT, NULL, NULL); err = _sysio_namei(_sysio_cwd, path, 0, &intent, &pno); if (err) @@ -90,12 +91,10 @@ out: errno = -err; err = -1; } - - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __rmdir -sysio_sym_weak_alias(rmdir, __rmdir) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(rmdir)), __rmdir) #endif Index: rw.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rw.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- rw.c 12 Apr 2004 15:40:58 -0000 1.5 +++ rw.c 27 Apr 2004 22:10:55 -0000 1.6 @@ -243,26 +243,25 @@ free_xtv(struct ioctx *ioctx) } ioid_t -ireadv(int fd, const struct iovec *iov, int count) +SYSIO_INTERFACE_NAME(ireadv)(int fd, const struct iovec *iov, int count) { struct file *fil; struct intnl_xtvec *xtv; struct ioctx *ioctx; int err; + SYSIO_INTERFACE_DISPLAY_BLOCK; [...1164 lines suppressed...] #if _LARGEFILE64_SOURCE -#undef iwrite64x +#undef write64x ssize_t -write64x(int fd, +SYSIO_INTERFACE_NAME(write64x)(int fd, const struct iovec *iov, size_t iov_count, const struct xtvec64 *xtv, size_t xtv_count) { ioid_t ioid; - if ((ioid = iwrite64x(fd, iov, iov_count, xtv, xtv_count)) == IOID_FAIL) + if ((ioid = SYSIO_INTERFACE_NAME(iwrite64x)(fd, + iov, + iov_count, + xtv, + xtv_count)) == IOID_FAIL) return -1; return iowait(ioid); } Index: stat.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- stat.c 15 Apr 2004 13:03:27 -0000 1.11 +++ stat.c 27 Apr 2004 22:10:57 -0000 1.12 @@ -90,7 +90,9 @@ convstat(struct stat64 *st64_buf, struct #endif int -__fxstat(int __ver, int __fildes, struct stat *__stat_buf) +PREPEND(__,SYSIO_INTERFACE_NAME(fxstat))(int __ver, + int __fildes, + struct stat *__stat_buf) { struct file *fil; int err; @@ -98,7 +100,9 @@ __fxstat(int __ver, int __fildes, struct #if _LARGEFILE64_SOURCE struct stat64 st64; #endif + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; if (__ver != _STAT_VER) { err = -ENOSYS; goto out; @@ -125,37 +129,42 @@ out: #if _LARGEFILE64_SOURCE convstat(buf, __stat_buf); #endif - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef _fxstat -sysio_sym_weak_alias(__fxstat, _fxstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(fxstat)), _fxstat) #endif #ifndef REDSTORM static int -__fstat(int fd, struct stat *buf) +PREPEND(__,SYSIO_INTERFACE_NAME(fstat))(int fd, struct stat *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; - rc = __fxstat(_STAT_VER, fd, buf); + SYSIO_INTERFACE_ENTER; + rc = PREPEND(__,SYSIO_INTERFACE_NAME(fxstat))(_STAT_VER, + fd, + buf); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, rc); } -sysio_sym_weak_alias(__fstat, fstat) +sysio_sym_weak_alias(PREPEND(__, SYSIO_INTERFACE_NAME(fstat)), + SYSIO_INTERFACE_NAME(fstat)) #ifdef BSD #undef _fstat -sysio_sym_weak_alias(__fstat, _fstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(fstat)), _fstat) #endif #endif int -__xstat(int __ver, const char *__filename, struct stat *__stat_buf) +PREPEND(__,SYSIO_INTERFACE_NAME(xstat))(int __ver, + const char *__filename, + struct stat *__stat_buf) { struct intent intent; int err; @@ -165,7 +174,9 @@ __xstat(int __ver, const char *__filenam #if _LARGEFILE64_SOURCE struct stat64 st64; #endif + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; if (__ver != _STAT_VER) { err = -ENOSYS; goto out; @@ -195,37 +206,43 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef _xstat -sysio_sym_weak_alias(__xstat, _xstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(xstat)), _xstat) #endif #ifndef REDSTORM static int -__stat(const char *filename, struct stat *buf) +PREPEND(__,SYSIO_INTERFACE_NAME(stat))(const char *filename, + struct stat *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; - rc = __xstat(_STAT_VER, filename, buf); + SYSIO_INTERFACE_ENTER; + rc = PREPEND(__,SYSIO_INTERFACE_NAME(xstat))(_STAT_VER, + filename, + buf); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, rc); } -sysio_sym_weak_alias(__stat, stat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(stat)), + SYSIO_INTERFACE_NAME(stat)) #ifdef BSD #undef _stat -sysio_sym_weak_alias(__stat, _stat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(stat)), _stat) #endif #endif int -__lxstat(int __ver, const char *__filename, struct stat *__stat_buf) +PREPEND(__,SYSIO_INTERFACE_NAME(lxstat))(int __ver, + const char *__filename, + struct stat *__stat_buf) { struct intent intent; int err; @@ -235,7 +252,9 @@ __lxstat(int __ver, const char *__filena #if _LARGEFILE64_SOURCE struct stat64 st64; #endif + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; if (__ver != _STAT_VER) { err = -ENOSYS; goto out; @@ -265,31 +284,33 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef _lxstat -sysio_sym_weak_alias(__lxstat, _lxstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(lxstat)), _lxstat) #endif #ifndef REDSTORM static int -__lstat(const char *filename, struct stat *buf) +PREPEND(__,SYSIO_INTERFACE_NAME(lstat))(const char *filename, struct stat *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; - rc = __lxstat(_STAT_VER, filename, buf); - - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_ENTER; + rc = PREPEND(__,SYSIO_INTERFACE_NAME(lxstat))(_STAT_VER, + filename, + buf); + SYSIO_INTERFACE_RETURN(rc, rc); } -sysio_sym_weak_alias(__lstat, lstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(lstat)), + SYSIO_INTERFACE_NAME(lstat)) #ifdef BSD #undef _lstat -sysio_sym_weak_alias(__lstat, _lstat) +sysio_sym_weak_alias(PREPEND(__,SYSIO_INTERFACE_NAME(lstat)), _lstat) #endif #endif Index: stat64.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- stat64.c 15 Apr 2004 13:03:27 -0000 1.7 +++ stat64.c 27 Apr 2004 22:10:57 -0000 1.8 @@ -92,15 +92,15 @@ out: #ifndef REDSTORM int -fstat64(int fd, struct stat64 *buf) +SYSIO_INTERFACE_NAME(fstat64)(int fd, struct stat64 *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; rc = __fxstat64(_STAT_VER, fd, buf); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, rc); } #endif @@ -135,15 +135,15 @@ out: #ifndef REDSTORM int -stat64(const char *filename, struct stat64 *buf) +SYSIO_INTERFACE_NAME(stat64)(const char *filename, struct stat64 *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; rc = __xstat64(_STAT_VER, filename, buf); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, rc); } #endif @@ -178,15 +178,15 @@ out: #ifndef REDSTORM int -lstat64(const char *filename, struct stat64 *buf) +SYSIO_INTERFACE_NAME(lstat64)(const char *filename, struct stat64 *buf) { int rc; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; rc = __lxstat64(_STAT_VER, filename, buf); - SYSIO_LEAVE; - return rc; + SYSIO_INTERFACE_RETURN(rc, rc); } #endif #endif /* !_LARGEFILE64_SOURCE */ Index: statvfs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/statvfs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- statvfs.c 24 Feb 2004 14:58:26 -0000 1.7 +++ statvfs.c 27 Apr 2004 22:10:57 -0000 1.8 @@ -77,7 +77,7 @@ convstatvfs(struct statvfs *stvfsbuf, st #endif int -statvfs(const char *path, struct statvfs *buf) +SYSIO_INTERFACE_NAME(statvfs)(const char *path, struct statvfs *buf) { int err; struct pnode *pno; @@ -87,8 +87,9 @@ statvfs(const char *path, struct statvfs struct intnl_statvfs _call_buffer; struct intnl_statvfs *_call_buf = &_call_buffer; #endif - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -105,17 +106,16 @@ err: errno = -err; err = -1; out: - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); +} + #ifdef REDSTORM #undef __statvfs -sysio_sym_weak_alias(statvfs, __statvfs) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(statvfs), __statvfs) #endif -} - int -fstatvfs(int fd, struct statvfs *buf) +SYSIO_INTERFACE_NAME(fstatvfs)(int fd, struct statvfs *buf) { int err; struct file *filp; @@ -125,8 +125,9 @@ fstatvfs(int fd, struct statvfs *buf) struct intnl_statvfs _call_buffer; struct intnl_statvfs *_call_buf = &_call_buffer; #endif - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; filp = _sysio_fd_find(fd); if (!filp) { @@ -145,13 +146,12 @@ err: errno = -err; err = -1; out: - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __fstatvfs -sysio_sym_weak_alias(fstatvfs, __fstatvfs) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fstatvfs), __fstatvfs) #endif #endif /* ifndef BSD */ Index: statvfs64.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/statvfs64.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- statvfs64.c 24 Feb 2004 14:58:26 -0000 1.9 +++ statvfs64.c 27 Apr 2004 22:10:57 -0000 1.10 @@ -55,12 +55,13 @@ #include "sysio-symbols.h" int -statvfs64(const char *path, struct statvfs64 *buf) +SYSIO_INTERFACE_NAME(statvfs64)(const char *path, struct statvfs64 *buf) { int err; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -72,23 +73,22 @@ out: errno = -err; err = -1; } - - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __statvfs64 -sysio_sym_weak_alias(statvfs64, __statvfs64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(statvfs64), __statvfs64) #endif int -fstatvfs64(int fd, struct statvfs64 *buf) +SYSIO_INTERFACE_NAME(fstatvfs64)(int fd, struct statvfs64 *buf) { int err; struct file *filp; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; filp = _sysio_fd_find(fd); if (!filp) { @@ -102,14 +102,12 @@ out: errno = -err; err = -1; } - - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __fstatvfs64 -sysio_sym_weak_alias(fstatvfs64, __fstatvfs64) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(fstatvfs64), __fstatvfs64) #endif #endif /* ifndef BSD */ Index: symlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/symlink.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -b -B -p -r1.6 -r1.7 --- symlink.c 6 Feb 2004 20:07:30 -0000 1.6 +++ symlink.c 27 Apr 2004 22:10:57 -0000 1.7 @@ -54,13 +54,14 @@ #include "sysio-symbols.h" int -symlink(const char *oldpath, const char *newpath) +SYSIO_INTERFACE_NAME(symlink)(const char *oldpath, const char *newpath) { int err; struct intent intent; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; INTENT_INIT(&intent, INT_CREAT, NULL, NULL); err = _sysio_namei(_sysio_cwd, newpath, ND_NEGOK, &intent, &pno); if (err) @@ -83,11 +84,10 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __symlink -sysio_sym_weak_alias(symlink, __symlink) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(symlink), __symlink) #endif Index: truncate.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -b -B -p -r1.7 -r1.8 --- truncate.c 6 Feb 2004 20:07:30 -0000 1.7 +++ truncate.c 27 Apr 2004 22:10:57 -0000 1.8 @@ -83,12 +83,14 @@ do_truncate(struct pnode *pno, struct in } static int -_truncate(const char *path, _SYSIO_OFF_T length) +PREPEND(_,SYSIO_INTERFACE_NAME(truncate))(const char *path, + _SYSIO_OFF_T length) { int err; struct pnode *pno; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -100,33 +102,35 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #if _LARGEFILE64_SOURCE #undef truncate64 -sysio_sym_weak_alias(_truncate, truncate64) +sysio_sym_weak_alias(PREPEND(_,SYSIO_INTERFACE_NAME(truncate)), \ + SYSIO_INTERFACE_NAME(truncate64)) #undef truncate int -truncate(const char *path, off_t length) +SYSIO_INTERFACE_NAME(truncate)(const char *path, off_t length) { - return _truncate(path, length); + return PREPEND(_,SYSIO_INTERFACE_NAME(truncate))(path, length); } #else #undef truncate -sysio_sym_weak_alias(_truncate, truncate) +sysio_sym_weak_alias(PREPEND(_,SYSIO_INTERFACE_NAME(truncate)), \ + SYSIO_INTERFACE_NAME(truncate)) #endif static int -_ftruncate(int fd, _SYSIO_OFF_T length) +PREPEND(_,SYSIO_INTERFACE_NAME(ftruncate))(int fd, _SYSIO_OFF_T length) { int err; struct file *fil; - SYSIO_ENTER; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = 0; fil = _sysio_fd_find(fd); if (!fil) { @@ -139,22 +143,21 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #if _LARGEFILE64_SOURCE #undef ftruncate64 -sysio_sym_weak_alias(_ftruncate, ftruncate64) +sysio_sym_weak_alias(PREPEND(_,SYSIO_INTERFACE_NAME(ftruncate)), SYSIO_INTERFACE_NAME(ftruncate64)) #undef ftruncate int -ftruncate(int fd, off_t length) +SYSIO_INTERFACE_NAME(ftruncate)(int fd, off_t length) { - return _ftruncate(fd, length); + return PREPEND(_,SYSIO_INTERFACE_NAME(ftruncate))(fd, length); } #else #undef ftruncate -sysio_sym_weak_alias(_ftruncate, ftruncate) +sysio_sym_weak_alias(PREPEND(_,SYSIO_INTERFACE_NAME(ftruncate)), SYSIO_INTERFACE_NAME(ftruncate)) #endif Index: unlink.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- unlink.c 14 Feb 2004 19:42:59 -0000 1.9 +++ unlink.c 27 Apr 2004 22:10:57 -0000 1.10 @@ -54,14 +54,15 @@ #include "sysio-symbols.h" int -unlink(const char *path) +SYSIO_INTERFACE_NAME(unlink)(const char *path) { struct intent intent; int err; struct pnode *pno; struct inode *ino; + SYSIO_INTERFACE_DISPLAY_BLOCK; - SYSIO_ENTER; + SYSIO_INTERFACE_ENTER; INTENT_INIT(&intent, INT_UPDPARENT, NULL, NULL); err = _sysio_namei(_sysio_cwd, path, ND_NOFOLLOW, &intent, &pno); if (err) @@ -96,11 +97,10 @@ out: errno = -err; err = -1; } - SYSIO_LEAVE; - return err; + SYSIO_INTERFACE_RETURN(err, err); } #ifdef REDSTORM #undef __unlink -sysio_sym_weak_alias(unlink, __unlink) +sysio_sym_weak_alias(SYSIO_INTERFACE_NAME(unlink), __unlink) #endif Index: utime.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/utime.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- utime.c 21 Jan 2004 14:44:53 -0000 1.2 +++ utime.c 27 Apr 2004 22:10:57 -0000 1.3 @@ -56,13 +56,15 @@ #include "file.h" int -utime(const char *path, const struct utimbuf *buf) +SYSIO_INTERFACE_NAME(utime)(const char *path, const struct utimbuf *buf) { int err; struct pnode *pno; struct utimbuf _utbuffer; struct intnl_stat stbuf; + SYSIO_INTERFACE_DISPLAY_BLOCK; + SYSIO_INTERFACE_ENTER; err = _sysio_namei(_sysio_cwd, path, 0, NULL, &pno); if (err) goto out; @@ -84,5 +86,5 @@ out: errno = -err; err = -1; } - return err; + SYSIO_INTERFACE_RETURN(err, err); } |
