Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
checkinstall
checkinstall-scandir.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File checkinstall-scandir.patch of Package checkinstall
Index: installwatch/installwatch.c =================================================================== --- installwatch/installwatch.c.orig +++ installwatch/installwatch.c @@ -88,7 +88,7 @@ static int (*true_xmknod)(int ver,const static int (*true_open)(const char *, int, ...); static DIR *(*true_opendir)(const char *); static struct dirent *(*true_readdir)(DIR *dir); -#if (GLIBC_MINOR <= 4) +#if (__GLIBC_MINOR__ < 4) || (__GLIBC_MINOR__ == 4 && defined(__i386)) static int (*true_readlink)(const char*,char *,size_t); #else static ssize_t (*true_readlink)(const char*,char *,size_t); @@ -100,7 +100,11 @@ static int (*true_xstat)(int,const char static int (*true_lxstat)(int,const char *,struct stat *); static int (*true_scandir)( const char *,struct dirent ***, int (*)(const struct dirent *), +#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10 int (*)(const void *,const void *)); +#else + int (*)(const struct dirent**,const struct dirent **)); +#endif static int (*true_symlink)(const char *, const char *); static int (*true_truncate)(const char *, TRUNCATE_T); static int (*true_unlink)(const char *); @@ -111,7 +115,7 @@ static int (*true_setxattr)(const char * size_t, int); static int (*true_removexattr)(const char *,const char *); -#if(GLIBC_MINOR >= 1) +#if(__GLIBC_MINOR__ >= 1) static int (*true_creat64)(const char *, __mode_t); static FILE *(*true_fopen64)(const char *,const char *); @@ -120,14 +124,18 @@ static int (*true_open64)(const char *, static struct dirent64 *(*true_readdir64)(DIR *dir); static int (*true_scandir64)( const char *,struct dirent64 ***, int (*)(const struct dirent64 *), +#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10 int (*)(const void *,const void *)); +#else + int (*)(const struct dirent64 **,const struct dirent64 **)); +#endif static int (*true_xstat64)(int,const char *, struct stat64 *); static int (*true_lxstat64)(int,const char *, struct stat64 *); static int (*true_truncate64)(const char *, __off64_t); #endif -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) static int (*true_openat)(int, const char *, int, ...); static int (*true_fchmodat)(int, const char *, mode_t, int); static int (*true_fchownat)(int, const char *, uid_t, gid_t, int); @@ -160,7 +168,7 @@ static inline int true_lstat(const char return true_lxstat(_STAT_VER,pathname,info); } -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) static inline int true_fstatat(int dirfd, const char *pathname, struct stat *info, int flags) { return true_fxstatat(_STAT_VER, dirfd, pathname, info, flags); } @@ -267,7 +275,7 @@ int parse_suffix(char *,char *,const cha #if DEBUG static int __instw_printdirent(struct dirent*); -#if(GLIBC_MINOR >= 1) +#if(__GLIBC_MINOR__ >= 1) static int __instw_printdirent64(struct dirent64*); #endif #endif @@ -285,7 +293,7 @@ static int instw_delete(instw_t *); static int instw_setmetatransl(instw_t *); static int instw_setpath(instw_t *,const char *); -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) static int instw_setpathrel(instw_t *, int, const char *); #endif static int instw_getstatus(instw_t *,int *); @@ -374,7 +382,7 @@ static void initialize(void) { -#if(GLIBC_MINOR >= 1) +#if(__GLIBC_MINOR__ >= 1) true_creat64 = dlsym(libc_handle, "creat64"); true_fopen64 = dlsym(libc_handle, "fopen64"); true_ftruncate64 = dlsym(libc_handle, "ftruncate64"); @@ -387,7 +395,7 @@ static void initialize(void) { true_removexattr = dlsym(libc_handle, "removexattr"); #endif -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) true_openat = dlsym(libc_handle, "openat"); true_fchmodat = dlsym(libc_handle, "fchmodat"); @@ -1669,7 +1677,7 @@ static int instw_setpath(instw_t *instw, * returns = / 0 ok. path set * -1 failed. cf errno / */ -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) static int instw_setpathrel(instw_t *instw, int dirfd, const char *relpath) { /* This constant should be large enough to make a string that holds @@ -2940,7 +2948,7 @@ struct dirent *readdir(DIR *dir) { return result; } -#if (GLIBC_MINOR <= 4) +#if (__GLIBC_MINOR__ < 4) || (__GLIBC_MINOR__ == 4 && defined(__i386)) int readlink(const char *path,char *buf,size_t bufsiz) { int result; #else @@ -3081,7 +3089,11 @@ int rmdir(const char *pathname) { int scandir( const char *dir,struct dirent ***namelist, int (*select)(const struct dirent *), +#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10 int (*compar)(const void *,const void *) ) { +#else + int (*compar)(const struct dirent **,const struct dirent **) ) { +#endif int result; if (!libc_handle) @@ -3496,7 +3508,7 @@ int removexattr (const char *pathname, c return result; } -#if(GLIBC_MINOR >= 1) +#if(__GLIBC_MINOR__ >= 1) int creat64(const char *pathname, __mode_t mode) { /* Is it a system call? */ @@ -3694,7 +3706,11 @@ struct dirent64 *readdir64(DIR *dir) { int scandir64( const char *dir,struct dirent64 ***namelist, int (*select)(const struct dirent64 *), +#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10 int (*compar)(const void *,const void *) ) { +#else + int (*compar)(const struct dirent64 **,const struct dirent64 **) ) { +#endif int result; if (!libc_handle) @@ -3837,7 +3853,7 @@ int truncate64(const char *path, __off64 return result; } -#endif /* GLIBC_MINOR >= 1 */ +#endif /* __GLIBC_MINOR__ >= 1 */ /*********************************************** @@ -3857,7 +3873,7 @@ int truncate64(const char *path, __off64 * Thanks to Gilbert Ashley for his work on this! */ -#if (GLIBC_MINOR >= 4) +#if (__GLIBC_MINOR__ >= 4) int openat (int dirfd, const char *path, int flags, ...) { mode_t mode = 0; @@ -4523,4 +4539,4 @@ int unlinkat (int dirfd, const char *pat } -#endif /* GLIBC_MINOR >= 4 */ +#endif /* __GLIBC_MINOR__ >= 4 */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor