[Libsysio-commit] HEAD: libsysio/src chdir.c fcntl.c file.c file_hack.c fs.c getdirentries.c init.c
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] HEAD: libsysio/src chdir.c fcntl.c file.c file_hack.c fs.c getdirentries.c init.c inode.c lseek.c mount.c namei.c rw.c stat.c truncate.c
|
From: Lee W. <lw...@us...> - 2007-05-01 16:34:00
|
Update of /cvsroot/libsysio/libsysio/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24463/src Modified Files: chdir.c fcntl.c file.c file_hack.c fs.c getdirentries.c init.c inode.c lseek.c mount.c namei.c rw.c stat.c truncate.c Log Message: The `C' preprocessor tests now look for definition of a symbol rather than a value. This enables some builds I'm told. Index: chdir.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/chdir.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -b -B -p -r1.28 -r1.29 --- chdir.c 30 Apr 2007 16:52:20 -0000 1.28 +++ chdir.c 1 May 2007 16:33:53 -0000 1.29 @@ -79,7 +79,7 @@ #include "file.h" #include "sysio-symbols.h" -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD const char *_sysio_init_cwd = NULL; #endif @@ -244,7 +244,7 @@ SYSIO_INTERFACE_NAME(getcwd)(char *buf, SYSIO_INTERFACE_DISPLAY_BLOCK; SYSIO_INTERFACE_ENTER(getcwd, buf, size); -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD if (!_sysio_cwd) { struct pnode *pno; Index: fcntl.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -b -B -p -r1.28 -r1.29 --- fcntl.c 1 May 2007 15:57:36 -0000 1.28 +++ fcntl.c 1 May 2007 16:33:53 -0000 1.29 @@ -194,7 +194,8 @@ _sysio_vfcntl(int fd, int cmd, va_list a } } break; -#if !(defined(_LARGEFILE64_SOURCE) && F_GETLK64 == F_GETLK) +#if !(defined(_LARGEFILE64_SOURCE) && defined(F_GETLK64) && \ + F_GETLK64 == F_GETLK) case F_GETLK: case F_SETLK: case F_SETLKW: Index: file.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/file.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -w -b -B -p -r1.21 -r1.22 --- file.c 30 Apr 2007 16:52:20 -0000 1.21 +++ file.c 1 May 2007 16:33:53 -0000 1.22 @@ -149,7 +149,7 @@ fd_grow(size_t n) return 0; } -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY void _sysio_fd_shutdown() { Index: file_hack.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/file_hack.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -b -B -p -r1.11 -r1.12 --- file_hack.c 30 Apr 2007 16:52:20 -0000 1.11 +++ file_hack.c 1 May 2007 16:33:53 -0000 1.12 @@ -188,7 +188,7 @@ fd_grow(oftab_t *oftab, size_t n) return 0; } -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY static void free_oftab(oftab_t *ot) { if (ot->table) { Index: fs.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/fs.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -b -B -p -r1.14 -r1.15 --- fs.c 21 Sep 2004 16:18:30 -0000 1.14 +++ fs.c 1 May 2007 16:33:53 -0000 1.15 @@ -106,7 +106,7 @@ _sysio_fssw_register(const char *name, s return 0; } -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY /* * Shutdown */ Index: getdirentries.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -w -b -B -p -r1.23 -r1.24 --- getdirentries.c 30 Apr 2007 16:52:20 -0000 1.23 +++ getdirentries.c 1 May 2007 16:33:53 -0000 1.24 @@ -104,7 +104,7 @@ PREPEND(_, SYSIO_INTERFACE_NAME(getdiren getdirentries64, buf, basep); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE #undef getdirentries64 sysio_sym_strong_alias(PREPEND(_, SYSIO_INTERFACE_NAME(getdirentries64)), SYSIO_INTERFACE_NAME(getdirentries64)) Index: init.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/init.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -w -b -B -p -r1.32 -r1.33 --- init.c 30 Apr 2007 16:52:20 -0000 1.32 +++ init.c 1 May 2007 16:33:53 -0000 1.33 @@ -45,7 +45,7 @@ #define _BSD_SOURCE #endif -#if SYSIO_TRACING +#ifdef SYSIO_TRACING #include <stdio.h> #endif #include <stdlib.h> @@ -55,7 +55,7 @@ #include <unistd.h> #include <string.h> #include <errno.h> -#if SYSIO_TRACING +#ifdef SYSIO_TRACING #include <stdarg.h> #endif #include <limits.h> @@ -68,7 +68,7 @@ #include "sysio.h" #include "xtio.h" -#if SYSIO_TRACING +#ifdef SYSIO_TRACING #include "native.h" #endif #include "inode.h" @@ -81,7 +81,7 @@ #include "stdfd.h" #endif -#if SYSIO_TRACING +#ifdef SYSIO_TRACING /* * Tracing callback record. @@ -156,7 +156,7 @@ _sysio_init() extern int _sysio_sockets_init(void); #endif -#if SYSIO_TRACING +#ifdef SYSIO_TRACING /* * Initialize tracing callback queues. */ @@ -210,12 +210,12 @@ _sysio_shutdown() _sysio_unmount_all() == 0)) abort(); -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY _sysio_fd_shutdown(); _sysio_i_shutdown(); _sysio_fssw_shutdown(); _sysio_access_shutdown(); -#if SYSIO_TRACING +#ifdef SYSIO_TRACING { struct trace_callback *tcb; @@ -231,7 +231,7 @@ _sysio_shutdown() #endif } -#if SYSIO_TRACING +#ifdef SYSIO_TRACING #if !(defined(_HAVE_ASPRINTF) && _HAVE_ASPRINTF) /* @@ -927,7 +927,7 @@ do_command(char *buf) return -EINVAL; } -#if SYSIO_TRACING +#ifdef SYSIO_TRACING /* * Set/Unset tracing. */ @@ -1039,7 +1039,7 @@ _sysio_boot_namespace(const char *arg) if (err) break; } -#if SYSIO_TRACING +#ifdef SYSIO_TRACING if (err) _sysio_cprintf("+NS init+ failed at expr %u (last = %s): %s\n", count, @@ -1050,7 +1050,7 @@ _sysio_boot_namespace(const char *arg) return err; } -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD /* * Set deferred initial working directory. */ @@ -1070,11 +1070,11 @@ int _sysio_boot(const char *opt, const char *arg) { struct option_value_info vec[] = { -#if SYSIO_TRACING +#ifdef SYSIO_TRACING { "trace", NULL }, /* tracing? */ #endif { "namespace", NULL }, /* init namespace? */ -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD { "cwd", NULL }, /* init working dir */ #endif { NULL, NULL } @@ -1082,11 +1082,11 @@ _sysio_boot(const char *opt, const char struct option_value_info *v; unsigned u; static int (*f[])(const char *) = { -#if SYSIO_TRACING +#ifdef SYSIO_TRACING _sysio_boot_tracing, #endif _sysio_boot_namespace, -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD _sysio_boot_cwd, #endif NULL /* can't happen */ Index: inode.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -w -b -B -p -r1.26 -r1.27 --- inode.c 30 Apr 2007 16:52:20 -0000 1.26 +++ inode.c 1 May 2007 16:33:53 -0000 1.27 @@ -101,7 +101,7 @@ static size_t max_names = (2 * NAMES_TAB */ #define PNODES_PER_CHUNK ((8 * 1024) / sizeof(struct pnode) - 2) -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY /* * Allocation information for pnodes bulk allocation. */ @@ -142,7 +142,7 @@ _sysio_i_init() for (i = 0; i < NAMES_TABLE_LEN; i++) LIST_INIT(&names[i]); -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY LIST_INIT(&pnblocks); #endif TAILQ_INIT(&_sysio_pnodes); @@ -477,12 +477,12 @@ static void more_pnodes() { size_t n; -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY struct pnodes_block *pnblk; #endif struct pnode *pno; -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY pnblk = malloc(sizeof(struct pnodes_block)); pno = NULL; if (pnblk) { @@ -501,7 +501,7 @@ more_pnodes() } while (--n); } -#if ZERO_SUM_MEMORY +#ifdef ZERO_SUM_MEMORY /* * Shutdown */ Index: lseek.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -b -B -p -r1.28 -r1.29 --- lseek.c 30 Apr 2007 16:52:20 -0000 1.28 +++ lseek.c 1 May 2007 16:33:53 -0000 1.29 @@ -118,7 +118,7 @@ _sysio_lseek(struct file *fil, return pos; } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE #undef lseek64 extern off64_t @@ -202,7 +202,7 @@ SYSIO_INTERFACE_NAME(llseek)(unsigned in fil = _sysio_fd_find(fd); if (!fil) SYSIO_INTERFACE_RETURN(-1, -EBADF, llseek, NULL); -#if !_LARGEFILE64_SOURCE +#ifndef _LARGEFILE64_SOURCE if (offset_high) { /* * We are using 32-bit internals. This just isn't Index: mount.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/mount.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -w -b -B -p -r1.22 -r1.23 --- mount.c 30 Apr 2007 16:52:20 -0000 1.22 +++ mount.c 1 May 2007 16:33:53 -0000 1.23 @@ -276,7 +276,7 @@ _sysio_mount_root(const char *source, return err; _sysio_root = mnt->mnt_root; -#if !DEFER_INIT_CWD +#ifndef DEFER_INIT_CWD /* * It is very annoying to have to set the current working directory. * So... If it isn't set, make it the root now. Index: namei.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/namei.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -w -b -B -p -r1.25 -r1.26 --- namei.c 30 Apr 2007 16:52:20 -0000 1.25 +++ namei.c 1 May 2007 16:33:53 -0000 1.26 @@ -191,7 +191,7 @@ _sysio_path_walk(struct pnode *parent, s parent = nd->nd_root; } -#if DEFER_INIT_CWD +#ifdef DEFER_INIT_CWD if (!parent) { const char *icwd; Index: rw.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/rw.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -w -b -B -p -r1.20 -r1.21 --- rw.c 1 May 2007 15:53:05 -0000 1.20 +++ rw.c 1 May 2007 16:33:53 -0000 1.21 @@ -240,7 +240,7 @@ _sysio_iiox(int writing, */ cc = _sysio_validx(xtv, xtv_count, iov, iov_count, -#if _LARGEFILE64_SOURCE && defined(O_LARGEFILE) +#if defined(_LARGEFILE64_SOURCE) && defined(O_LARGEFILE) (fil->f_flags & O_LARGEFILE) ? LONG_MAX : @@ -396,13 +396,13 @@ _do_iiox(int fd, const struct iovec *iov, size_t iov_count, const struct xtvec *xtv, size_t xtv_count) { -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE struct intnl_xtvec *myixtv, *ixtv; size_t n; #endif ioid_t ioid; -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE myixtv = malloc(xtv_count * sizeof(struct intnl_xtvec)); if (myixtv == NULL) return IOID_FAIL; @@ -416,7 +416,7 @@ _do_iiox(int fd, iov, iov_count, NULL, myixtv, xtv_count, free_arg, NULL); -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE if (ioid == IOID_FAIL) free(myixtv); #endif @@ -441,7 +441,7 @@ SYSIO_INTERFACE_NAME(iwritex)(int fd, return _do_iiox(fd, _do_iwritex, iov, iov_count, xtv, xtv_count); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE /* * Perform 64-bit extended IO. */ @@ -592,7 +592,7 @@ _do_ipiov(int fd, return ioid; } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE ioid_t SYSIO_INTERFACE_NAME(ipread64v)(int fd, const struct iovec *iov, size_t count, @@ -652,7 +652,7 @@ _do_piov(int fd, return SYSIO_INTERFACE_NAME(iowait)(ioid); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE ssize_t SYSIO_INTERFACE_NAME(pread64v)(int fd, const struct iovec *iov, size_t count, @@ -718,7 +718,7 @@ _do_ipio(int fd, return ioid; } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE ioid_t SYSIO_INTERFACE_NAME(ipread64)(int fd, void *buf, size_t count, @@ -778,7 +778,7 @@ _do_pio(int fd, return SYSIO_INTERFACE_NAME(iowait)(ioid); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE ssize_t SYSIO_INTERFACE_NAME(pread64)(int fd, void *buf, size_t count, off64_t offset) { Index: stat.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/stat.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -w -b -B -p -r1.18 -r1.19 --- stat.c 30 Apr 2007 16:52:20 -0000 1.18 +++ stat.c 1 May 2007 16:33:53 -0000 1.19 @@ -121,7 +121,7 @@ out: SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, xstatnd, stat_buf); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE #ifndef REDSTORM #undef fstat64 @@ -200,7 +200,7 @@ SYSIO_INTERFACE_NAME(lstat64)(const char #undef __xstat #undef __lxstat -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE static void convstat(struct stat64 *st64_buf, struct stat *st_buf) { @@ -228,17 +228,17 @@ PREPEND(__, SYSIO_INTERFACE_NAME(fxstat) { struct intnl_stat *buf; int err; -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE struct stat64 st64; #endif -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE buf = &st64; #else buf = __stat_buf; #endif err = _sysio_fxstat(__ver, __fildes, buf); -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE if (!err) convstat(buf, __stat_buf); #endif @@ -278,17 +278,17 @@ PREPEND(__, SYSIO_INTERFACE_NAME(xstat)) { struct intnl_stat *buf; int err; -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE struct stat64 st64; #endif -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE buf = &st64; #else buf = __stat_buf; #endif err = _sysio_xstatnd(__ver, __filename, buf, 0); -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE if (!err) convstat(buf, __stat_buf); #endif @@ -329,17 +329,17 @@ PREPEND(__, SYSIO_INTERFACE_NAME(lxstat) { struct intnl_stat *buf; int err; -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE struct stat64 st64; #endif -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE buf = &st64; #else buf = __stat_buf; #endif err = _sysio_xstatnd(__ver, __filename, buf, ND_NOFOLLOW); -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE if (!err) convstat(buf, __stat_buf); #endif Index: truncate.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -b -B -p -r1.16 -r1.17 --- truncate.c 30 Apr 2007 16:52:20 -0000 1.16 +++ truncate.c 1 May 2007 16:33:53 -0000 1.17 @@ -102,7 +102,7 @@ out: SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, truncate, 0); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE #undef truncate64 sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(truncate)), SYSIO_INTERFACE_NAME(truncate64)) @@ -139,7 +139,7 @@ out: SYSIO_INTERFACE_RETURN(err ? -1 : 0, err, ftruncate, 0); } -#if _LARGEFILE64_SOURCE +#ifdef _LARGEFILE64_SOURCE #undef ftruncate64 sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(ftruncate)), SYSIO_INTERFACE_NAME(ftruncate64)) |
