Mercurial > emacs
changeset 620:88a29c720fa7
entered into RCS
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Fri, 24 Apr 1992 08:11:28 +0000 |
| parents | 239436e74f03 |
| children | eca8812e61cd |
| files | lib-src/emacsserver.c src/s/hpux8.h src/s/rtu.h src/s/template.h src/unexec.c src/xrdb.c |
| diffstat | 6 files changed, 32 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/emacsserver.c Sun Apr 19 17:03:02 1992 +0000 +++ b/lib-src/emacsserver.c Fri Apr 24 08:11:28 1992 +0000 @@ -1,11 +1,11 @@ /* Communication subprocess for GNU Emacs acting as server. - Copyright (C) 1986, 1987 Free Software Foundation, Inc. + Copyright (C) 1986, 1987, 1992 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -228,6 +228,7 @@ jmp_buf msgenv; +SIGTYPE msgcatch () { longjmp (msgenv, 1);
--- a/src/s/hpux8.h Sun Apr 19 17:03:02 1992 +0000 +++ b/src/s/hpux8.h Fri Apr 24 08:11:28 1992 +0000 @@ -6,6 +6,8 @@ #include "hpux.h" +#define HPUX8 + #define LIB_X11_LIB -L/usr/lib/X11R4 -lX11 #define C_SWITCH_SYSTEM -I/usr/include/X11R4
--- a/src/s/rtu.h Sun Apr 19 17:03:02 1992 +0000 +++ b/src/s/rtu.h Fri Apr 24 08:11:28 1992 +0000 @@ -165,8 +165,8 @@ /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ - sprintf (ptyname, "/dev/ttyp%x", i); + sprintf (pty_name, "/dev/ttyp%x", i); /* This is how to get the device name of the control end of a pty. */ #define PTY_NAME_SPRINTF \ - sprintf (ptyname, "/dev/pty%x", i); + sprintf (pty_name, "/dev/pty%x", i);
--- a/src/s/template.h Sun Apr 19 17:03:02 1992 +0000 +++ b/src/s/template.h Fri Apr 24 08:11:28 1992 +0000 @@ -1,13 +1,13 @@ /* Template for system description header files. This file describes the parameters that system description files should define or not. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -73,6 +73,13 @@ #define FIRST_PTY_LETTER 'a' /* + * Define HAVE_TERMIOS if the system provides POSIX-style + * functions and macros for terminal control. + */ + +#define HAVE_TERMIOS + +/* * Define HAVE_TERMIO if the system provides sysV-style ioctls * for terminal control. */
--- a/src/unexec.c Sun Apr 19 17:03:02 1992 +0000 +++ b/src/unexec.c Fri Apr 24 08:11:28 1992 +0000 @@ -207,7 +207,11 @@ #else /* not COFF */ +#ifdef __STDC__ +extern void *sbrk (); +#else extern char *sbrk (); +#endif #define SYMS_START ((long) N_SYMOFF (ohdr))
--- a/src/xrdb.c Sun Apr 19 17:03:02 1992 +0000 +++ b/src/xrdb.c Fri Apr 24 08:11:28 1992 +0000 @@ -1,9 +1,9 @@ /* Deal with the X Resource Manager. - Copyright (C) 1990 Free Software Foundation. + Copyright (C) 1990, 1992 Free Software Foundation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -146,7 +146,10 @@ { register char *s = incantation_string; register char *p; - register char string[MAXPATHLEN]; + + /* Must be big enough for "%N%S". */ + register int string_size = MAXPATHLEN; + register char *string = (char *) alloca (string_size * sizeof (*string)); while (*s) { @@ -157,6 +160,7 @@ if (*p == ':' && *(p + 1) == ':') { + /* We know string is big enough for this. */ bcopy ("%N%S", string, 5); if (decode_magic (string, file, return_path)) return 1; @@ -169,6 +173,11 @@ { int len = p - s; + if (string_size < len+1) + { + string_size = 2 * len; + string = (char *) alloca (string_size * sizeof (*string)); + } bcopy (s, string, len); string[len + 1] = '\0'; if (decode_magic (string, file, return_path))