diff options
| -rw-r--r-- | string/Makefile | 5 | ||||
| -rw-r--r-- | string/string.h | 17 | ||||
| -rw-r--r-- | string/strnlen.c | 30 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 20 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 1 |
5 files changed, 59 insertions, 14 deletions
diff --git a/string/Makefile b/string/Makefile index 1fa63c2..5901c36 100644 --- a/string/Makefile +++ b/string/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +# Copyright (C) 1991, 92, 93, 94, 95, 96 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 @@ -24,7 +24,8 @@ subdir := string headers := string.h strings.h memory.h endian.h bytesex.h routines := strcat strchr strcmp strcoll strcpy strcspn strdup \ - strerror _strerror strlen strncat strncmp strncpy \ + strerror _strerror strlen strnlen \ + strncat strncmp strncpy \ strrchr strpbrk strsignal strspn strstr strtok \ strxfrm memchr memcmp memmove memset \ bcopy bzero ffs stpcpy stpncpy \ diff --git a/string/string.h b/string/string.h index 95dcba0..49b29fd 100644 --- a/string/string.h +++ b/string/string.h @@ -127,9 +127,26 @@ extern __ptr_t memmem __P ((__const __ptr_t __haystack, size_t __haystacklen, __const __ptr_t __needle, size_t __needlelen)); #endif + /* Return the length of S. */ extern size_t strlen __P ((__const char *__s)); +#ifdef __USE_GNU +/* Find the length of STRING, but scan at most MAXLEN characters. + If no '\0' terminator is found in that many characters, return MAXLEN. */ +extern size_t strnlen __P ((__const char *__string, size_t __maxlen)); + +#ifdef __OPTIMIZE__ +extern __inline size_t +strnlen (__const char *__string, size_t __maxlen) +{ + __const char *__end = memchr (__string, '\0', __maxlen); + return __end ? __end - __string : __maxlen; +} +#endif +#endif + + /* Return a string describing the meaning of the `errno' code in ERRNUM. */ extern char *strerror __P ((int __errnum)); #ifdef __USE_REENTRANT diff --git a/string/strnlen.c b/string/strnlen.c new file mode 100644 index 0000000..eb01a63 --- /dev/null +++ b/string/strnlen.c @@ -0,0 +1,30 @@ +/* Find the length of STRING, but scan at most MAXLEN characters. +Copyright (C) 1996 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <string.h> + +/* Find the length of STRING, but scan at most MAXLEN characters. + If no '\0' terminator is found in that many characters, return MAXLEN. */ + +size_t +strnlen (const char *string, size_t maxlen) +{ + const char *end = memchr (string, '\0', maxlen); + return end ? end - string : maxlen; +} diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index 9d7774a..6d974ea 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -32,22 +32,18 @@ extern void __libc_global_ctors (void); static void init (int *data) { + extern int __personality (int); + int argc = *data; char **argv = (void *) (data + 1); char **envp = &argv[argc + 1]; -#ifdef __i386__ - /* Make sure we are not using the iBSC2 personality. The `personality' - syscall takes one argument; zero means the Linux personality. The - argument arrives in %ebx; we have to save and restore %ebx by hand - here, because GCC (as of 2.7.0) cannot handle saving and restoring it - for us when it is the dedicated GOT register for PIC. */ - asm ("pushl %%ebx\n" - "xorl %%ebx, %%ebx\n" - "int $0x80 # syscall no %0\n" - "popl %%ebx" - : : "a" (SYS_ify (personality))); -#endif + /* The `personality' system call takes one argument that chooses the + "personality", i.e. the set of system calls and such. Zero is the + native Linux value; we must make this call first thing to disable + emulation of some other system that might have been enabled by default + based on the executable format. */ + __personality (0); /* Set the FPU control word to the proper default value. */ __setfpucw (__fpu_control); diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 7d199bd..2da874e 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -15,6 +15,7 @@ mlockall - mlockall 1 __mlockall mlockall mount - mount 5 __mount mount munlock - munlock 2 __munlock munlock munlockall - munlockall 0 __munlockall munlockall +personality init-first personality 1 __personality personality pipe - pipe 1 __pipe pipe reboot - reboot 3 reboot s_ptrace ptrace ptrace 4 __syscall_ptrace |