From 1474b80f017c2fcc18b1de5bbc51884650d30582 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 27 Mar 1995 10:00:09 +0000 Subject: Mon Mar 27 02:23:15 1995 Roland McGrath * posix/unistd.h [__USE_BSD] (ttyslot): Declare it. * posix/unistd.h [__USE_BSD] (L_SET, L_INCR, L_XTND): Define unless L_SET already defined. * misc/sys/file.h (L_SET, L_INCR, L_XTND): Don't define if L_SET already defined. Incorporated -lutil library from 4.4-Lite. * misc/Makefile (extra-libs, libutil-routines): New variables. * misc/login.c, misc/login_tty.c, misc/logout.c, misc/logwtmp.c, sysdeps/generic/pty.c: New files for -lutil incorporated from 4.4-Lite. Support simple, light-weight unwind-protect mechanism for longjmp. * setjmp/longjmp.c: Call _longjmp_unwind first thing. * sysdeps/mach/hurd/jmp-unwind.c: New file. * sysdeps/stub/jmp-unwind.c: New file. * sysdeps/i386/jmp_buf.h (_JMPBUF_UNWINDS): New macro. * sysdeps/mips/jmp_buf.h (_JMPBUF_UNWINDS): New macro. * setjmp/Makefile (routines): Add jmp-unwind. * hurd/hurd/userlink.h (struct hurd_userlink): Move `next' and `prevp' members into new substructure `resource'; add another such substructure `thread' and members `cleanup' (function ptr) and `cleanup_data' (generic ptr). (_hurd_userlink_link, _hurd_userlink_unlink): Insert/remove LINK into the `_hurd_self_sigstate ()->active_resources' list via the `thread' substructure. * hurd/hurd/port.h (_hurd_port_cleanup): Declare it. (_hurd_port_locked_get): Set LINK->cleanup to _hurd_port_cleanup and LINK->cleanup_data' to the port extracted. * hurd/hurd/signal.h (struct hurd_sigstate): New member `active_resources'. * hurd/port-cleanup.c: New file. * hurd/Makefile (routines): Add port-cleanup. * malloc/malloc.c: Include errno.h. Sat Mar 25 18:24:21 1995 Roland McGrath * locale/loadlocale.c (_nl_load_locale): Avoid */ inside comment. --- sysdeps/generic/pty.c | 127 +++++++++++++++++++++++++++++++++++++++++ sysdeps/i386/jmp_buf.h | 5 ++ sysdeps/mach/hurd/jmp-unwind.c | 62 ++++++++++++++++++++ sysdeps/mips/jmp_buf.h | 10 +++- sysdeps/stub/jmp-unwind.c | 29 ++++++++++ 5 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 sysdeps/generic/pty.c create mode 100644 sysdeps/mach/hurd/jmp-unwind.c create mode 100644 sysdeps/stub/jmp-unwind.c (limited to 'sysdeps') diff --git a/sysdeps/generic/pty.c b/sysdeps/generic/pty.c new file mode 100644 index 0000000..1644aee --- /dev/null +++ b/sysdeps/generic/pty.c @@ -0,0 +1,127 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)pty.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +openpty(amaster, aslave, name, termp, winp) + int *amaster, *aslave; + char *name; + struct termios *termp; + struct winsize *winp; +{ + static char line[] = "/dev/ptyXX"; + register const char *cp1, *cp2; + register int master, slave, ttygid; + struct group *gr; + + if ((gr = getgrnam("tty")) != NULL) + ttygid = gr->gr_gid; + else + ttygid = -1; + + for (cp1 = "pqrs"; *cp1; cp1++) { + line[8] = *cp1; + for (cp2 = "0123456789abcdef"; *cp2; cp2++) { + line[9] = *cp2; + if ((master = open(line, O_RDWR, 0)) == -1) { + if (errno == ENOENT) + return (-1); /* out of ptys */ + } else { + line[5] = 't'; + (void) chown(line, getuid(), ttygid); + (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP); + (void) revoke(line); + if ((slave = open(line, O_RDWR, 0)) != -1) { + *amaster = master; + *aslave = slave; + if (name) + strcpy(name, line); + if (termp) + (void) tcsetattr(slave, + TCSAFLUSH, termp); + if (winp) + (void) ioctl(slave, TIOCSWINSZ, + (char *)winp); + return (0); + } + (void) close(master); + line[5] = 'p'; + } + } + } + errno = ENOENT; /* out of ptys */ + return (-1); +} + +forkpty(amaster, name, termp, winp) + int *amaster; + char *name; + struct termios *termp; + struct winsize *winp; +{ + int master, slave, pid; + + if (openpty(&master, &slave, name, termp, winp) == -1) + return (-1); + switch (pid = fork()) { + case -1: + return (-1); + case 0: + /* + * child + */ + (void) close(master); + login_tty(slave); + return (0); + } + /* + * parent + */ + *amaster = master; + (void) close(slave); + return (pid); +} diff --git a/sysdeps/i386/jmp_buf.h b/sysdeps/i386/jmp_buf.h index 7686c4d2..7949883 100644 --- a/sysdeps/i386/jmp_buf.h +++ b/sysdeps/i386/jmp_buf.h @@ -7,3 +7,8 @@ typedef struct __ptr_t __sp; __ptr_t __pc; } __jmp_buf[1]; + +/* Test if longjmp to JMPBUF would unwind the frame + containing a local variable at ADDRESS. */ +#define _JMPBUF_UNWINDS(jmpbuf, address) \ + ((__ptr_t) (address) < (jmpbuf)[0].__sp) diff --git a/sysdeps/mach/hurd/jmp-unwind.c b/sysdeps/mach/hurd/jmp-unwind.c new file mode 100644 index 0000000..f7540f0 --- /dev/null +++ b/sysdeps/mach/hurd/jmp-unwind.c @@ -0,0 +1,62 @@ +/* _longjmp_unwind -- Clean up stack frames unwound by longjmp. Hurd version. +Copyright (C) 1995 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 + +/* This function is called by `longjmp' (with its arguments) to restore + active resources to a sane state before the frames code using them are + jumped out of. */ + +void +_longjmp_unwind (jmp_buf env, int val) +{ + struct hurd_sigstate *ss = _hurd_self_sigstate (); + struct hurd_userlink *link; + + /* All access to SS->active_resources must take place inside a critical + section where signal handlers cannot run. */ + __spin_lock (&ss->lock); + assert (! ss->critical_section); + ss->critical_section = 1; + __spin_unlock (&ss->lock); + +#ifndef _JMPBUF_UNWINDS + #error "sysdeps/MACHINE/jmp_buf.h fails to define _JMPBUF_UNWINDS" +#endif + + /* Iterate over the current thread's list of active resources. + Process the head portion of the list whose links reside + in stack frames being unwound by this jump. */ + + for (link = ss->active_resources; + link && _JMPBUF_UNWINDS (env[0].__jmpbuf, link); + link = link->thread.next) + /* Remove this link from the resource's users list, + since the frame using the resource is being unwound. + This call returns nonzero if that was the last user. */ + if (_hurd_userlink_unlink (link)) + /* One of the frames being unwound by the longjmp was the last user + of its resource. Call the cleanup function to deallocate it. */ + (*link->cleanup) (link->cleanup_data, env, val); + + _hurd_critical_section_unlock (ss); +} diff --git a/sysdeps/mips/jmp_buf.h b/sysdeps/mips/jmp_buf.h index eed47dc..102a019 100644 --- a/sysdeps/mips/jmp_buf.h +++ b/sysdeps/mips/jmp_buf.h @@ -1,5 +1,5 @@ -/* Define the machine-dependent type `jmp_buf'. Mips version. - Copyright (C) 1992, 1993 Free Software Foundation, Inc. +/* Define the machine-dependent type `jmp_buf'. MIPS version. + Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc. Contributed by Brendan Kehoe (brendan@zen.org). The GNU C Library is free software; you can redistribute it and/or @@ -45,3 +45,9 @@ typedef struct /* Offset to the program counter in `jmp_buf'. */ #define JB_PC 0 #endif + + +/* Test if longjmp to JMPBUF would unwind the frame + containing a local variable at ADDRESS. */ +#define _JMPBUF_UNWINDS(jmpbuf, address) \ + ((__ptr_t) (address) < (jmpbuf)[0].__sp) diff --git a/sysdeps/stub/jmp-unwind.c b/sysdeps/stub/jmp-unwind.c new file mode 100644 index 0000000..937000f --- /dev/null +++ b/sysdeps/stub/jmp-unwind.c @@ -0,0 +1,29 @@ +/* _longjmp_unwind -- Clean up stack frames unwound by longjmp. Stub version. +Copyright (C) 1995 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 + +void +_longjmp_unwind (jmp_buf env, int val) +{ + + /* This function can perform any cleanups necessary to safely unwind the + stack frames around the current context which ENV unwinds past. */ + +} -- cgit v1.1