package/util-linux/patches/100-llseek.patch

   1 Index: util-linux-2.12r/fdisk/llseek.c
   2 ===================================================================
   3 --- util-linux-2.12r.orig/fdisk/llseek.c        2007-06-04 13:22:28.258559328 +0200
   4 +++ util-linux-2.12r/fdisk/llseek.c     2007-06-04 13:22:28.339547016 +0200
   5 @@ -29,16 +29,10 @@
   6  static int _llseek (unsigned int, unsigned long,
   7                    unsigned long, long long *, unsigned int);
   8
   9 -#ifdef __NR__llseek
  10 -
  11 -static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
  12 -                unsigned long, offset_low,long long *,result,
  13 -                unsigned int, origin)
  14 -
  15 -#else
  16 +#ifndef __NR__llseek
  17
  18  /* no __NR__llseek on compilation machine - might give it explicitly */
  19 -static int _llseek (unsigned int fd, unsigned long oh,
  20 +static int __llseek (unsigned int fd, unsigned long oh,
  21                     unsigned long ol, long long *result,
  22                     unsigned int origin) {
  23         errno = ENOSYS;
  24 @@ -47,17 +41,8 @@
  25
  26  #endif
  27
  28 -static long long my_llseek (unsigned int fd, long long offset,
  29 -               unsigned int origin)
  30 -{
  31 -       long long result;
  32 -       int retval;
  33 -
  34 -       retval = _llseek (fd, ((unsigned long long) offset) >> 32,
  35 -                       ((unsigned long long) offset) & 0xffffffff,
  36 -                       &result, origin);
  37 -       return (retval == -1 ? (long long) retval : result);
  38 -}
  39 +extern long long llseek(unsigned int fd, long long offset, unsigned int origin);
  40 +#define my_llseek llseek
  41
  42  #endif /* __alpha__ */
  43
  44 Index: util-linux-2.12r/fdisk/sfdisk.c
  45 ===================================================================
  46 --- util-linux-2.12r.orig/fdisk/sfdisk.c        2007-06-04 13:22:28.265558264 +0200
  47 +++ util-linux-2.12r/fdisk/sfdisk.c     2007-06-04 13:22:28.338547168 +0200
  48 @@ -176,12 +176,6 @@
  49  #define use_lseek
  50  #endif
  51
  52 -#ifndef use_lseek
  53 -static __attribute__used
  54 -_syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
  55 -       loff_t *, res, unsigned int, wh);
  56 -#endif
  57 -
  58  static int
  59  sseek(char *dev, unsigned int fd, unsigned long s) {
  60      loff_t in, out;
  61 Index: util-linux-2.12r/partx/partx.c
  62 ===================================================================
  63 --- util-linux-2.12r.orig/partx/partx.c 2007-06-04 13:22:28.272557200 +0200
  64 +++ util-linux-2.12r/partx/partx.c      2007-06-04 13:22:28.339547016 +0200
  65 @@ -339,9 +339,6 @@
  66
  67  #ifdef NEED__llseek
  68  #include <linux/unistd.h>       /* _syscall */
  69 -static
  70 -_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
  71 -         long long *, res, uint, wh);
  72  #endif
  73
  74  static int