Attachment 7004 Details for Bug 8525 – v3-6-test.patch

[patch] v3-6-test.patch

fseek.patch (text/plain), 3.12 KB, created by Guenther Deschner on 2011-10-17 09:19:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2011-10-17 09:19:12 UTC

Size: 3.12 KB

patch

obsolete

>From d810ada39c584fd2a543f41fb3a121520ab0764e Mon Sep 17 00:00:00 2001
>From: Brad Smith <brad@comstyle.com>
>Date: Wed, 12 Oct 2011 04:23:58 -0400
>Subject: [PATCH] Fix sys_fseek wrapper
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: GÃ¼nther Deschner <gd@samba.org>
>---
> source3/configure.in |    2 +-
> source3/lib/system.c |    2 ++
> source3/wscript      |    4 ++--
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/source3/configure.in b/source3/configure.in
>index 7405cfd..7780603 100644
>--- a/source3/configure.in
>+++ b/source3/configure.in
>@@ -1085,7 +1085,7 @@ AC_CHECK_FUNCS(getgrset)
> AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
> AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
> AC_CHECK_FUNCS(fallocate fallocate64)
>-AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
>+AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
> AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
> AC_CHECK_FUNCS(fdopendir fdopendir64)
> AC_CHECK_FUNCS(getpwent_r)
>diff --git a/source3/lib/system.c b/source3/lib/system.c
>index 0aefd6d..45fe77e 100644
>--- a/source3/lib/system.c
>+++ b/source3/lib/system.c
>@@ -734,6 +734,8 @@ int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence)
> 	return fseek64(fp, offset, whence);
> #elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO64)
> 	return fseeko64(fp, offset, whence);
>+#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO)
>+	return fseeko(fp, offset, whence);
> #else
> 	return fseek(fp, offset, whence);
> #endif
>diff --git a/source3/wscript b/source3/wscript
>index 82434a5..6717852 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -82,7 +82,7 @@ def configure(conf):
>     conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
>     conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
>     conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
>-    conf.CHECK_FUNCS('fseek64 fseeko64 ftell64 ftello64 setluid')
>+    conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
>     conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
>     conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')
>     conf.CHECK_FUNCS('fdopendir fdopendir64')
>@@ -234,7 +234,7 @@ extattr_get_link extattr_list_fd extattr_list_file extattr_list_link
> extattr_set_fd extattr_set_file extattr_set_link _facl __facl _fchdir
> __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
> fdelproplist fgetea fgetproplist fgetxattr flistea flistxattr fopen64
>-_fork __fork fremoveea fremovexattr fseek64 fseeko64 fsetea
>+_fork __fork fremoveea fremovexattr fseeko fseek64 fseeko64 fsetea
> fsetproplist fsetxattr _fstat __fstat fstat64 _fstat64 __fstat64 fsync
> ftell64 ftello64 ftruncate64 futimens futimes __fxstat getauthuid
> getcwd _getcwd __getcwd getdents __getdents getdents64 getdirentries
>-- 
>1.7.6.4
>

Flags:

metze: review+

Actions: View

Attachments on bug 8525: 6998 | 7001 | 7004