diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-05-21 16:03:22 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-05-21 16:03:22 +0000 |
commit | 9498096c93a5755cd48a72762d2b6701bd7d796e (patch) | |
tree | ab41f3aabb15b659e342ea79f795b708bd2d6d2e /sysdeps | |
parent | 1f205a479b43e5e40672fe5b4ae8f717b28c41b1 (diff) | |
download | glibc-9498096c93a5755cd48a72762d2b6701bd7d796e.tar.gz glibc-9498096c93a5755cd48a72762d2b6701bd7d796e.tar.xz glibc-9498096c93a5755cd48a72762d2b6701bd7d796e.zip |
Update.
1997-05-21 17:50 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile (dl-routines): Add dl-sysdepio. * elf/dl-support.c (_dl_sysdep_fatal): Removed. * sysdeps/generic/dl-sysdep.c: Move definition of _dl_sysdep_fatal, _dl_sysdep_error and _dl_sysdep_warning to ... * sysdeps/generic/dl-sysdepio.c: ...here. * sysdeps/mach/hurd/dl-sysdep.c: Move the functions to ... * sysdeps/mach/hurd/dl-sysdepio.c: ...here. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Remove definition of functions. Bug reported by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>. * db/Makefile (libdb.so): Depend on libc.so for dynamic loading and for Linux ld.so. * login/Makefile (libutil.so): Likewise. * math/Makefile (libm.so): Likewise. * md5-crypt/Makefile (libcrypt.so): Likewise. * nis/Makefile (libnss_%.so): Likewise. * resolv/Makefile (libnss_dns.so): Likewise. 1997-05-20 14:01 Miles Bader <miles@gnu.ai.mit.edu> * argp-help.c (_help): Supply STATE to argp_args_usage. (argp_args_usage): Add filtering of the args doc string. (comma): Print cluster headers for the first entry too. * argp.h (ARGP_KEY_HELP_ARGS_DOC): New macro. Patches by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>. Include <config.h> if HAVE_CONFIG_H is defined. * sunrpc/xdr_float.c: Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/dl-sysdep.c | 51 | ||||
-rw-r--r-- | sysdeps/generic/dl-sysdepio.c | 72 | ||||
-rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 70 | ||||
-rw-r--r-- | sysdeps/mach/hurd/dl-sysdepio.c | 107 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c | 2 |
5 files changed, 179 insertions, 123 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index e9fbcdf4bc..b7e1410b89 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -24,8 +24,6 @@ #include <fcntl.h> #include <link.h> #include <unistd.h> -#include <stdarg.h> -#include <string.h> extern int _dl_argc; @@ -177,52 +175,3 @@ _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot) __close (fd); return result; } - -void -_dl_sysdep_fatal (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - __write (STDERR_FILENO, msg, len); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); - - _exit (127); -} - - -void -_dl_sysdep_error (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - __write (STDERR_FILENO, msg, len); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); -} - - -void -_dl_sysdep_message (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - __write (STDOUT_FILENO, msg, len); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); -} diff --git a/sysdeps/generic/dl-sysdepio.c b/sysdeps/generic/dl-sysdepio.c new file mode 100644 index 0000000000..ed6078714d --- /dev/null +++ b/sysdeps/generic/dl-sysdepio.c @@ -0,0 +1,72 @@ +/* Operating I/O support for run-time dynamic linker. Generic Unix version. + Copyright (C) 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 <unistd.h> +#include <stdarg.h> +#include <string.h> + + +void +_dl_sysdep_fatal (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + __write (STDERR_FILENO, msg, len); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); + + _exit (127); +} + + +void +_dl_sysdep_error (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + __write (STDERR_FILENO, msg, len); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); +} + + +void +_dl_sysdep_message (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + __write (STDOUT_FILENO, msg, len); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); +} diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index e8388c4191..8d5975cf8b 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -209,76 +209,6 @@ _dl_sysdep_start_cleanup (void) __mach_port_deallocate (__mach_task_self (), __mach_task_self_); } -void -_dl_sysdep_fatal (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - mach_msg_type_number_t nwrote; - do - { - if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote)) - break; - len -= nwrote; - msg += nwrote; - } while (nwrote > 0); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); - - _exit (127); -} - - -void -_dl_sysdep_error (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - mach_msg_type_number_t nwrote; - do - { - if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote)) - break; - len -= nwrote; - msg += nwrote; - } while (nwrote > 0); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); -} - - -void -_dl_sysdep_message (const char *msg, ...) -{ - va_list ap; - - va_start (ap, msg); - do - { - size_t len = strlen (msg); - mach_msg_type_number_t nwrote; - do - { - if (__io_write (_hurd_init_dtable[1], msg, len, -1, &nwrote)) - break; - len -= nwrote; - msg += nwrote; - } while (nwrote > 0); - msg = va_arg (ap, const char *); - } while (msg); - va_end (ap); -} - /* Minimal open/close/mmap implementation sufficient for initial loading of shared libraries. These are weak definitions so that when the dynamic linker re-relocates itself to be user-visible (for -ldl), diff --git a/sysdeps/mach/hurd/dl-sysdepio.c b/sysdeps/mach/hurd/dl-sysdepio.c new file mode 100644 index 0000000000..c177a7796f --- /dev/null +++ b/sysdeps/mach/hurd/dl-sysdepio.c @@ -0,0 +1,107 @@ +/* Operating system support for run-time dynamic linker. Hurd version. + Copyright (C) 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 <hurd.h> +#include <link.h> +#include <unistd.h> +#include <fcntl.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <sys/wait.h> +#include <assert.h> +#include <sysdep.h> +#include <mach/mig_support.h> +#include "hurdstartup.h" +#include <mach/host_info.h> +#include "../stdio-common/_itoa.h" +#include <hurd/auth.h> +#include <hurd/term.h> +#include <stdarg.h> +#include <ctype.h> +#include <sys/stat.h> + +void +_dl_sysdep_fatal (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + mach_msg_type_number_t nwrote; + do + { + if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote)) + break; + len -= nwrote; + msg += nwrote; + } while (nwrote > 0); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); + + _exit (127); +} + + +void +_dl_sysdep_error (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + mach_msg_type_number_t nwrote; + do + { + if (__io_write (_hurd_init_dtable[2], msg, len, -1, &nwrote)) + break; + len -= nwrote; + msg += nwrote; + } while (nwrote > 0); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); +} + + +void +_dl_sysdep_message (const char *msg, ...) +{ + va_list ap; + + va_start (ap, msg); + do + { + size_t len = strlen (msg); + mach_msg_type_number_t nwrote; + do + { + if (__io_write (_hurd_init_dtable[1], msg, len, -1, &nwrote)) + break; + len -= nwrote; + msg += nwrote; + } while (nwrote > 0); + msg = va_arg (ap, const char *); + } while (msg); + va_end (ap); +} diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c index eb732d6fb1..c33b655705 100644 --- a/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c @@ -24,8 +24,6 @@ #include <fcntl.h> #include <link.h> #include <unistd.h> -#include <stdarg.h> -#include <string.h> extern int _dl_argc; |