From 0e3426bbcf2ff61d06d580fc9362fde79953a281 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 8 May 1996 02:07:47 +0000 Subject: Tue May 7 19:00:01 1996 Roland McGrath * string/argz-extract.c: Remove const from decl. * string/argz.h: Here too. * Makeconfig (version.mk): Fix regexp in sed cmd. Depend on $(..)Makeconfig. * GMP code updated from gmp-2.0 release. * stdlib/Makefile (mpn-routines): Removed add_1, added inlines. * sysdeps/generic/add_1.c: File removed. * stdlib/strtod.c: mp_limb is now mp_limb_t. * stdlib/fpioconst.c, stdlib/fpioconst.h: Likewise. * stdio-common/_itoa.c: Likewise. * stdio-common/printf_fp.c: Likewise. Don't include ansidecl.h. * sysdeps/mach/hurd/getcwd.c: Use io_identity instead of io_stat. * shlib-versions: New file. * Makerules (soversions.mk): New target, include file generated from shlib-versions. Moved shared library rules before installation rules. Rewrote shared library installation rules for versioned libraries. * math/Makefile (libm.so-version): Variable removed. * sysdeps/mach/hurd/i386/exc2signal.c: Use struct hurd_signal_detail. * hurd/report-wait.c (_S_msg_describe_ports): New function. * configure.in: Add AC_PROG_LN_S check. * config.make.in (LN_S): New variable. Sun May 5 03:10:44 1996 Ulrich Drepper * misc/efgcvt_r.c (ecvt_r): Work aroung gcc bug. gcc does not know about weak aliases now and optimizes necessary `if' statement away. * posix/unistd.h: Add swapoff prototype. * sysdeps/generic/confname.h: Add even more POSIX.4 symbols. * sysdeps/posix/fpathconf.c (__fpathconf): Get information for _PC_PATH_MAX from fstatfs function if available. * sysdeps/posix/sysconf.c: Add code to handle _SC_AIO_LISTIO_MAX, _SC_AIO_MAX, _SC_AIO_PRIO_DELTA_MAX, _SC_DELAYTIMER_MAX, _SC_MQ_OPEN_MAX, _SC_MQ_PRIO_MAX, _SC_RTSIG_MAX, _SC_SEM_NSEMS_MAX, _SC_SEM_VALUE_MAX, _SC_SIGQUEUE_MAX, and _SC_TIMER_MAX. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/stub/swapoff.c: New file. Stub version for swapoff function. * sysdeps/unix/syscalls.list: Add swapoff. * sysdeps/unix/sysv/linux/Dist: Add sys/acct.h. * sysdeps/unix/sysv/linux/Makefile [$(subdir) == misc] (sysdep_routines): Add mount, umount, llseek, setfsgid, setfsuid, sysinfo, and uselib. (headers): Add sys/sysinfo.h. * sysdeps/unix/sysv/linux/gethostid.c: Prevent warning. * sysdeps/unix/sysv/linux/i386/Makefile [$(subdir) == misc] (sysdep_routines): Add ioperm, iopl, and vm86. (headers): Add sys/perm.h and sys/vm86.h. * sysdeps/unix/sysv/linux/i386/sys/perm.h: New file. Contains prototypes for iopl and ioperm. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: New file. Contains prototype for vm86. * sysdeps/unix/sysv/linux/i386/syscalls.list: New file. Add vm86 system call. * sysdeps/unix/sysv/linux/sys/acct.h: New file. Contains prototypes for acct function. * sysdeps/unix/sysv/linux/sys/socket.h: Provide real header file with prototypes. * sysdeps/unix/sysv/linux/sys/sysinfo.h: New file. Contains prototype for sysinfo function. * sysdeps/unix/sysv/linux/syscalls.list: Add flock, ioperm, iopl, llseek, setfsgid, setfsuid, sysinfo, and uselib. * sysdeps/unix/sysv/linux/sysconf.c: Instead of duplicating posix/sysconf.c now only handle cases different to that implementation. Tue May 7 15:08:19 1996 Miles Bader * stdio/linewrap.c (__line_wrap_output): Renamed from lwoutput (all references changed). Now exported. * stdio/linewrap.c (struct data): Type deleted (moved to linewrap.h). (wrap_stream, unwrap_stream, lwclose, lwfileno, lwoutput, line_wrap_stream, line_unwrap_stream): Use struct line_wrap_data instead of struct data. (lwoutput, line_wrap_stream, line_unwrap_stream): Rename various occurences of `wrap' and `wrapmargin' to `wmargin'. (line_wrapped, line_wrap_lmargin, line_wrap_set_lmargin, line_wrap_rmargin, line_wrap_set_rmargin, line_wrap_wmargin, line_wrap_set_wmargin, line_wrap_point): New functions. * stdio/linewrap.h: New file. * stdio/Makefile (headers): Add linewrap.h. Tue May 7 14:19:12 1996 Roland McGrath * sysdeps/unix/sysv/linux/i386/Makefile: File removed. * stdio/stdio.h: Remove line_wrap_stream, line_unwap_stream decls. * sysdeps/unix/sysv/linux/schedbits.h: New file. Tue May 7 13:47:02 1996 Miles Bader * stdio/linewrap.c (struct data): Make margin fields not-pointers. (lwoutput): Adjust uses acordingly. * sysdeps/mach/hurd/fdatasync.c: New file. * sysdeps/mach/hurd/fsync.c: Pass new flag to file_sync. * sysdeps/mach/hurd/xmknod.c: Pass new flag to dir_link. * sysdeps/mach/hurd/symlink.c: Likewise. * sysdeps/mach/hurd/link.c: Likewise. * sysdeps/mach/hurd/bind.c: Likewise. * hurd/hurdsig.c (write_corefile): Likewise. * hurd/hurdsig.c (write_corefile): Pass cttyid port to crash server. * sysdeps/mach/hurd/fpathconf.c: RPC takes int pointer, not long int. * sysdeps/mach/hurd/_exit.c (_hurd_exit): Pass sigcode arg to proc_mark_exit. * sysdeps/mach/hurd/dl-sysdep.c (_exit): Likewise. * sysdeps/mach/hurd/wait4.c: Pass sigcode arg to proc_wait. * sysdeps/mach/hurd/rename.c: Pass new flag to dir_rename. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Use struct hurd_signal_detail. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/hurd-raise.c (_hurd_raise_signal): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/setitimer.c (restart_itimer): Likewise. * hurd/hurd/signal.h: Fix _hurd_exception2signal prototype. * hurd/hurdsig.c (write_corefile): Take const struct hurd_signal_detail * arg. Pass all details to crash_dump_task. (_hurd_internal_post_signal): Pass DETAIL to write_corefile. (_hurd_internal_post_signal: suspend): Pass code and error to proc_mark_stop. * hurd/hurdprio.c (_hurd_priority_which_map): Pass flags arg to proc_getprocinfo by reference. --- sysdeps/mach/hurd/_exit.c | 6 +-- sysdeps/mach/hurd/bind.c | 4 +- sysdeps/mach/hurd/dl-sysdep.c | 2 +- sysdeps/mach/hurd/fdatasync.c | 32 +++++++++++++ sysdeps/mach/hurd/fpathconf.c | 4 +- sysdeps/mach/hurd/fsync.c | 4 +- sysdeps/mach/hurd/getcwd.c | 59 ++++++++++++----------- sysdeps/mach/hurd/i386/exc2signal.c | 95 ++++++++++++++++++------------------- sysdeps/mach/hurd/i386/trampoline.c | 4 +- sysdeps/mach/hurd/link.c | 4 +- sysdeps/mach/hurd/rename.c | 4 +- sysdeps/mach/hurd/setitimer.c | 3 +- sysdeps/mach/hurd/symlink.c | 8 ++-- sysdeps/mach/hurd/wait4.c | 5 +- sysdeps/mach/hurd/xmknod.c | 2 +- 15 files changed, 135 insertions(+), 101 deletions(-) create mode 100644 sysdeps/mach/hurd/fdatasync.c (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/_exit.c b/sysdeps/mach/hurd/_exit.c index fd56791ee8..aa0a2616ff 100644 --- a/sysdeps/mach/hurd/_exit.c +++ b/sysdeps/mach/hurd/_exit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995, 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 @@ -27,14 +27,14 @@ void _hurd_exit (int status) { /* Give the proc server our exit status. */ - __USEPORT (PROC, __proc_mark_exit (port, status)); + __USEPORT (PROC, __proc_mark_exit (port, status, 0)); /* Commit suicide. */ __task_terminate (__mach_task_self ()); /* Perhaps the cached mach_task_self was bogus. */ __task_terminate ((__mach_task_self) ()); - + /* This sucker really doesn't want to die. */ while (1) { diff --git a/sysdeps/mach/hurd/bind.c b/sysdeps/mach/hurd/bind.c index a6ebc1ea34..37ddcb8c01 100644 --- a/sysdeps/mach/hurd/bind.c +++ b/sysdeps/mach/hurd/bind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1992, 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 @@ -67,7 +67,7 @@ DEFUN(bind, (fd, addr, len), if (! err) { /* Link the node, now a socket, into the target directory. */ - err = __dir_link (dir, node, n); + err = __dir_link (dir, node, n, 1); if (err == EEXIST) err = EADDRINUSE; } diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index c580bb31ed..7e0152bf6c 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -548,7 +548,7 @@ void _exit (int status) { __proc_mark_exit (_dl_hurd_data->portarray[INIT_PORT_PROC], - W_EXITCODE (status, 0)); + W_EXITCODE (status, 0), 0); while (__task_terminate (__mach_task_self ())) __mach_task_self_ = (__mach_task_self) (); } diff --git a/sysdeps/mach/hurd/fdatasync.c b/sysdeps/mach/hurd/fdatasync.c new file mode 100644 index 0000000000..d7f82efe25 --- /dev/null +++ b/sysdeps/mach/hurd/fdatasync.c @@ -0,0 +1,32 @@ +/* Copyright (C) 1991, 92, 93, 94, 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 +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 +#include +#include +#include + +/* Make all changes done to FD's file data actually appear on disk. */ +int +fdatasync (int fd) +{ + error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 1)); + if (err) + return __hurd_dfail (fd, err); + return 0; +} diff --git a/sysdeps/mach/hurd/fpathconf.c b/sysdeps/mach/hurd/fpathconf.c index f5e6579ee8..5fc51010fb 100644 --- a/sysdeps/mach/hurd/fpathconf.c +++ b/sysdeps/mach/hurd/fpathconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 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 @@ -27,7 +27,7 @@ long int __fpathconf (int fd, int name) { error_t err; - long int value; + int value; if (err = HURD_DPORT_USE (fd, __io_pathconf (port, name, &value))) return __hurd_dfail (fd, err), -1L; diff --git a/sysdeps/mach/hurd/fsync.c b/sysdeps/mach/hurd/fsync.c index adfe9800d3..d4982c1e41 100644 --- a/sysdeps/mach/hurd/fsync.c +++ b/sysdeps/mach/hurd/fsync.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 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 @@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */ int DEFUN(fsync, (fd), int fd) { - error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1)); + error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 0)); if (err) return __hurd_dfail (fd, err); return 0; diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c index 02699a7e84..ed8ed96697 100644 --- a/sysdeps/mach/hurd/getcwd.c +++ b/sysdeps/mach/hurd/getcwd.c @@ -39,11 +39,10 @@ char * __getcwd (char *buf, size_t size) { error_t err; - dev_t rootdev, thisdev; + mach_port_t rootid, thisid, rootdevid, thisdevid; ino_t rootino, thisino; char *file_name; register char *file_namep; - struct stat st; file_t parent; char *dirbuf = NULL; unsigned int dirbufsize = 0; @@ -51,6 +50,10 @@ __getcwd (char *buf, size_t size) inline void cleanup (void) { __mach_port_deallocate (__mach_task_self (), parent); + __mach_port_deallocate (__mach_task_self (), thisid); + __mach_port_deallocate (__mach_task_self (), thisdevid); + __mach_port_deallocate (__mach_task_self (), rootid); + __mach_port_deallocate (__mach_task_self (), rootdevid); if (dirbuf != NULL) __vm_deallocate (__mach_task_self (), @@ -81,37 +84,30 @@ __getcwd (char *buf, size_t size) file_namep = file_name + size; *--file_namep = '\0'; - /* Get a port to our root directory and stat it. */ + /* Get a port to our root directory and get its identity. */ - if (err = __USEPORT (CRDIR, __io_stat (port, &st))) + if (err = __USEPORT (CRDIR, __io_identity (port, + &rootid, &rootdevid, &rootino))) return __hurd_fail (err), NULL; - rootdev = st.st_dev; - rootino = st.st_ino; + __mach_port_deallocate (__mach_task_self (), rootdevid); /* Get a port to our current working directory and stat it. */ - if (err = __USEPORT (CWDIR, __mach_port_mod_refs (__mach_task_self (), - (parent = port), - MACH_PORT_RIGHT_SEND, - 1))) - return __hurd_fail (err), NULL; - if (err = __io_stat (parent, &st)) + if (err = __USEPORT (CRDIR, __io_identity (port, + &thisid, &thisdevid, &thisino))) { - cleanup (); + __mach_port_deallocate (__mach_task_self (), rootid); return __hurd_fail (err), NULL; } - thisdev = st.st_dev; - thisino = st.st_ino; - - while (!(thisdev == rootdev && thisino == rootino)) + while (thisid != rootid) { /* PARENT is a port to the directory we are currently on; - THISDEV and THISINO are its device and node numbers. - Look in its parent (..) for a file with the same numbers. */ + THISID, THISDEV, and THISINO are its identity. + Look in its parent (..) for a file with the same file number. */ struct dirent *d; - dev_t dotdev; + mach_port_t dotid, dotdevid; ino_t dotino; int mount_point; file_t newp; @@ -127,12 +123,12 @@ __getcwd (char *buf, size_t size) __mach_port_deallocate (__mach_task_self (), parent); parent = newp; - /* Figure out if this directory is a mount point. */ - if (err = __io_stat (parent, &st)) + /* Get this directory's identity and figure out if it's a mount point. */ + if (err = __io_identity (parent, &dotid, &dotdevid, &dotino)) goto errlose; - dotdev = st.st_dev; - dotino = st.st_ino; - mount_point = dotdev != thisdev; + __mach_port_deallocate (__mach_task_self (), dotid); + __mach_port_deallocate (__mach_task_self (), dotdevid); + mount_point = dotdevid != thisdevid; /* Search for the last directory. */ direntry = 0; @@ -178,13 +174,17 @@ __getcwd (char *buf, size_t size) { file_t try = __file_name_lookup_under (parent, d->d_name, O_NOLINK, 0); + file_t id, devid; + ino_t fileno; if (try == MACH_PORT_NULL) goto lose; - err = __io_stat (try, &st); + err = __io_identity (try, &id, &devid, &fileno); __mach_port_deallocate (__mach_task_self (), try); if (err) goto errlose; - if (st.st_dev == thisdev && st.st_ino == thisino) + __mach_port_deallocate (__mach_task_self (), id); + __mach_port_deallocate (__mach_task_self (), devid); + if (id == thisid) goto found; } } @@ -232,7 +232,10 @@ __getcwd (char *buf, size_t size) /* The next iteration will find the name of the directory we just searched through. */ - thisdev = dotdev; + __mach_port_deallocate (__mach_task_self (), thisid); + __mach_port_deallocate (__mach_task_self (), thisdevid); + thisid = dotid; + thisdevid = dotdevid; thisino = dotino; } diff --git a/sysdeps/mach/hurd/i386/exc2signal.c b/sysdeps/mach/hurd/i386/exc2signal.c index 19f845a49e..10fe500f82 100644 --- a/sysdeps/mach/hurd/i386/exc2signal.c +++ b/sysdeps/mach/hurd/i386/exc2signal.c @@ -1,5 +1,5 @@ /* Translate Mach exception codes into signal numbers. i386 version. -Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. +Copyright (C) 1991, 1992, 1994, 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 @@ -25,48 +25,47 @@ Cambridge, MA 02139, USA. */ into a signal number and signal subcode. */ void -_hurd_exception2signal (int exception, int code, int subcode, - int *signo, long int *sigcode, int *error) +_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo) { - *error = 0; + detail->error = 0; - switch (exception) + switch (detail->exc) { default: *signo = SIGIOT; - *sigcode = exception; + detail->code = detail->exc; break; - + case EXC_BAD_ACCESS: - if (code == KERN_PROTECTION_FAILURE) + if (detail->exc_code == KERN_PROTECTION_FAILURE) *signo = SIGSEGV; else *signo = SIGBUS; - *sigcode = subcode; - *error = code; + detail->code = detail->exc_subcode; + detail->error = detail->exc_code; break; case EXC_BAD_INSTRUCTION: *signo = SIGILL; - if (code == EXC_I386_INVOP) - *sigcode = ILL_INVOPR_FAULT; - else if (code == EXC_I386_STKFLT) - *sigcode = ILL_STACK_FAULT; + if (detail->exc_code == EXC_I386_INVOP) + detail->code = ILL_INVOPR_FAULT; + else if (detail->exc_code == EXC_I386_STKFLT) + detail->code = ILL_STACK_FAULT; else - *sigcode = 0; + detail->code = 0; break; - + case EXC_ARITHMETIC: - switch (code) + switch (detail->exc_code) { case EXC_I386_DIV: /* integer divide by zero */ *signo = SIGFPE; - *sigcode = FPE_INTDIV_FAULT; + detail->code = FPE_INTDIV_FAULT; break; - + case EXC_I386_INTO: /* integer overflow */ *signo = SIGFPE; - *sigcode = FPE_INTOVF_TRAP; + detail->code = FPE_INTOVF_TRAP; break; /* These aren't anywhere documented or used in Mach 3.0. */ @@ -74,92 +73,92 @@ _hurd_exception2signal (int exception, int code, int subcode, case EXC_I386_EXTOVR: default: *signo = SIGFPE; - *sigcode = 0; + detail->code = 0; break; case EXC_I386_EXTERR: /* Subcode is the fp_status word saved by the hardware. Give an error code corresponding to the first bit set. */ - if (subcode & FPS_IE) + if (detail->exc_subcode & FPS_IE) { *signo = SIGILL; - *sigcode = ILL_FPEOPR_FAULT; + detail->code = ILL_FPEOPR_FAULT; } - else if (subcode & FPS_DE) + else if (detail->exc_subcode & FPS_DE) { *signo = SIGFPE; - *sigcode = FPE_FLTDNR_FAULT; + detail->code = FPE_FLTDNR_FAULT; } - else if (subcode & FPS_ZE) + else if (detail->exc_subcode & FPS_ZE) { *signo = SIGFPE; - *sigcode = FPE_FLTDIV_FAULT; + detail->code = FPE_FLTDIV_FAULT; } - else if (subcode & FPS_OE) + else if (detail->exc_subcode & FPS_OE) { *signo = SIGFPE; - *sigcode = FPE_FLTOVF_FAULT; + detail->code = FPE_FLTOVF_FAULT; } - else if (subcode & FPS_UE) + else if (detail->exc_subcode & FPS_UE) { *signo = SIGFPE; - *sigcode = FPE_FLTUND_FAULT; + detail->code = FPE_FLTUND_FAULT; } - else if (subcode & FPS_PE) + else if (detail->exc_subcode & FPS_PE) { *signo = SIGFPE; - *sigcode = FPE_FLTINX_FAULT; + detail->code = FPE_FLTINX_FAULT; } else { *signo = SIGFPE; - *sigcode = 0; + detail->code = 0; } break; - /* These two can only be arithmetic exceptions if we + /* These two can only be arithmetic exceptions if we are in V86 mode, which sounds like emulation to me. (See Mach 3.0 i386/trap.c.) */ case EXC_I386_EMERR: *signo = SIGFPE; - *sigcode = FPE_EMERR_FAULT; + detail->code = FPE_EMERR_FAULT; break; case EXC_I386_BOUND: *signo = SIGFPE; - *sigcode = FPE_EMBND_FAULT; + detail->code = FPE_EMBND_FAULT; break; } break; - case EXC_EMULATION: + case EXC_EMULATION: /* 3.0 doesn't give this one, why, I don't know. */ *signo = SIGEMT; - *sigcode = 0; + detail->code = 0; break; case EXC_SOFTWARE: /* The only time we get this in Mach 3.0 is for an out of bounds trap. */ - if (code == EXC_I386_BOUND) + if (detail->exc_code == EXC_I386_BOUND) { *signo = SIGFPE; - *sigcode = FPE_SUBRNG_FAULT; + detail->code = FPE_SUBRNG_FAULT; } else { *signo = SIGEMT; - *sigcode = 0; + detail->code = 0; } break; - + case EXC_BREAKPOINT: *signo = SIGTRAP; - if (code == EXC_I386_SGL) - *sigcode = DBG_SINGLE_TRAP; - else if (code == EXC_I386_BPT) - *sigcode = DBG_BRKPNT_FAULT; + if (detail->exc_code == EXC_I386_SGL) + detail->code = DBG_SINGLE_TRAP; + else if (detail->exc_code == EXC_I386_BPT) + detail->code = DBG_BRKPNT_FAULT; else - *sigcode = 0; + detail->code = 0; break; } } diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c index bd91c24304..a2b2897c6e 100644 --- a/sysdeps/mach/hurd/i386/trampoline.c +++ b/sysdeps/mach/hurd/i386/trampoline.c @@ -28,7 +28,7 @@ Cambridge, MA 02139, USA. */ struct sigcontext * _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, - int signo, long int sigcode, + int signo, struct hurd_signal_detail *detail, volatile int rpc_wait, struct machine_thread_all_state *state) { @@ -137,7 +137,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, /* Set up the arguments for the signal handler. */ stackframe->signo = signo; - stackframe->sigcode = sigcode; + stackframe->sigcode = detail->code; stackframe->scp = stackframe->return_scp = scp = &stackframe->ctx; stackframe->sigreturn_addr = &__sigreturn; stackframe->sigreturn_returns_here = &&firewall; /* Crash on return. */ diff --git a/sysdeps/mach/hurd/link.c b/sysdeps/mach/hurd/link.c index a4ae21095a..1fb9f9aad2 100644 --- a/sysdeps/mach/hurd/link.c +++ b/sysdeps/mach/hurd/link.c @@ -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 @@ -45,7 +45,7 @@ DEFUN(__link, (from, to), CONST char *from AND CONST char *to) todir = __file_name_split (to, &toname); if (todir != MACH_PORT_NULL) { - err = __dir_link (todir, linknode, toname); + err = __dir_link (todir, linknode, toname, 1); __mach_port_deallocate (__mach_task_self (), todir); } __mach_port_deallocate (__mach_task_self (), linknode); diff --git a/sysdeps/mach/hurd/rename.c b/sysdeps/mach/hurd/rename.c index 63efbfb43f..6d1367f4f2 100644 --- a/sysdeps/mach/hurd/rename.c +++ b/sysdeps/mach/hurd/rename.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 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 @@ -38,7 +38,7 @@ DEFUN(rename, (old, new), CONST char *old AND CONST char *new) return -1; } - err = __dir_rename (olddir, oldname, newdir, newname); + err = __dir_rename (olddir, oldname, newdir, newname, 0); __mach_port_deallocate (__mach_task_self (), olddir); __mach_port_deallocate (__mach_task_self (), newdir); if (err) diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index cba1d0e65a..9ee33e0446 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -114,8 +114,7 @@ timer_thread (void) static sighandler_t restart_itimer (struct hurd_signal_preempter *preempter, struct hurd_sigstate *ss, - int *signo, long int *sigcode, - int *sigerror) + int *signo, struct hurd_signal_detail *detail) { static int setitimer_locked (const struct itimerval *new, struct itimerval *old, void *crit); diff --git a/sysdeps/mach/hurd/symlink.c b/sysdeps/mach/hurd/symlink.c index e3937cc88c..efae880caf 100644 --- a/sysdeps/mach/hurd/symlink.c +++ b/sysdeps/mach/hurd/symlink.c @@ -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 @@ -47,15 +47,15 @@ DEFUN(__symlink, (from, to), CONST char *from AND CONST char *to) if (! err) /* Set the node's translator to make it a symlink. */ - err = __file_set_translator (node, - FS_TRANS_EXCL|FS_TRANS_SET, + err = __file_set_translator (node, + FS_TRANS_EXCL|FS_TRANS_SET, FS_TRANS_EXCL|FS_TRANS_SET, 0, buf, sizeof (_HURD_SYMLINK) + len, MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND); if (! err) /* Link the node, now a valid symlink, into the target directory. */ - err = __dir_link (dir, node, name); + err = __dir_link (dir, node, name, 1); __mach_port_deallocate (__mach_task_self (), dir); __mach_port_deallocate (__mach_task_self (), node); diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c index 61e985505e..83eba88e6d 100644 --- a/sysdeps/mach/hurd/wait4.c +++ b/sysdeps/mach/hurd/wait4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995, 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 @@ -30,8 +30,9 @@ __wait4 (pid_t pid, __WAIT_STATUS_DEFN stat_loc, pid_t dead; error_t err; struct rusage ignored; + natural_t sigcode; - err = __USEPORT (PROC, __proc_wait (port, pid, options, stat_loc, + err = __USEPORT (PROC, __proc_wait (port, pid, options, stat_loc, &sigcode, usage ?: &ignored, &dead)); return err ? (pid_t) __hurd_fail (err) : dead; diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c index b2386d80ee..3552874bb0 100644 --- a/sysdeps/mach/hurd/xmknod.c +++ b/sysdeps/mach/hurd/xmknod.c @@ -102,7 +102,7 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev) if (! err) /* Link the node, now a valid device, into the target directory. */ - err = __dir_link (dir, node, name); + err = __dir_link (dir, node, name, 1); __mach_port_deallocate (__mach_task_self (), dir); __mach_port_deallocate (__mach_task_self (), node); -- cgit v1.2.3