diff options
| -rw-r--r-- | lib-src/emacsserver.c | 5 | ||||
| -rw-r--r-- | src/s/hpux8.h | 2 | ||||
| -rw-r--r-- | src/s/rtu.h | 4 | ||||
| -rw-r--r-- | src/s/template.h | 11 | ||||
| -rw-r--r-- | src/unexec.c | 4 | ||||
| -rw-r--r-- | src/xrdb.c | 15 |
6 files changed, 32 insertions, 9 deletions
diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c index e65e3e97831..19de7e66eb8 100644 --- a/lib-src/emacsserver.c +++ b/lib-src/emacsserver.c @@ -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 @@ main () jmp_buf msgenv; +SIGTYPE msgcatch () { longjmp (msgenv, 1); diff --git a/src/s/hpux8.h b/src/s/hpux8.h index ac047147295..ff48ac59293 100644 --- a/src/s/hpux8.h +++ b/src/s/hpux8.h @@ -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 diff --git a/src/s/rtu.h b/src/s/rtu.h index 273db7a3064..b90ad6dd91d 100644 --- a/src/s/rtu.h +++ b/src/s/rtu.h @@ -165,8 +165,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* 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); diff --git a/src/s/template.h b/src/s/template.h index 8c354447f54..adc4bef2360 100644 --- a/src/s/template.h +++ b/src/s/template.h @@ -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 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #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. */ diff --git a/src/unexec.c b/src/unexec.c index 5417f760467..c1dc6e33016 100644 --- a/src/unexec.c +++ b/src/unexec.c @@ -207,7 +207,11 @@ static long data_scnptr; #else /* not COFF */ +#ifdef __STDC__ +extern void *sbrk (); +#else extern char *sbrk (); +#endif #define SYMS_START ((long) N_SYMOFF (ohdr)) diff --git a/src/xrdb.c b/src/xrdb.c index 681544eb068..1ab859727d2 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -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 @@ magic_searchpath_decoder (incantation_string, file, return_path) { 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 @@ magic_searchpath_decoder (incantation_string, file, return_path) 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 @@ magic_searchpath_decoder (incantation_string, file, return_path) { 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)) |