[Libsysio-commit] RedStorm: libsysio/src getdirentries.c lseek.c read.c stat64.c truncate.c write.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22549/src

Modified Files:
      Tag: RedStorm
	getdirentries.c lseek.c read.c stat64.c truncate.c write.c 
Log Message:


-Fix prototype for getdirentries for Red Storm
-Remove entry point for llseek in the core. That was goofy. Linux
	defines it as a syscall but there is no entry in libc.
-Move __USE_LARGEFILE64 to _LARGEFILE64_SOURCE; We only want the
	xxx64() routines if asked explicitly.
-Fix driver/native/fs_native.c _LARGEFILE64_SOURCE defines. The symbol
	is always defined. The test should be whether it is true/false not
	just defined.
-Fix driver/native/fs_native.c to use SYS_lseek if SYS__llseek is not
	present. The 64-bit machines don't seem to use that interface.


Index: getdirentries.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/getdirentries.c,v
retrieving revision 1.1.10.3
retrieving revision 1.1.10.4
diff -u -w -b -B -p -r1.1.10.3 -r1.1.10.4
--- getdirentries.c	27 Sep 2003 23:01:23 -0000	1.1.10.3
+++ getdirentries.c	29 Sep 2003 14:57:01 -0000	1.1.10.4
@@ -46,7 +46,7 @@ _getdirentries64(int fd,
 	return cc;
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef getdirentries64
 sysio_sym_strong_alias(_getdirentries64, getdirentries64)
 #endif

Index: lseek.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/lseek.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -u -w -b -B -p -r1.4.4.3 -r1.4.4.4
--- lseek.c	27 Sep 2003 23:01:23 -0000	1.4.4.3
+++ lseek.c	29 Sep 2003 14:57:01 -0000	1.4.4.4
@@ -103,7 +103,7 @@ out:
 	return fil->f_pos = off;
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef lseek64
 sysio_sym_weak_alias(_sysio_lseek, lseek64)
 #ifdef __GLIBC__
@@ -136,6 +136,7 @@ lseek(int fd, off_t offset, int whence)
 sysio_sym_weak_alias(lseek, __lseek)
 #endif
 
+#if 0
 #ifdef __linux__
 #undef llseek
 int
@@ -155,4 +156,5 @@ llseek(unsigned int fd __IS_UNUSED,
 
 #undef __llseek
 sysio_sym_weak_alias(llseek, __llseek)
+#endif
 #endif

Index: read.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/read.c,v
retrieving revision 1.2.10.2
retrieving revision 1.2.10.3
diff -u -w -b -B -p -r1.2.10.2 -r1.2.10.3
--- read.c	27 Sep 2003 23:01:23 -0000	1.2.10.2
+++ read.c	29 Sep 2003 14:57:01 -0000	1.2.10.3
@@ -156,7 +156,7 @@ _pread(int fd, void *buf, size_t count, 
 	return iowait(ioid);
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef pread64
 sysio_sym_weak_alias(_pread, pread64)
 
@@ -233,7 +233,7 @@ read(int fd, void *buf, size_t count)
 sysio_sym_weak_alias(read, __read)
 #endif
 
-#if __USE_LARGEFILE
+#if _LARGEFILE64_SOURCE
 #undef read64
 sysio_sym_weak_alias(read, read64)
 #endif

Index: stat64.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/stat64.c,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -u -w -b -B -p -r1.3.6.2 -r1.3.6.3
--- stat64.c	27 Sep 2003 23:01:24 -0000	1.3.6.2
+++ stat64.c	29 Sep 2003 14:57:01 -0000	1.3.6.3
@@ -166,4 +166,4 @@ lstat64(const char *filename, struct sta
 
 	return __lxstat64(_STAT_VER, filename, buf);
 }
-#endif /* !__USE_LARGEFILE64 */
+#endif /* !_LARGEFILE64_SOURCE */

Index: truncate.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/truncate.c,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -w -b -B -p -r1.3.6.1 -r1.3.6.2
--- truncate.c	27 Sep 2003 23:01:24 -0000	1.3.6.1
+++ truncate.c	29 Sep 2003 14:57:01 -0000	1.3.6.2
@@ -97,7 +97,7 @@ out:
 	return err;
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef truncate64
 sysio_sym_weak_alias(_truncate, truncate64)
 
@@ -134,7 +134,7 @@ out:
 	return err;
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef ftruncate64
 sysio_sym_weak_alias(_ftruncate, ftruncate64)
 

Index: write.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/write.c,v
retrieving revision 1.2.12.2
retrieving revision 1.2.12.3
diff -u -w -b -B -p -r1.2.12.2 -r1.2.12.3
--- write.c	27 Sep 2003 23:01:24 -0000	1.2.12.2
+++ write.c	29 Sep 2003 14:57:01 -0000	1.2.12.3
@@ -156,7 +156,7 @@ _pwrite(int fd, const void *buf, size_t 
 	return iowait(ioid);
 }
 
-#if __USE_LARGEFILE64
+#if _LARGEFILE64_SOURCE
 #undef pwrite64
 sysio_sym_weak_alias(_pwrite, pwrite64)
 
@@ -233,7 +233,7 @@ write(int fd, const void *buf, size_t co
 sysio_sym_weak_alias(write, __write)
 #endif
 
-#if __USE_LARGEFILE
+#if _LARGEFILE64_SOURCE
 #undef write64
 sysio_sym_weak_alias(write, write64)
 #endif