pkgs/tools/package-management/checkinstall/scandir.patch

   1 diff -rc -x '*~' checkinstall-1.6.2-orig/installwatch/installwatch.c checkinstall-1.6.2/installwatch/installwatch.c
   2 *** checkinstall-1.6.2-orig/installwatch/installwatch.c 2008-11-16 17:20:53.000000000 +0100
   3 --- checkinstall-1.6.2/installwatch/installwatch.c      2010-02-08 16:35:17.000000000 +0100
   4 ***************
   5 *** 100,106 ****
   6   static int (*true_lxstat)(int,const char *,struct stat *);
   7   static int (*true_scandir)(   const char *,struct dirent ***,
   8                                 int (*)(const struct dirent *),
   9 !                               int (*)(const void *,const void *));
  10   static int (*true_symlink)(const char *, const char *);
  11   static int (*true_truncate)(const char *, TRUNCATE_T);
  12   static int (*true_unlink)(const char *);
  13 --- 100,106 ----
  14   static int (*true_lxstat)(int,const char *,struct stat *);
  15   static int (*true_scandir)(   const char *,struct dirent ***,
  16                                 int (*)(const struct dirent *),
  17 !                               int (*)(const struct dirent **,const struct dirent **));
  18   static int (*true_symlink)(const char *, const char *);
  19   static int (*true_truncate)(const char *, TRUNCATE_T);
  20   static int (*true_unlink)(const char *);
  21 ***************
  22 *** 120,126 ****
  23   static struct dirent64 *(*true_readdir64)(DIR *dir);
  24   static int (*true_scandir64)( const char *,struct dirent64 ***,
  25                                 int (*)(const struct dirent64 *),
  26 !                               int (*)(const void *,const void *));
  27   static int (*true_xstat64)(int,const char *, struct stat64 *);
  28   static int (*true_lxstat64)(int,const char *, struct stat64 *);
  29   static int (*true_truncate64)(const char *, __off64_t);
  30 --- 120,126 ----
  31   static struct dirent64 *(*true_readdir64)(DIR *dir);
  32   static int (*true_scandir64)( const char *,struct dirent64 ***,
  33                                 int (*)(const struct dirent64 *),
  34 !                               int (*)(const struct dirent64 **,const struct dirent64 **));
  35   static int (*true_xstat64)(int,const char *, struct stat64 *);
  36   static int (*true_lxstat64)(int,const char *, struct stat64 *);
  37   static int (*true_truncate64)(const char *, __off64_t);
  38 ***************
  39 *** 3077,3085 ****
  40         return result;
  41   }
  42
  43 ! int scandir(  const char *dir,struct dirent ***namelist,
  44                 int (*select)(const struct dirent *),
  45 !               int (*compar)(const void *,const void *)        ) {
  46         int result;
  47
  48         if (!libc_handle)
  49 --- 3077,3085 ----
  50         return result;
  51   }
  52
  53 ! int scandir(  const char * dir,struct dirent ***namelist,
  54                 int (*select)(const struct dirent *),
  55 !               int (*compar)(const struct dirent **,const struct dirent **)    ) {
  56         int result;
  57
  58         if (!libc_handle)
  59 ***************
  60 *** 3691,3697 ****
  61
  62   int scandir64(        const char *dir,struct dirent64 ***namelist,
  63                 int (*select)(const struct dirent64 *),
  64 !               int (*compar)(const void *,const void *)        ) {
  65         int result;
  66
  67         if (!libc_handle)
  68 --- 3691,3697 ----
  69
  70   int scandir64(        const char *dir,struct dirent64 ***namelist,
  71                 int (*select)(const struct dirent64 *),
  72 !               int (*compar)(const struct dirent64 **,const struct dirent64 **)        ) {
  73         int result;
  74
  75         if (!libc_handle)