diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/i486/bits/string.h | 234 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/bits/mathinline.h | 2 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/s_exp2.c | 4 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/s_exp2f.c | 4 | ||||
| -rw-r--r-- | sysdeps/m68k/fpu/s_exp2l.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/cthreads.c | 18 | ||||
| -rw-r--r-- | sysdeps/posix/pread.c | 56 | ||||
| -rw-r--r-- | sysdeps/posix/pwrite.c | 56 | ||||
| -rw-r--r-- | sysdeps/stub/pread.c | 43 | ||||
| -rw-r--r-- | sysdeps/stub/pwrite.c | 43 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/scsi/sg.h | 59 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/mman.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 2 |
14 files changed, 357 insertions, 173 deletions
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index 28ca38315e..ef808d2e7d 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -368,7 +368,7 @@ __strlen_g (__const char *__str) #define _HAVE_STRING_ARCH_strcpy 1 #define strcpy(dest, src) \ (__extension__ (__builtin_constant_p (src) \ - ? (sizeof (src[0]) == 1 && strlen (src) + 1 <= 8 \ + ? (sizeof ((src)[0]) == 1 && strlen (src) + 1 <= 8 \ ? __strcpy_small (dest, src, strlen (src) + 1) \ : (char *) memcpy (dest, src, strlen (src) + 1)) \ : __strcpy_g (dest, src))) @@ -800,18 +800,40 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) #define _HAVE_STRING_ARCH_strcmp 1 #define strcmp(s1, s2) \ (__extension__ (__builtin_constant_p (s1) && __builtin_constant_p (s2) \ - && (sizeof (s1)[0] != 1 || strlen (s1) >= 4) \ - && (sizeof (s2)[0] != 1 || strlen (s2) >= 4) \ + && (sizeof ((s1)[0]) != 1 || strlen (s1) >= 4) \ + && (sizeof ((s2)[0]) != 1 || strlen (s2) >= 4) \ ? memcmp (s1, s2, (strlen (s1) < strlen (s2) \ ? strlen (s1) : strlen (s2)) + 1) \ - : (__builtin_constant_p (s1) && sizeof (s1)[0] == 1 \ - && sizeof (s2)[0] == 1 && strlen (s1) < 4 \ - ? __strcmp_cg (s1, s2, strlen (s1)) \ - : (__builtin_constant_p (s2) && sizeof (s1)[0] == 1 \ - && sizeof (s2)[0] == 1 && strlen (s2) < 4 \ - ? __strcmp_gc (s1, s2, strlen (s2)) \ + : (__builtin_constant_p (s1) && sizeof ((s1)[0]) == 1 \ + && sizeof ((s2)[0]) == 1 && strlen (s1) < 4 \ + ? (__builtin_constant_p (s2) && sizeof ((s2)[0]) == 1 \ + ? __strcmp_cc (s1, s2, strlen (s1)) \ + : __strcmp_cg (s1, s2, strlen (s1))) \ + : (__builtin_constant_p (s2) && sizeof ((s1)[0]) == 1 \ + && sizeof ((s2)[0]) == 1 && strlen (s2) < 4 \ + ? (__builtin_constant_p (s1) \ + ? __strcmp_cc (s1, s2, strlen (s2)) \ + : __strcmp_gc (s1, s2, strlen (s2))) \ : __strcmp_gg (s1, s2))))) +#define __strcmp_cc(s1, s2, l) \ + (__extension__ ({ register int __result = ((unsigned char) (s1)[0] \ + - (unsigned char) (s2)[0]); \ + if (l > 0 && __result == 0) \ + { \ + __result = ((unsigned char) (s1)[1] \ + - (unsigned char) (s2)[1]); \ + if (l > 1 && __result == 0) \ + { \ + __result = ((unsigned char) (s1)[2] \ + - (unsigned char) (s2)[2]); \ + if (l > 2 && __result == 0) \ + __result = ((unsigned char) (s1)[3] \ + - (unsigned char) (s2)[3]); \ + } \ + } \ + __result; })) + #define __strcmp_cg(s1, s2, l1) \ (__extension__ ({ __const unsigned char *__s2 = (unsigned char *) (s2); \ register int __result = (unsigned char) (s1)[0] - __s2[0];\ @@ -1076,32 +1098,28 @@ __strcspn_c1 (__const char *__s, int __reject) return (__res - 1) - __s; } -#ifdef __PIC__ __STRING_INLINE size_t __strcspn_cg (__const char *__s, __const char __reject[], size_t __reject_len) { register __const char *__res; - int __mem; __asm__ __volatile__ - ("movl %%ebx,%1\n\t" - "movl %%ecx,%%ebx\n\t" - "cld\n" + ("cld\n" "1:\n\t" "lodsb\n\t" "testb %%al,%%al\n\t" "je 2f\n\t" - "movl %4,%%edi\n\t" - "movl %%ebx,%%ecx\n\t" + "movl %2,%%edi\n\t" + "movl %3,%%ecx\n\t" "repne; scasb\n\t" "jne 1b\n" - "2:\n\t" - "movl %1,%%ebx" - : "=S" (__res), "=&m" (__mem) - : "c" (__reject_len), "0" (__s), "r" (__reject), "1" (__mem) + "2:" + : "=S" (__res) + : "0" (__s), "d" (__reject), "g" (__reject_len) : "ax", "cx", "di", "cc"); return (__res - 1) - __s; } +#ifdef __PIC__ __STRING_INLINE size_t __strcspn_g (__const char *__s, __const char *__reject) { @@ -1131,27 +1149,6 @@ __strcspn_g (__const char *__s, __const char *__reject) } #else __STRING_INLINE size_t -__strcspn_cg (__const char *__s, __const char __reject[], size_t __reject_len) -{ - register __const char *__res; - __asm__ __volatile__ - ("cld\n" - "1:\n\t" - "lodsb\n\t" - "testb %%al,%%al\n\t" - "je 2f\n\t" - "movl %%ebx,%%edi\n\t" - "movl %%edx,%%ecx\n\t" - "repne; scasb\n\t" - "jne 1b\n" - "2:" - : "=S" (__res) - : "d" (__reject_len), "0" (__s), "b" (__reject) - : "ax", "cx", "di", "cc"); - return (__res - 1) - __s; -} - -__STRING_INLINE size_t __strcspn_g (__const char *__s, __const char *__reject) { register __const char *__res; @@ -1199,40 +1196,35 @@ __strspn_c1 (__const char *__s, int __accept) "movb (%0),%%al\n\t" "leal 1(%0),%0\n\t" "cmpb %%ah,%%al\n\t" - "je 1b\n" - "2:" + "je 1b" : "=r" (__res) : "a" (__accept), "0" (__s) : "ax", "cc"); return (__res - 1) - __s; } -#ifdef __PIC__ __STRING_INLINE size_t __strspn_cg (__const char *__s, __const char __accept[], size_t __accept_len) { register __const char *__res; - int __mem; __asm__ __volatile__ - ("movl %%ebx,%1\n\t" - "movl %%ecx,%%ebx\n\t" - "cld\n" + ("cld\n" "1:\n\t" "lodsb\n\t" "testb %%al,%%al\n\t" "je 2f\n\t" - "movl %%edx,%%edi\n\t" - "movl %%ebx,%%ecx\n\t" + "movl %2,%%edi\n\t" + "movl %3,%%ecx\n\t" "repne; scasb\n\t" "je 1b\n" - "2:\n\t" - "movl %1,%%ebx" - : "=S" (__res), "=m" (__mem) - : "c" (__accept_len), "0" (__s), "d" (__accept), "1" (__mem) + "2:" + : "=S" (__res) + : "0" (__s), "d" (__accept), "g" (__accept_len) : "ax", "cx", "di", "cc"); return (__res - 1) - __s; } +#ifdef __PIC__ __STRING_INLINE size_t __strspn_g (__const char *__s, __const char *__accept) { @@ -1262,27 +1254,6 @@ __strspn_g (__const char *__s, __const char *__accept) } #else __STRING_INLINE size_t -__strspn_cg (__const char *__s, __const char __accept[], size_t __accept_len) -{ - register __const char *__res; - __asm__ __volatile__ - ("cld\n" - "1:\n\t" - "lodsb\n\t" - "testb %%al,%%al\n\t" - "je 2f\n\t" - "movl %%ebx,%%edi\n\t" - "movl %%edx,%%ecx\n\t" - "repne; scasb\n\t" - "je 1b\n" - "2:" - : "=S" (__res) - : "d" (__accept_len), "0" (__s), "b" (__accept), "D" (__accept) - : "ax", "cx", "dx", "di", "cc"); - return (__res - 1) - __s; -} - -__STRING_INLINE size_t __strspn_g (__const char *__s, __const char *__accept) { register __const char *__res; @@ -1319,36 +1290,32 @@ __strspn_g (__const char *__s, __const char *__accept) : __strpbrk_cg (s, accept, strlen (accept)))) \ : __strpbrk_g (s, accept))) -#ifdef __PIC__ __STRING_INLINE char * __strpbrk_cg (__const char *__s, __const char __accept[], size_t __accept_len) { register char *__res; - int __mem; __asm__ __volatile__ - ("movl %%ebx,%1\n\t" - "movl %%ecx,%%ebx\n\t" - "cld\n" + ("cld\n" "1:\n\t" "lodsb\n\t" "testb %%al,%%al\n\t" "je 2f\n\t" - "movl %%edx,%%edi\n\t" - "movl %%ebx,%%ecx\n\t" + "movl %2,%%edi\n\t" + "movl %3,%%ecx\n\t" "repne; scasb\n\t" "jne 1b\n\t" "decl %0\n\t" "jmp 3f\n" "2:\n\t" "xorl %0,%0\n" - "3:\n\t" - "movl %1,%%ebx" - : "=S" (__res), "=m" (__mem) - : "c" (__accept_len), "0" (__s), "d" (__accept), "1" (__mem) + "3:" + : "=S" (__res) + : "0" (__s), "d" (__accept), "g" (__accept_len) : "ax", "cx", "di", "cc"); return __res; } +#ifdef __PIC__ __STRING_INLINE char * __strpbrk_g (__const char *__s, __const char *__accept) { @@ -1382,32 +1349,6 @@ __strpbrk_g (__const char *__s, __const char *__accept) } #else __STRING_INLINE char * -__strpbrk_cg (__const char *__s, __const char __accept[], size_t __accept_len) -{ - register char *__res; - __asm__ __volatile__ - ("movl %%ebx,%%edi\n\t" - "cld\n" - "1:\n\t" - "lodsb\n\t" - "testb %%al,%%al\n\t" - "je 2f\n\t" - "movl %%ebx,%%edi\n\t" - "movl %%edx,%%ecx\n\t" - "repne; scasb\n\t" - "jne 1b\n\t" - "decl %0\n\t" - "jmp 3f\n" - "2:\n\t" - "xorl %0,%0\n" - "3:" - : "=S" (__res) - : "d" (__accept_len), "0" (__s), "b" (__accept) - : "ax", "cx", "dx", "di", "cc"); - return __res; -} - -__STRING_INLINE char * __strpbrk_g (__const char *__s, __const char *__accept) { register char *__res; @@ -1440,18 +1381,15 @@ __strpbrk_g (__const char *__s, __const char *__accept) /* Find the first occurrence of NEEDLE in HAYSTACK. */ #define _HAVE_STRING_ARCH_strstr 1 -#ifdef __PIC__ -/* XXX GCC has problems to spill the registers. */ -# define strstr(haystack, needle) \ +#define strstr(haystack, needle) \ (__extension__ (__builtin_constant_p (needle) && sizeof ((needle)[0]) == 1 \ ? ((needle)[0] == '\0' \ ? haystack \ : ((needle)[1] == '\0' \ - ? strchr (haystack, (needle)[0]) \ - : strstr (haystack, needle))) \ - : strstr (haystack, needle))) + ? strchr (haystack, (needle)[0]) \ + : __strstr_cg (haystack, needle, strlen (needle)))) \ + : __strstr_g (haystack, needle))) -# if 0 /* Please note that this function need not handle NEEDLEs with a length shorter than two. */ __STRING_INLINE char * @@ -1459,29 +1397,30 @@ __strstr_cg (__const char *__haystack, __const char __needle[], size_t __needle_len) { register char *__res; - int __mem; __asm__ __volatile__ - ("movl %%ebx,%1\n\t" - "movl %%ecx,%%ebx\n" - "cld\n" \ + ("cld\n" \ "1:\n\t" - "movl %%edx,%%edi\n\t" - "movl %%esi,%%eax\n\t" - "movl %%ebx,%%ecx\n\t" + "movl %3,%%edi\n\t" + "movl %2,%%eax\n\t" + "movl %1,%%ecx\n\t" "repe; cmpsb\n\t" "je 2f\n\t" "cmpb $0,-1(%%esi)\n\t" - "leal 1(%%eax),%%esi\n\t" + "leal 1(%%eax),%2\n\t" "jne 1b\n\t" "xorl %%eax,%%eax\n" - "2:\n\t" - "movl %1,%%ebx" - : "=a" (__res), "=m" (__mem) - : "c" (__needle_len), "S" (__haystack), "d" (__needle), "1" (__mem) + "2:" + : "=a" (__res) + : "g" (__needle_len), "S" (__haystack), "d" (__needle) : "cx", "di", "si", "cc"); return __res; } +#ifdef __PIC__ +# if 1 +/* For now this does not always works due to spilling problems. */ +# define __strstr_g(haystack, needle) strstr (haystack, needle) +# else __STRING_INLINE char * __strstr_g (__const char *__haystack, __const char *__needle) { @@ -1514,39 +1453,6 @@ __strstr_g (__const char *__haystack, __const char *__needle) } # endif #else -# define strstr(haystack, needle) \ - (__extension__ (__builtin_constant_p (needle) && sizeof ((needle)[0]) == 1 \ - ? ((needle)[0] == '\0' \ - ? haystack \ - : ((needle)[1] == '\0' \ - ? strchr (haystack, (needle)[0]) \ - : __strstr_cg (haystack, needle, strlen (needle)))) \ - : __strstr_g (haystack, needle))) - -__STRING_INLINE char * -__strstr_cg (__const char *__haystack, __const char __needle[], - size_t __needle_len) -{ - register char *__res; - __asm__ __volatile__ - ("cld\n" \ - "1:\n\t" - "movl %%ebx,%%edi\n\t" - "movl %%esi,%%eax\n\t" - "movl %%edx,%%ecx\n\t" - "repe; cmpsb\n\t" - "je 2f\n\t" - "cmpb $0,-1(%%esi)\n\t" - "leal 1(%%eax),%%esi\n\t" - "jne 1b\n\t" - "xorl %%eax,%%eax\n" - "2:" - : "=a" (__res) - : "d" (__needle_len), "S" (__haystack), "b" (__needle) - : "cx", "dx", "di", "si", "cc"); - return __res; -} - __STRING_INLINE char * __strstr_g (__const char *__haystack, __const char *__needle) { diff --git a/sysdeps/m68k/fpu/bits/mathinline.h b/sysdeps/m68k/fpu/bits/mathinline.h index 2ab570fba5..1e68ea00c0 100644 --- a/sysdeps/m68k/fpu/bits/mathinline.h +++ b/sysdeps/m68k/fpu/bits/mathinline.h @@ -120,6 +120,7 @@ __inline_mathop(__ieee754_asin, asin) __inline_mathop(__ieee754_cosh, cosh) __inline_mathop(__ieee754_sinh, sinh) __inline_mathop(__ieee754_exp, etox) +__inline_mathop(__ieee754_exp2, twotox) __inline_mathop(__ieee754_log10, log10) __inline_mathop(__ieee754_log, logn) __inline_mathop(__ieee754_sqrt, sqrt) @@ -139,7 +140,6 @@ __inline_mathop(__log1p, lognp1) __inline_mathop(__significand, getman) __inline_mathop(__log2, log2) -__inline_mathop(__exp2, twotox) __inline_mathop(__trunc, intrz) #if !defined __NO_MATH_INLINES && defined __OPTIMIZE__ diff --git a/sysdeps/m68k/fpu/s_exp2.c b/sysdeps/m68k/fpu/s_exp2.c index 389528092a..24fac4fce6 100644 --- a/sysdeps/m68k/fpu/s_exp2.c +++ b/sysdeps/m68k/fpu/s_exp2.c @@ -1,2 +1,2 @@ -#define FUNC exp2 -#include <s_atan.c> +#define FUNC __ieee754_exp2 +#include <e_acos.c> diff --git a/sysdeps/m68k/fpu/s_exp2f.c b/sysdeps/m68k/fpu/s_exp2f.c index 20ac916d1a..593842e4e5 100644 --- a/sysdeps/m68k/fpu/s_exp2f.c +++ b/sysdeps/m68k/fpu/s_exp2f.c @@ -1,2 +1,2 @@ -#define FUNC exp2f -#include <s_atanf.c> +#define FUNC __ieee754_exp2f +#include <e_acosf.c> diff --git a/sysdeps/m68k/fpu/s_exp2l.c b/sysdeps/m68k/fpu/s_exp2l.c index 19121b929d..0ab2a428c0 100644 --- a/sysdeps/m68k/fpu/s_exp2l.c +++ b/sysdeps/m68k/fpu/s_exp2l.c @@ -1,2 +1,2 @@ -#define FUNC exp2l -#include <s_atanl.c> +#define FUNC __ieee754_exp2l +#include <e_acosl.c> diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index c63ae73bb5..9d92e9e950 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -1,3 +1,21 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + #include <bits/libc-lock.h> #include <errno.h> #include <stdlib.h> diff --git a/sysdeps/posix/pread.c b/sysdeps/posix/pread.c new file mode 100644 index 0000000000..300aabac65 --- /dev/null +++ b/sysdeps/posix/pread.c @@ -0,0 +1,56 @@ +/* Read block from given position in file without changing file pointer. + POSIX version. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> + +ssize_t +pread (int fd, void *buf, size_t nbyte, off_t offset) +{ + /* Since we must not change the file pointer preserve the value so that + we can restore it later. */ + int save_errno; + ssize_t result; + off_t old_offset = lseek (fd, 0, SEEK_CUR); + if (old_offset == (off_t) -1) + return -1; + + /* Set to wanted position. */ + if (lseek (fd, offset, SEEK_SET) == (off_t) -1) + return -1; + + /* Write out the data. */ + result = read (fd, buf, nbyte); + + /* Now we have to restore the position. If this fails we have to + return this as an error. But if the writing also failed we + return this error. */ + save_errno = errno; + if (lseek (fd, old_offset, SEEK_SET) == (off_t) -1) + { + if (result == -1) + __set_errno (save_errno); + return -1; + } + __set_errno (save_errno); + + return result; +} diff --git a/sysdeps/posix/pwrite.c b/sysdeps/posix/pwrite.c new file mode 100644 index 0000000000..7c1ed45cca --- /dev/null +++ b/sysdeps/posix/pwrite.c @@ -0,0 +1,56 @@ +/* Write block to given position in file without changing file pointer. + POSIX version. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> + +ssize_t +pwrite (int fd, const void *buf, size_t nbyte, off_t offset) +{ + /* Since we must not change the file pointer preserve the value so that + we can restore it later. */ + int save_errno; + ssize_t result; + off_t old_offset = lseek (fd, 0, SEEK_CUR); + if (old_offset == (off_t) -1) + return -1; + + /* Set to wanted position. */ + if (lseek (fd, offset, SEEK_SET) == (off_t) -1) + return -1; + + /* Write out the data. */ + result = write (fd, buf, nbyte); + + /* Now we have to restore the position. If this fails we have to + return this as an error. But if the writing also failed we + return this error. */ + save_errno = errno; + if (lseek (fd, old_offset, SEEK_SET) == (off_t) -1) + { + if (result == -1) + __set_errno (save_errno); + return -1; + } + __set_errno (save_errno); + + return result; +} diff --git a/sysdeps/stub/pread.c b/sysdeps/stub/pread.c new file mode 100644 index 0000000000..8d937c76c5 --- /dev/null +++ b/sysdeps/stub/pread.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> + +/* Read NBYTES into BUF from FD at the given position OFFSET without + changing the file pointer. Return the number read or -1. */ +ssize_t +pread (int fd, void *buf, size_t nbytes, off_t offset) +{ + if (nbytes == 0) + return 0; + if (fd < 0) + { + __set_errno (EBADF); + return -1; + } + if (buf == NULL || offset < 0) + { + __set_errno (EINVAL); + return -1; + } + + __set_errno (ENOSYS); + return -1; +} +stub_warning (pread) diff --git a/sysdeps/stub/pwrite.c b/sysdeps/stub/pwrite.c new file mode 100644 index 0000000000..ee670d9670 --- /dev/null +++ b/sysdeps/stub/pwrite.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> + +/* Write NBYTES of BUF to FD at given position OFFSET without changing + the file position. Return the number written, or -1. */ +ssize_t +pwrite (int fd, const void *buf, size_t nbytes, off_t offset) +{ + if (nbytes == 0) + return 0; + if (fd < 0) + { + __set_errno (EBADF); + return -1; + } + if (buf == NULL || offset < 0) + { + __set_errno (EINVAL); + return -1; + } + + __set_errno (ENOSYS); + return -1; +} +stub_warning (pwrite) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 0545f4426a..4bfc3eb352 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -15,7 +15,8 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \ sys/module.h sys/io.h sys/klog.h sys/kdaemon.h \ sys/user.h sys/sysmacros.h sys/procfs.h \ sys/debugreg.h sys/kd.h sys/soundcard.h sys/vt.h \ - sys/quota.h sys/fsuid.h bits/mman.h + sys/quota.h sys/fsuid.h bits/mman.h \ + scsi/sg.h install-others += $(inst_includedir)/bits/syscall.h diff --git a/sysdeps/unix/sysv/linux/scsi/sg.h b/sysdeps/unix/sysv/linux/scsi/sg.h new file mode 100644 index 0000000000..c0a0c3a6d5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/scsi/sg.h @@ -0,0 +1,59 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* + History: + Started: Aug 9 by Lawrence Foard (entropy@world.std.com), to allow user + process control of SCSI devices. + Development Sponsored by Killy Corp. NY NY +*/ + +#ifndef _SCSI_SG_H +#define _SCSI_SG_H 1 + +/* An SG device is accessed by writing "packets" to it, the replies + are then read using the read call. The same header is used for + replies; ignore the reply_len field. */ + +struct sg_header + { + int pack_len; /* length of incoming packet + (including header). */ + int reply_len; /* max length of expected reply. */ + int pack_id; /* id number of packet. */ + int result; /* 0==ok, otherwise error number. */ + unsigned int twelve_byte:1; /* force 12 byte command length for + group 6 & 7 commands. */ + unsigned int other_flags:31; /* for future use. */ + unsigned char sense_buffer[16]; /* used only by reads. */ + /* command follows then data for command. */ + }; + +/* ioctl's */ +#define SG_SET_TIMEOUT 0x2201 /* set timeout *(int *)arg==timeout */ +#define SG_GET_TIMEOUT 0x2202 /* get timeout return timeout */ + +#define SG_DEFAULT_TIMEOUT (60*HZ) /* 1 minute timeout */ +#define SG_DEFAULT_RETRIES 1 + +#define SG_MAX_QUEUE 4 /* maximum outstanding request, arbitrary, may be + changed if sufficient DMA buffer room available. */ + +#define SG_BIG_BUFF 32768 + +#endif /* scsi/sg.h */ diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h index 0f56a70c32..c8f512c00c 100644 --- a/sysdeps/unix/sysv/linux/sys/mman.h +++ b/sysdeps/unix/sysv/linux/sys/mman.h @@ -23,6 +23,8 @@ #include <features.h> #include <bits/types.h> +#define __need_size_t +#include <stddef.h> /* Get the bit values from the kernel header file. */ #include <bits/mman.h> diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index d5c486d7d0..6028a04aaf 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -32,7 +32,7 @@ nfsservctl EXTRA nfsservctl 3 nfsservctl pause - pause 0 __libc_pause pause personality init-first personality 1 __personality personality pipe - pipe 1 __pipe pipe -prctl EXTRA prctl 5 +prctl EXTRA prctl 5 prctl query_module EXTRA query_module 5 query_module quotactl EXTRA quotactl 4 quotactl s_getdents EXTRA getdents 3 __getdents |