mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-12 16:23:57 +00:00
entered into RCS
This commit is contained in:
parent
cab96458f8
commit
d4327fecc1
@ -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);
|
||||
|
@ -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
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
@ -72,6 +72,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.
|
||||
|
@ -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))
|
||||
|
||||
|
15
src/xrdb.c
15
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))
|
||||
|
Loading…
Reference in New Issue
Block a user