X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0863319442ae5fd638593ebabc0399f2cd715599..8030369ccb5c871d3ce11b96c220f318bc741ed8:/src/sysdep.c diff --git a/src/sysdep.c b/src/sysdep.c index 2cf7123018..206ecca427 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1,5 +1,6 @@ /* Interfaces to system-dependent kernel and library entries. - Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc. + Copyright (C) 1985, 86,87,88,93,94,95, 1999, 2000, 2001 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -18,47 +19,55 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include - -#include +#ifdef HAVE_UNISTD_H +#include +#endif #include "lisp.h" +/* Including stdlib.h isn't necessarily enough to get srandom + declared, e.g. without __USE_XOPEN_EXTENDED with glibc 2. */ +#ifdef HAVE_RANDOM +#if 0 /* It turns out that defining _OSF_SOURCE in osf5-0.h gets + random prototyped as returning `int'. It looks to me as + though the best way to DTRT is to prefer the rand48 functions + (per libc.info). -- fx */ +extern long int random P_ ((void)); +#endif +#if 0 /* Don't prototype srandom; it takes an unsigned argument on + some systems, and an unsigned long on others, like FreeBSD + 4.1. */ +extern void srandom P_ ((unsigned int)); +#endif +#endif + #include "blockinput.h" #undef NULL -#define min(x,y) ((x) > (y) ? (y) : (x)) - -/* In this file, open, read and write refer to the system calls, - not our sugared interfaces sys_open, sys_read and sys_write. - Contrariwise, for systems where we use the system calls directly, - define sys_read, etc. here as aliases for them. */ -#ifndef read -#define sys_read read -#define sys_write write -#endif /* `read' is not a macro */ +#ifdef MAC_OS8 +/* It is essential to include stdlib.h so that this file picks up + the correct definitions of rand, srand, and RAND_MAX. + Otherwise random numbers will not work correctly. */ +#include -#undef read -#undef write +#ifndef subprocesses +/* Nonzero means delete a process right away if it exits (process.c). */ +static int delete_exited_processes; +#endif +#endif /* MAC_OS8 */ #ifdef WINDOWSNT -#define read _read -#define write _write +#define read sys_read +#define write sys_write #include -extern int errno; -#endif /* not WINDOWSNT */ - -#ifndef close -#define sys_close close -#else -#undef close +#ifndef NULL +#define NULL 0 #endif - -#ifndef open -#define sys_open open -#else /* `open' is a macro */ -#undef open -#endif /* `open' is a macro */ +#endif /* not WINDOWSNT */ /* Does anyone other than VMS need this? */ #ifndef fwrite @@ -67,10 +76,6 @@ extern int errno; #undef fwrite #endif -#ifndef HAVE_H_ERRNO -extern int h_errno; -#endif - #include #include #include @@ -81,6 +86,17 @@ extern int h_errno; #include #endif +#ifdef HAVE_STDLIB_H +#include +#endif + +#ifdef HAVE_SETPGID +#if !defined (USG) || defined (BSD_PGRPS) +#undef setpgrp +#define setpgrp setpgid +#endif +#endif + /* Get SI_SRPC_DOMAIN, if it is available. */ #ifdef HAVE_SYS_SYSTEMINFO_H #include @@ -98,7 +114,11 @@ extern unsigned start __asm__ ("start"); #endif #endif +#ifndef USE_CRT_DLL +#ifndef errno extern int errno; +#endif +#endif #ifdef VMS #include @@ -147,9 +167,8 @@ extern int errno; #undef TIOCSWINSZ #endif -#if defined(USG) || defined(DGUX) +#if defined (USG) || defined (DGUX) #include -#include #ifndef MEMORY_IN_STRING_H #include #endif @@ -166,6 +185,7 @@ extern int errno; extern int quit_char; +#include "keyboard.h" #include "frame.h" #include "window.h" #include "termhooks.h" @@ -203,10 +223,6 @@ struct utimbuf { #endif #endif -#ifndef VFORK_RETURN_TYPE -#define VFORK_RETURN_TYPE int -#endif - /* LPASS8 is new in 4.3, and makes cbreak mode provide all 8 bits. */ #ifndef LPASS8 #define LPASS8 0 @@ -226,23 +242,35 @@ static int baud_convert[] = }; #endif +#ifdef HAVE_SPEED_T +#include +#else #if defined (HAVE_LIBNCURSES) && ! defined (NCURSES_OSPEED_T) -extern short ospeed; #else -#if defined (HAVE_TERMIOS_H) && defined (LINUX) +#if defined (HAVE_TERMIOS_H) && defined (GNU_LINUX) #include -/* HJL's version of libc is said to need this on the Alpha. - On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short. */ -extern speed_t ospeed; -#else -extern short ospeed; #endif #endif +#endif + +int emacs_ospeed; /* The file descriptor for Emacs's input terminal. Under Unix, this is normally zero except when using X; under VMS, we place the input channel number here. */ int input_fd; + +void croak P_ ((char *)); + +#ifdef AIXHFT +void hft_init (); +void hft_reset (); +#endif + +/* Temporary used by `sigblock' when defined in terms of signprocmask. */ + +SIGMASKTYPE sigprocmask_set; + /* Specify a different file descriptor for further input operations. */ @@ -298,6 +326,7 @@ discard_tty_input () /* Arrange for character C to be read as the next input from the terminal. */ +void stuff_char (c) char c; { @@ -318,32 +347,32 @@ void init_baud_rate () { if (noninteractive) - ospeed = 0; + emacs_ospeed = 0; else { #ifdef INIT_BAUD_RATE INIT_BAUD_RATE (); #else #ifdef DOS_NT - ospeed = 15; + emacs_ospeed = 15; #else /* not DOS_NT */ #ifdef VMS struct sensemode sg; SYS$QIOW (0, input_fd, IO$_SENSEMODE, &sg, 0, 0, &sg.class, 12, 0, 0, 0, 0 ); - ospeed = sg.xmit_baud; + emacs_ospeed = sg.xmit_baud; #else /* not VMS */ #ifdef HAVE_TERMIOS struct termios sg; sg.c_cflag = B9600; tcgetattr (input_fd, &sg); - ospeed = cfgetospeed (&sg); + emacs_ospeed = cfgetospeed (&sg); #if defined (USE_GETOBAUD) && defined (getobaud) /* m88k-motorola-sysv3 needs this (ghazi@noc.rutgers.edu) 9/1/94. */ - if (ospeed == 0) - ospeed = getobaud (sg.c_cflag); + if (emacs_ospeed == 0) + emacs_ospeed = getobaud (sg.c_cflag); #endif #else /* neither VMS nor TERMIOS */ #ifdef HAVE_TERMIO @@ -355,14 +384,14 @@ init_baud_rate () #else ioctl (input_fd, TCGETA, &sg); #endif - ospeed = sg.c_cflag & CBAUD; + emacs_ospeed = sg.c_cflag & CBAUD; #else /* neither VMS nor TERMIOS nor TERMIO */ struct sgttyb sg; sg.sg_ospeed = B9600; if (ioctl (input_fd, TIOCGETP, &sg) < 0) abort (); - ospeed = sg.sg_ospeed; + emacs_ospeed = sg.sg_ospeed; #endif /* not HAVE_TERMIO */ #endif /* not HAVE_TERMIOS */ #endif /* not VMS */ @@ -370,13 +399,14 @@ init_baud_rate () #endif /* not INIT_BAUD_RATE */ } - baud_rate = (ospeed < sizeof baud_convert / sizeof baud_convert[0] - ? baud_convert[ospeed] : 9600); + baud_rate = (emacs_ospeed < sizeof baud_convert / sizeof baud_convert[0] + ? baud_convert[emacs_ospeed] : 9600); if (baud_rate == 0) baud_rate = 1200; } /*ARGSUSED*/ +void set_exclusive_use (fd) int fd; { @@ -448,14 +478,16 @@ wait_for_termination (pid) break; wait (0); #else /* neither BSD_SYSTEM nor UNIPLUS: random sysV */ -#ifdef POSIX_SIGNALS /* would this work for LINUX as well? */ +#ifdef POSIX_SIGNALS /* would this work for GNU/Linux as well? */ sigblock (sigmask (SIGCHLD)); - if (0 > kill (pid, 0)) + errno = 0; + if (kill (pid, 0) == -1 && errno == ESRCH) { sigunblock (sigmask (SIGCHLD)); break; } - sigpause (SIGEMPTYMASK); + + sigsuspend (&empty_mask); #else /* not POSIX_SIGNALS */ #ifdef HAVE_SYSV_SIGPAUSE sighold (SIGCHLD); @@ -554,6 +586,13 @@ child_setup_tty (out) #endif s.main.c_lflag &= ~ECHO; /* Disable echo */ s.main.c_lflag |= ISIG; /* Enable signals */ +#if 0 /* This causes bugs in (for instance) telnet to certain sites. */ + s.main.c_iflag &= ~ICRNL; /* Disable map of CR to NL on input */ +#ifdef INLCR /* Just being cautious, since I can't check how + widespread INLCR is--rms. */ + s.main.c_iflag &= ~INLCR; /* Disable map of NL to CR on input */ +#endif +#endif #ifdef IUCLC s.main.c_iflag &= ~IUCLC; /* Disable downcasing on input. */ #endif @@ -694,7 +733,7 @@ sys_suspend () } return -1; #else -#if defined(SIGTSTP) && !defined(MSDOS) +#if defined (SIGTSTP) && !defined (MSDOS) { int pgrp = EMACS_GETPGRP (0); @@ -720,6 +759,7 @@ sys_suspend () /* Fork a subshell. */ +#ifndef MAC_OS8 void sys_subshell () { @@ -755,9 +795,9 @@ sys_subshell () goto xyzzy; dir = expand_and_dir_to_file (Funhandled_file_name_directory (dir), Qnil); - str = (unsigned char *) alloca (XSTRING (dir)->size + 2); - len = XSTRING (dir)->size; - bcopy (XSTRING (dir)->data, str, len); + str = (unsigned char *) alloca (SCHARS (dir) + 2); + len = SCHARS (dir); + bcopy (SDATA (dir), str, len); if (str[len - 1] != '/') str[len++] = '/'; str[len] = 0; xyzzy: @@ -790,7 +830,7 @@ sys_subshell () /* Use our buffer's default directory for the subshell. */ if (str) - chdir (str); + chdir ((char *) str); #ifdef subprocesses close_process_descs (); /* Close Emacs's pipes/ptys */ @@ -798,7 +838,7 @@ sys_subshell () #ifdef SET_EMACS_PRIORITY { - extern int emacs_priority; + extern EMACS_INT emacs_priority; if (emacs_priority < 0) nice (-emacs_priority); @@ -806,8 +846,23 @@ sys_subshell () #endif #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida */ - st = system (sh); - chdir (oldwd); + { + char *epwd = getenv ("PWD"); + char old_pwd[MAXPATHLEN+1+4]; + + /* If PWD is set, pass it with corrected value. */ + if (epwd) + { + strcpy (old_pwd, epwd); + if (str[len - 1] == '/') + str[len - 1] = '\0'; + setenv ("PWD", str, 1); + } + st = system (sh); + chdir (oldwd); + if (epwd) + putenv (old_pwd); /* restore previous value */ + } #if 0 /* This is also reported if last command executed in subshell failed, KFS */ if (st) report_file_error ("Can't execute subshell", Fcons (build_string (sh), Qnil)); @@ -840,6 +895,7 @@ sys_subshell () synch_process_alive = 0; #endif /* !VMS */ } +#endif /* !MAC_OS8 */ static void save_signal_handlers (saved_handlers) @@ -879,6 +935,7 @@ init_sigio (fd) interrupts_deferred = 0; } +void reset_sigio () { unrequest_sigio (); @@ -955,11 +1012,11 @@ request_sigio () if (read_socket_hook) return; - sigemptyset(&st); - sigaddset(&st, SIGIO); + sigemptyset (&st); + sigaddset (&st, SIGIO); ioctl (input_fd, FIOASYNC, &on); interrupts_deferred = 0; - sigprocmask(SIG_UNBLOCK, &st, (sigset_t *)0); + sigprocmask (SIG_UNBLOCK, &st, (sigset_t *)0); } void @@ -1027,6 +1084,7 @@ int inherited_pgroup; When we are in the foreground, but not started in our own process group, redirect the TTY to point to our own process group. We need to be in our own process group to receive SIGIO properly. */ +void narrow_foreground_group () { int me = getpid (); @@ -1038,6 +1096,7 @@ narrow_foreground_group () } /* Set the tty to our original foreground group. */ +void widen_foreground_group () { if (inherited_pgroup != getpid ()) @@ -1060,6 +1119,7 @@ emacs_get_tty (fd, settings) /* Retrieve the primary parameters - baud rate, character size, etcetera. */ #ifdef HAVE_TCATTR /* We have those nifty POSIX tcmumbleattr functions. */ + bzero (&settings->main, sizeof (settings->main)); if (tcgetattr (fd, &settings->main) < 0) return -1; @@ -1120,7 +1180,7 @@ emacs_set_tty (fd, settings, flushp) int i; /* We have those nifty POSIX tcmumbleattr functions. William J. Smith writes: - "POSIX 1003.1 defines tcsetattr() to return success if it was + "POSIX 1003.1 defines tcsetattr to return success if it was able to perform any of the requested actions, even if some of the requested actions could not be performed. We must read settings back to ensure tty setup properly. @@ -1138,6 +1198,7 @@ emacs_set_tty (fd, settings, flushp) { struct termios new; + bzero (&new, sizeof (new)); /* Get the current settings, and see if they're what we asked for. */ tcgetattr (fd, &new); /* We cannot use memcmp on the whole structure here because under @@ -1148,7 +1209,7 @@ emacs_set_tty (fd, settings, flushp) && new.c_oflag == settings->main.c_oflag && new.c_cflag == settings->main.c_cflag && new.c_lflag == settings->main.c_lflag - && memcmp(new.c_cc, settings->main.c_cc, NCCS) == 0) + && memcmp (new.c_cc, settings->main.c_cc, NCCS) == 0) break; else continue; @@ -1222,11 +1283,15 @@ int old_fcntl_owner; but if so, this does no harm, and using the same name avoids wasting the other one's space. */ +#ifdef nec_ews_svr4 +extern char *_sobuf ; +#else #if defined (USG) || defined (DGUX) unsigned char _sobuf[BUFSIZ+8]; #else char _sobuf[BUFSIZ]; #endif +#endif #ifdef HAVE_LTCHARS static struct ltchars new_ltchars = {-1,-1,-1,-1,-1,-1}; @@ -1240,6 +1305,16 @@ init_sys_modes () { struct emacs_tty tty; +#ifdef MAC_OS8 +/* cus-start.el complains if delete-exited-processes is not defined */ +#ifndef subprocesses + DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, + doc: /* *Non-nil means delete processes immediately when they exit. +nil means don't delete them until `list-processes' is run. */); + delete_exited_processes = 0; +#endif +#endif /* MAC_OS8 */ + #ifdef VMS #if 0 static int oob_chars[2] = {0, 1 << 7}; /* catch C-g's */ @@ -1441,7 +1516,7 @@ init_sys_modes () tty.main.tt2_char |= TT2$M_PASTHRU | TT2$M_XON; #else /* not VMS (BSD, that is) */ #ifndef DOS_NT - Vtty_erase_char = tty.main.sg_erase; + XSETINT (Vtty_erase_char, tty.main.sg_erase); tty.main.sg_flags &= ~(ECHO | CRMOD | XTABS); if (meta_key) tty.main.sg_flags |= ANYP; @@ -1559,9 +1634,9 @@ init_sys_modes () /* This symbol is defined on recent USG systems. Someone says without this call USG won't really buffer the file even with a call to setbuf. */ - setvbuf (stdout, _sobuf, _IOFBF, sizeof _sobuf); + setvbuf (stdout, (char *) _sobuf, _IOFBF, sizeof _sobuf); #else - setbuf (stdout, _sobuf); + setbuf (stdout, (char *) _sobuf); #endif #ifdef HAVE_WINDOW_SYSTEM /* Emacs' window system on MSDOG uses the `internal terminal' and therefore @@ -1576,6 +1651,11 @@ init_sys_modes () #endif set_terminal_modes (); + if (!term_initted + && FRAMEP (Vterminal_frame) + && FRAME_TERMCAP_P (XFRAME (Vterminal_frame))) + init_frame_faces (XFRAME (Vterminal_frame)); + if (term_initted && no_redraw_on_reenter) { if (display_completed) @@ -1594,6 +1674,7 @@ init_sys_modes () /* Return nonzero if safe to use tabs in output. At the time this is called, init_sys_modes has not been done yet. */ +int tabs_safe_p () { struct emacs_tty tty; @@ -1705,6 +1786,8 @@ set_window_size (fd, height, width) void reset_sys_modes () { + struct frame *sf; + if (noninteractive) { fflush (stdout); @@ -1724,10 +1807,11 @@ reset_sys_modes () ) return; #endif - cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0); - clear_end_of_line (FRAME_WIDTH (selected_frame)); + sf = SELECTED_FRAME (); + cursor_to (FRAME_HEIGHT (sf) - 1, 0); + clear_end_of_line (FRAME_WIDTH (sf)); /* clear_end_of_line may move the cursor */ - cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0); + cursor_to (FRAME_HEIGHT (sf) - 1, 0); #if defined (IBMR2AIX) && defined (AIXHFT) { /* HFT devices normally use ^J as a LF/CR. We forced it to @@ -1823,7 +1907,7 @@ setup_pty (fd) Since the latter lossage is more benign, we may as well lose that way. -- cph */ #ifdef FIONBIO -#ifdef SYSV_PTYS +#if defined(SYSV_PTYS) || defined(UNIX98_PTYS) { int on = 1; ioctl (fd, FIONBIO, &on); @@ -1847,6 +1931,7 @@ setup_pty (fd) This is called each time Emacs is resumed, also, but does nothing because input_chain is no longer zero. */ +void init_vms_input () { int status; @@ -1861,6 +1946,7 @@ init_vms_input () /* Deassigning the input channel is done before exiting. */ +void stop_vms_input () { return SYS$DASSGN (input_fd); @@ -1871,6 +1957,7 @@ short input_buffer; /* Request reading one character into the keyboard buffer. This is done as soon as the buffer becomes empty. */ +void queue_kbd_input () { int status; @@ -1888,6 +1975,7 @@ int input_count; /* Ast routine that is called when keyboard input comes in in accord with the SYS$QIO above. */ +void kbd_input_ast () { register int c = -1; @@ -1923,9 +2011,9 @@ kbd_input_ast () if (c >= 0) { struct input_event e; - e.kind = ascii_keystroke; + e.kind = ASCII_KEYSTROKE_EVENT; XSETINT (e.code, c); - XSETFRAME (e.frame_or_window, selected_frame); + e.frame_or_window = selected_frame; kbd_buffer_store_event (&e); } if (input_available_clear_time) @@ -1935,6 +2023,7 @@ kbd_input_ast () /* Wait until there is something in kbd_buffer. */ +void wait_for_kbd_input () { extern int have_process_input, process_exited; @@ -1953,7 +2042,7 @@ wait_for_kbd_input () /* No timing error: wait for flag to be set. */ set_waiting_for_input (0); SYS$WFLOR (input_ef, input_eflist); - clear_waiting_for_input (0); + clear_waiting_for_input (); if (!detect_input_pending ()) /* Check for subprocess input availability */ { @@ -1968,7 +2057,7 @@ wait_for_kbd_input () { update_mode_lines++; prepare_menu_bars (); - redisplay_preserve_echo_area (); + redisplay_preserve_echo_area (18); } } } @@ -1981,6 +2070,7 @@ wait_for_kbd_input () and therefore there is no I/O request queued when we return. SYS$SETAST is used to avoid a timing error. */ +void end_kbd_input () { #ifdef ASTDEBUG @@ -2007,6 +2097,7 @@ end_kbd_input () /* Wait for either input available or time interval expiry. */ +void input_wait_timeout (timeval) int timeval; /* Time to wait, in seconds */ { @@ -2100,6 +2191,7 @@ unrequest_sigio () * */ +#if !(defined (__NetBSD__) && defined (__ELF__)) #ifndef HAVE_TEXT_START char * start_of_text () @@ -2117,6 +2209,7 @@ start_of_text () #endif /* TEXT_START */ } #endif /* not HAVE_TEXT_START */ +#endif /* * Return the address of the start of the data segment prior to @@ -2144,6 +2237,7 @@ start_of_text () * */ +#ifndef start_of_data char * start_of_data () { @@ -2159,51 +2253,15 @@ start_of_data () */ extern char **environ; - return((char *) &environ); + return ((char *) &environ); #else extern int data_start; return ((char *) &data_start); #endif /* ORDINARY_LINK */ #endif /* DATA_START */ } +#endif /* start_of_data */ #endif /* NEED_STARTS (not CANNOT_DUMP or not SYSTEM_MALLOC) */ - -#ifndef CANNOT_DUMP -/* Some systems that cannot dump also cannot implement these. */ - -/* - * Return the address of the end of the text segment prior to - * doing an unexec. After unexec the return value is undefined. - */ - -char * -end_of_text () -{ -#ifdef TEXT_END - return ((char *) TEXT_END); -#else - extern int etext; - return ((char *) &etext); -#endif -} - -/* - * Return the address of the end of the data segment prior to - * doing an unexec. After unexec the return value is undefined. - */ - -char * -end_of_data () -{ -#ifdef DATA_END - return ((char *) DATA_END); -#else - extern int edata; - return ((char *) &edata); -#endif -} - -#endif /* not CANNOT_DUMP */ /* init_system_name sets up the string for the Lisp function system-name to return. */ @@ -2223,6 +2281,12 @@ extern Lisp_Object Vsystem_name; #endif /* not VMS */ #endif /* not BSD4_1 */ +#ifdef TRY_AGAIN +#ifndef HAVE_H_ERRNO +extern int h_errno; +#endif +#endif /* TRY_AGAIN */ + void init_system_name () { @@ -2290,7 +2354,9 @@ init_system_name () if (hp) { char *fqdn = (char *) hp->h_name; +#if 0 char *p; +#endif if (!index (fqdn, '.')) { @@ -2364,7 +2430,7 @@ init_system_name () #endif /* BSD4_1 */ { unsigned char *p; - for (p = XSTRING (Vsystem_name)->data; *p; p++) + for (p = SDATA (Vsystem_name); *p; p++) if (*p == ' ' || *p == '\t') *p = '-'; } @@ -2420,7 +2486,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) SELECT_TYPE *rfds, *wfds, *efds; EMACS_TIME *timeout; { - int ravail = 0, old_alarm; + int ravail = 0; SELECT_TYPE orfds; int timeoutval; int *local_timeout; @@ -2430,7 +2496,6 @@ sys_select (nfds, rfds, wfds, efds, timeout) #else extern int process_tick, update_tick; #endif - SIGTYPE (*old_trap) (); unsigned char buf; #if defined (HAVE_SELECT) && defined (HAVE_X_WINDOWS) @@ -2513,10 +2578,12 @@ sys_select (nfds, rfds, wfds, efds, timeout) } if (*local_timeout == 0 || ravail != 0 || process_tick != update_tick) break; - old_alarm = alarm (0); - old_trap = signal (SIGALRM, select_alarm); + + turn_on_atimers (0); + signal (SIGALRM, select_alarm); select_alarmed = 0; alarm (SELECT_PAUSE); + /* Wait for a SIGALRM (or maybe a SIGTINT) */ while (select_alarmed == 0 && *local_timeout != 0 && process_tick == update_tick) @@ -2534,18 +2601,10 @@ sys_select (nfds, rfds, wfds, efds, timeout) pause (); } (*local_timeout) -= SELECT_PAUSE; - /* Reset the old alarm if there was one */ - alarm (0); - signal (SIGALRM, old_trap); - if (old_alarm != 0) - { - /* Reset or forge an interrupt for the original handler. */ - old_alarm -= SELECT_PAUSE; - if (old_alarm <= 0) - kill (getpid (), SIGALRM); /* Fake an alarm with the orig' handler */ - else - alarm (old_alarm); - } + + /* Reset the old alarm if there was one. */ + turn_on_atimers (1); + if (*local_timeout == 0) /* Stop on timer being cleared */ break; } @@ -2563,6 +2622,7 @@ sys_select (nfds, rfds, wfds, efds, timeout) #define BUFFER_SIZE_FACTOR 1 #endif +void read_input_waiting () { struct input_event e; @@ -2575,7 +2635,7 @@ read_input_waiting () read_alarm_should_throw = 0; if (! setjmp (read_alarm_throw)) - nread = (*read_socket_hook) (0, buf, 256, 1, 0); + nread = (*read_socket_hook) (0, buf, 256, 1); else nread = -1; @@ -2585,7 +2645,7 @@ read_input_waiting () kbd_buffer_store_event (&buf[i]); /* Don't look at input that follows a C-g too closely. This reduces lossage due to autorepeat on C-g. */ - if (buf[i].kind == ascii_keystroke + if (buf[i].kind == ASCII_KEYSTROKE_EVENT && buf[i].code == quit_char) break; } @@ -2596,8 +2656,8 @@ read_input_waiting () nread = read (fileno (stdin), buf, 1); /* Scan the chars for C-g and store them in kbd_buffer. */ - e.kind = ascii_keystroke; - XSETFRAME (e.frame_or_window, selected_frame); + e.kind = ASCII_KEYSTROKE_EVENT; + e.frame_or_window = selected_frame; e.modifiers = 0; for (i = 0; i < nread; i++) { @@ -2627,25 +2687,6 @@ read_input_waiting () #endif /* not MSDOS */ #ifdef BSD4_1 -/* - * Partially emulate 4.2 open call. - * open is defined as this in 4.1. - * - * - added by Michael Bloom @ Citicorp/TTI - * - */ - -int -sys_open (path, oflag, mode) - char *path; - int oflag, mode; -{ - if (oflag & O_CREAT) - return creat (path, mode); - else - return open (path, oflag); -} - void init_sigio (fd) int fd; @@ -2656,6 +2697,7 @@ init_sigio (fd) ioctl (fd, TIOCLSET, &lmode); } +void reset_sigio () { if (noninteractive) @@ -2685,6 +2727,7 @@ unrequest_sigio () int sigheld; /* Mask of held signals */ +void sigholdx (signum) int signum; { @@ -2692,12 +2735,14 @@ sigholdx (signum) sighold (signum); } +void sigisheld (signum) int signum; { sigheld |= sigbit (signum); } +void sigunhold (signum) int signum; { @@ -2705,6 +2750,7 @@ sigunhold (signum) sigrelse (signum); } +void sigfree () /* Free all held signals */ { int i; @@ -2714,6 +2760,7 @@ sigfree () /* Free all held signals */ sigheld = 0; } +int sigbit (i) { return 1 << (i - 1); @@ -2726,24 +2773,20 @@ sigbit (i) #ifdef POSIX_SIGNALS -sigset_t old_mask, empty_mask, full_mask, temp_mask; -static struct sigaction new_action, old_action; - -init_signals () -{ - sigemptyset (&empty_mask); - sigfillset (&full_mask); -} +sigset_t empty_mask, full_mask; signal_handler_t sys_signal (int signal_number, signal_handler_t action) { + struct sigaction new_action, old_action; sigemptyset (&new_action.sa_mask); new_action.sa_handler = action; -#ifdef SA_RESTART +#if defined (SA_RESTART) && ! defined (BROKEN_SA_RESTART) /* Emacs mostly works better with restartable system services. If this - * flag exists, we probably want to turn it on here. - */ + flag exists, we probably want to turn it on here. + However, on some systems this resets the timeout of `select' + which means that `select' never finishes if it keeps getting signals. + BROKEN_SA_RESTART is defined on those systems. */ new_action.sa_flags = SA_RESTART; #else new_action.sa_flags = 0; @@ -2765,14 +2808,6 @@ sys_sigmask (int sig) } #endif -int -sys_sigpause (sigset_t new_mask) -{ - /* pause emulating berk sigpause... */ - sigsuspend (&new_mask); - return (EINTR); -} - /* I'd like to have these guys return pointers to the mask storage in here, but there'd be trouble if the code was saving multiple masks. I'll be safe and pass the structure. It normally won't be more than 2 bytes @@ -2804,6 +2839,185 @@ sys_sigsetmask (sigset_t new_mask) #endif /* POSIX_SIGNALS */ +#if !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED +static char *my_sys_siglist[NSIG]; +# ifdef sys_siglist +# undef sys_siglist +# endif +# define sys_siglist my_sys_siglist +#endif + +void +init_signals () +{ +#ifdef POSIX_SIGNALS + sigemptyset (&empty_mask); + sigfillset (&full_mask); +#endif + +#if !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED + if (! initialized) + { +# ifdef SIGABRT + sys_siglist[SIGABRT] = "Aborted"; +# endif +# ifdef SIGAIO + sys_siglist[SIGAIO] = "LAN I/O interrupt"; +# endif +# ifdef SIGALRM + sys_siglist[SIGALRM] = "Alarm clock"; +# endif +# ifdef SIGBUS + sys_siglist[SIGBUS] = "Bus error"; +# endif +# ifdef SIGCLD + sys_siglist[SIGCLD] = "Child status changed"; +# endif +# ifdef SIGCHLD + sys_siglist[SIGCHLD] = "Child status changed"; +# endif +# ifdef SIGCONT + sys_siglist[SIGCONT] = "Continued"; +# endif +# ifdef SIGDANGER + sys_siglist[SIGDANGER] = "Swap space dangerously low"; +# endif +# ifdef SIGDGNOTIFY + sys_siglist[SIGDGNOTIFY] = "Notification message in queue"; +# endif +# ifdef SIGEMT + sys_siglist[SIGEMT] = "Emulation trap"; +# endif +# ifdef SIGFPE + sys_siglist[SIGFPE] = "Arithmetic exception"; +# endif +# ifdef SIGFREEZE + sys_siglist[SIGFREEZE] = "SIGFREEZE"; +# endif +# ifdef SIGGRANT + sys_siglist[SIGGRANT] = "Monitor mode granted"; +# endif +# ifdef SIGHUP + sys_siglist[SIGHUP] = "Hangup"; +# endif +# ifdef SIGILL + sys_siglist[SIGILL] = "Illegal instruction"; +# endif +# ifdef SIGINT + sys_siglist[SIGINT] = "Interrupt"; +# endif +# ifdef SIGIO + sys_siglist[SIGIO] = "I/O possible"; +# endif +# ifdef SIGIOINT + sys_siglist[SIGIOINT] = "I/O intervention required"; +# endif +# ifdef SIGIOT + sys_siglist[SIGIOT] = "IOT trap"; +# endif +# ifdef SIGKILL + sys_siglist[SIGKILL] = "Killed"; +# endif +# ifdef SIGLOST + sys_siglist[SIGLOST] = "Resource lost"; +# endif +# ifdef SIGLWP + sys_siglist[SIGLWP] = "SIGLWP"; +# endif +# ifdef SIGMSG + sys_siglist[SIGMSG] = "Monitor mode data available"; +# endif +# ifdef SIGPHONE + sys_siglist[SIGWIND] = "SIGPHONE"; +# endif +# ifdef SIGPIPE + sys_siglist[SIGPIPE] = "Broken pipe"; +# endif +# ifdef SIGPOLL + sys_siglist[SIGPOLL] = "Pollable event occurred"; +# endif +# ifdef SIGPROF + sys_siglist[SIGPROF] = "Profiling timer expired"; +# endif +# ifdef SIGPTY + sys_siglist[SIGPTY] = "PTY I/O interrupt"; +# endif +# ifdef SIGPWR + sys_siglist[SIGPWR] = "Power-fail restart"; +# endif +# ifdef SIGQUIT + sys_siglist[SIGQUIT] = "Quit"; +# endif +# ifdef SIGRETRACT + sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode"; +# endif +# ifdef SIGSAK + sys_siglist[SIGSAK] = "Secure attention"; +# endif +# ifdef SIGSEGV + sys_siglist[SIGSEGV] = "Segmentation violation"; +# endif +# ifdef SIGSOUND + sys_siglist[SIGSOUND] = "Sound completed"; +# endif +# ifdef SIGSTOP + sys_siglist[SIGSTOP] = "Stopped (signal)"; +# endif +# ifdef SIGSTP + sys_siglist[SIGSTP] = "Stopped (user)"; +# endif +# ifdef SIGSYS + sys_siglist[SIGSYS] = "Bad argument to system call"; +# endif +# ifdef SIGTERM + sys_siglist[SIGTERM] = "Terminated"; +# endif +# ifdef SIGTHAW + sys_siglist[SIGTHAW] = "SIGTHAW"; +# endif +# ifdef SIGTRAP + sys_siglist[SIGTRAP] = "Trace/breakpoint trap"; +# endif +# ifdef SIGTSTP + sys_siglist[SIGTSTP] = "Stopped (user)"; +# endif +# ifdef SIGTTIN + sys_siglist[SIGTTIN] = "Stopped (tty input)"; +# endif +# ifdef SIGTTOU + sys_siglist[SIGTTOU] = "Stopped (tty output)"; +# endif +# ifdef SIGURG + sys_siglist[SIGURG] = "Urgent I/O condition"; +# endif +# ifdef SIGUSR1 + sys_siglist[SIGUSR1] = "User defined signal 1"; +# endif +# ifdef SIGUSR2 + sys_siglist[SIGUSR2] = "User defined signal 2"; +# endif +# ifdef SIGVTALRM + sys_siglist[SIGVTALRM] = "Virtual timer expired"; +# endif +# ifdef SIGWAITING + sys_siglist[SIGWAITING] = "Process's LWPs are blocked"; +# endif +# ifdef SIGWINCH + sys_siglist[SIGWINCH] = "Window size changed"; +# endif +# ifdef SIGWIND + sys_siglist[SIGWIND] = "SIGWIND"; +# endif +# ifdef SIGXCPU + sys_siglist[SIGXCPU] = "CPU time limit exceeded"; +# endif +# ifdef SIGXFSZ + sys_siglist[SIGXFSZ] = "File size limit exceeded"; +# endif + } +#endif /* !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED */ +} + #ifndef HAVE_RANDOM #ifdef random #define HAVE_RANDOM @@ -3011,26 +3225,25 @@ strerror (errnum) #endif /* not WINDOWSNT */ #endif /* ! HAVE_STRERROR */ -#ifdef INTERRUPTIBLE_OPEN - int -/* VARARGS 2 */ -sys_open (path, oflag, mode) - char *path; +emacs_open (path, oflag, mode) + const char *path; int oflag, mode; { register int rtnval; + +#ifdef BSD4_1 + if (oflag & O_CREAT) + return creat (path, mode); +#endif while ((rtnval = open (path, oflag, mode)) == -1 && (errno == EINTR)); return (rtnval); } -#endif /* INTERRUPTIBLE_OPEN */ - -#ifdef INTERRUPTIBLE_CLOSE - -sys_close (fd) +int +emacs_close (fd) int fd; { int did_retry = 0; @@ -3049,12 +3262,8 @@ sys_close (fd) return rtnval; } -#endif /* INTERRUPTIBLE_CLOSE */ - -#ifdef INTERRUPTIBLE_IO - int -sys_read (fildes, buf, nbyte) +emacs_read (fildes, buf, nbyte) int fildes; char *buf; unsigned int nbyte; @@ -3067,9 +3276,9 @@ sys_read (fildes, buf, nbyte) } int -sys_write (fildes, buf, nbyte) +emacs_write (fildes, buf, nbyte) int fildes; - char *buf; + const char *buf; unsigned int nbyte; { register int rtnval, bytes_written; @@ -3094,22 +3303,6 @@ sys_write (fildes, buf, nbyte) } return (bytes_written); } - -#endif /* INTERRUPTIBLE_IO */ - -#ifndef HAVE_VFORK -#ifndef WINDOWSNT -/* - * Substitute fork for vfork on USG flavors. - */ - -VFORK_RETURN_TYPE -vfork () -{ - return (fork ()); -} -#endif /* not WINDOWSNT */ -#endif /* not HAVE_VFORK */ #ifdef USG /* @@ -3127,93 +3320,6 @@ vfork () * always negligible. Fred Fish, Unisoft Systems Inc. */ -#ifndef HAVE_SYS_SIGLIST -char *sys_siglist[NSIG + 1] = -{ -#ifdef AIX -/* AIX has changed the signals a bit */ - "bogus signal", /* 0 */ - "hangup", /* 1 SIGHUP */ - "interrupt", /* 2 SIGINT */ - "quit", /* 3 SIGQUIT */ - "illegal instruction", /* 4 SIGILL */ - "trace trap", /* 5 SIGTRAP */ - "IOT instruction", /* 6 SIGIOT */ - "crash likely", /* 7 SIGDANGER */ - "floating point exception", /* 8 SIGFPE */ - "kill", /* 9 SIGKILL */ - "bus error", /* 10 SIGBUS */ - "segmentation violation", /* 11 SIGSEGV */ - "bad argument to system call", /* 12 SIGSYS */ - "write on a pipe with no one to read it", /* 13 SIGPIPE */ - "alarm clock", /* 14 SIGALRM */ - "software termination signum", /* 15 SIGTERM */ - "user defined signal 1", /* 16 SIGUSR1 */ - "user defined signal 2", /* 17 SIGUSR2 */ - "death of a child", /* 18 SIGCLD */ - "power-fail restart", /* 19 SIGPWR */ - "bogus signal", /* 20 */ - "bogus signal", /* 21 */ - "bogus signal", /* 22 */ - "bogus signal", /* 23 */ - "bogus signal", /* 24 */ - "LAN I/O interrupt", /* 25 SIGAIO */ - "PTY I/O interrupt", /* 26 SIGPTY */ - "I/O intervention required", /* 27 SIGIOINT */ -#ifdef AIXHFT - "HFT grant", /* 28 SIGGRANT */ - "HFT retract", /* 29 SIGRETRACT */ - "HFT sound done", /* 30 SIGSOUND */ - "HFT input ready", /* 31 SIGMSG */ -#endif -#else /* not AIX */ - "bogus signal", /* 0 */ - "hangup", /* 1 SIGHUP */ - "interrupt", /* 2 SIGINT */ - "quit", /* 3 SIGQUIT */ - "illegal instruction", /* 4 SIGILL */ - "trace trap", /* 5 SIGTRAP */ - "IOT instruction", /* 6 SIGIOT */ - "EMT instruction", /* 7 SIGEMT */ - "floating point exception", /* 8 SIGFPE */ - "kill", /* 9 SIGKILL */ - "bus error", /* 10 SIGBUS */ - "segmentation violation", /* 11 SIGSEGV */ - "bad argument to system call", /* 12 SIGSYS */ - "write on a pipe with no one to read it", /* 13 SIGPIPE */ - "alarm clock", /* 14 SIGALRM */ - "software termination signum", /* 15 SIGTERM */ - "user defined signal 1", /* 16 SIGUSR1 */ - "user defined signal 2", /* 17 SIGUSR2 */ - "death of a child", /* 18 SIGCLD */ - "power-fail restart", /* 19 SIGPWR */ -#ifdef sun - "window size change", /* 20 SIGWINCH */ - "urgent socket condition", /* 21 SIGURG */ - "pollable event occurred", /* 22 SIGPOLL */ - "stop (cannot be caught or ignored)", /* 23 SIGSTOP */ - "user stop requested from tty", /* 24 SIGTSTP */ - "stopped process has been continued", /* 25 SIGCONT */ - "background tty read attempted", /* 26 SIGTTIN */ - "background tty write attempted", /* 27 SIGTTOU */ - "virtual timer expired", /* 28 SIGVTALRM */ - "profiling timer expired", /* 29 SIGPROF */ - "exceeded cpu limit", /* 30 SIGXCPU */ - "exceeded file size limit", /* 31 SIGXFSZ */ - "process's lwps are blocked", /* 32 SIGWAITING */ - "special signal used by thread library", /* 33 SIGLWP */ -#ifdef SIGFREEZE - "Special Signal Used By CPR", /* 34 SIGFREEZE */ -#endif -#ifdef SIGTHAW - "Special Signal Used By CPR", /* 35 SIGTHAW */ -#endif -#endif /* sun */ -#endif /* not AIX */ - 0 - }; -#endif /* HAVE_SYS_SIGLIST */ - /* * Warning, this function may not duplicate 4.2 action properly * under error conditions. @@ -3236,7 +3342,10 @@ getwd (pathname) BLOCK_INPUT; /* getcwd uses malloc */ spath = npath = getcwd ((char *) 0, MAXPATHLEN); if (spath == 0) - return spath; + { + UNBLOCK_INPUT; + return spath; + } /* On Altos 3068, getcwd can return @hostname/dir, so discard up to first slash. Should be harmless on other systems. */ while (*npath && *npath != '/') @@ -3301,12 +3410,10 @@ dup2 (oldd, newd) { register int fd, ret; - sys_close (newd); + emacs_close (newd); #ifdef F_DUPFD - fd = fcntl (oldd, F_DUPFD, newd); - if (fd != newd) - error ("can't dup2 (%i,%i) : %s", oldd, newd, strerror (errno)); + return fcntl (oldd, F_DUPFD, newd); #else fd = dup (old); if (fd == -1) @@ -3314,7 +3421,7 @@ dup2 (oldd, newd) if (fd == new) return new; ret = dup2 (old,new); - sys_close (fd); + emacs_close (fd); return ret; #endif } @@ -3333,6 +3440,7 @@ dup2 (oldd, newd) #ifdef HAVE_TIMEVAL /* ARGSUSED */ +int gettimeofday (tp, tzp) struct timeval *tp; struct timezone *tzp; @@ -3343,6 +3451,7 @@ gettimeofday (tp, tzp) tp->tv_usec = 0; if (tzp != 0) tzp->tz_minuteswest = -1; + return 0; } #endif @@ -3354,6 +3463,7 @@ gettimeofday (tp, tzp) * This function will go away as soon as all the stubs fixed. (fnf) */ +void croak (badfunc) char *badfunc; { @@ -3364,87 +3474,13 @@ croak (badfunc) #endif /* USG */ -#ifdef DGUX - -char *sys_siglist[NSIG + 1] = -{ - "null signal", /* 0 SIGNULL */ - "hangup", /* 1 SIGHUP */ - "interrupt", /* 2 SIGINT */ - "quit", /* 3 SIGQUIT */ - "illegal instruction", /* 4 SIGILL */ - "trace trap", /* 5 SIGTRAP */ - "abort termination", /* 6 SIGABRT */ - "SIGEMT", /* 7 SIGEMT */ - "floating point exception", /* 8 SIGFPE */ - "kill", /* 9 SIGKILL */ - "bus error", /* 10 SIGBUS */ - "segmentation violation", /* 11 SIGSEGV */ - "bad argument to system call", /* 12 SIGSYS */ - "write on a pipe with no reader", /* 13 SIGPIPE */ - "alarm clock", /* 14 SIGALRM */ - "software termination signal", /* 15 SIGTERM */ - "user defined signal 1", /* 16 SIGUSR1 */ - "user defined signal 2", /* 17 SIGUSR2 */ - "child stopped or terminated", /* 18 SIGCLD */ - "power-fail restart", /* 19 SIGPWR */ - "window size changed", /* 20 SIGWINCH */ - "undefined", /* 21 */ - "pollable event occurred", /* 22 SIGPOLL */ - "sendable stop signal not from tty", /* 23 SIGSTOP */ - "stop signal from tty", /* 24 SIGSTP */ - "continue a stopped process", /* 25 SIGCONT */ - "attempted background tty read", /* 26 SIGTTIN */ - "attempted background tty write", /* 27 SIGTTOU */ - "undefined", /* 28 */ - "undefined", /* 29 */ - "undefined", /* 30 */ - "undefined", /* 31 */ - "undefined", /* 32 */ - "socket (TCP/IP) urgent data arrival", /* 33 SIGURG */ - "I/O is possible", /* 34 SIGIO */ - "exceeded cpu time limit", /* 35 SIGXCPU */ - "exceeded file size limit", /* 36 SIGXFSZ */ - "virtual time alarm", /* 37 SIGVTALRM */ - "profiling time alarm", /* 38 SIGPROF */ - "undefined", /* 39 */ - "file record locks revoked", /* 40 SIGLOST */ - "undefined", /* 41 */ - "undefined", /* 42 */ - "undefined", /* 43 */ - "undefined", /* 44 */ - "undefined", /* 45 */ - "undefined", /* 46 */ - "undefined", /* 47 */ - "undefined", /* 48 */ - "undefined", /* 49 */ - "undefined", /* 50 */ - "undefined", /* 51 */ - "undefined", /* 52 */ - "undefined", /* 53 */ - "undefined", /* 54 */ - "undefined", /* 55 */ - "undefined", /* 56 */ - "undefined", /* 57 */ - "undefined", /* 58 */ - "undefined", /* 59 */ - "undefined", /* 60 */ - "undefined", /* 61 */ - "undefined", /* 62 */ - "undefined", /* 63 */ - "notification message in mess. queue", /* 64 SIGDGNOTIFY */ - 0 -}; - -#endif /* DGUX */ - /* Directory routines for systems that don't have them. */ #ifdef SYSV_SYSTEM_DIR #include -#if defined(BROKEN_CLOSEDIR) || !defined(HAVE_CLOSEDIR) +#if defined (BROKEN_CLOSEDIR) || !defined (HAVE_CLOSEDIR) int closedir (dirp) @@ -3452,7 +3488,7 @@ closedir (dirp) { int rtnval; - rtnval = sys_close (dirp->dd_fd); + rtnval = emacs_close (dirp->dd_fd); /* Some systems (like Solaris) allocate the buffer and the DIR all in one block. Why in the world are we freeing this ourselves @@ -3477,16 +3513,16 @@ opendir (filename) register int fd; /* file descriptor for read */ struct stat sbuf; /* result of fstat */ - fd = sys_open (filename, 0); + fd = emacs_open (filename, O_RDONLY, 0); if (fd < 0) return 0; BLOCK_INPUT; if (fstat (fd, &sbuf) < 0 || (sbuf.st_mode & S_IFMT) != S_IFDIR - || (dirp = (DIR *) malloc (sizeof (DIR))) == 0) + || (dirp = (DIR *) xmalloc (sizeof (DIR))) == 0) { - sys_close (fd); + emacs_close (fd); UNBLOCK_INPUT; return 0; /* bad luck today */ } @@ -3502,7 +3538,7 @@ void closedir (dirp) register DIR *dirp; /* stream from opendir */ { - sys_close (dirp->dd_fd); + emacs_close (dirp->dd_fd); xfree ((char *) dirp); } @@ -3536,7 +3572,7 @@ readdir (dirp) dirp->dd_loc = dirp->dd_size = 0; if (dirp->dd_size == 0 /* refill buffer */ - && (dirp->dd_size = sys_read (dirp->dd_fd, dirp->dd_buf, DIRBLKSIZ)) <= 0) + && (dirp->dd_size = emacs_read (dirp->dd_fd, dirp->dd_buf, DIRBLKSIZ)) <= 0) return 0; #ifndef VMS @@ -3614,7 +3650,7 @@ readdirver (dirp) int set_file_times (filename, atime, mtime) - char *filename; + const char *filename; EMACS_TIME atime, mtime; { #ifdef HAVE_UTIMES @@ -3689,7 +3725,7 @@ mkdir (dpath, dmode) */ status = umask (0); /* Get current umask */ status = umask (status | (0777 & ~dmode)); /* Set for mkdir */ - fd = sys_open("/dev/null", 2); + fd = emacs_open ("/dev/null", O_RDWR, 0); if (fd >= 0) { dup2 (fd, 0); @@ -3735,7 +3771,7 @@ rmdir (dpath) return (-1); /* Errno is set already */ case 0: /* Child process */ - fd = sys_open("/dev/null", 2); + fd = emacs_open ("/dev/null", O_RDWR, 0); if (fd >= 0) { dup2 (fd, 0); @@ -3878,6 +3914,7 @@ static unsigned int uic; /* Called from init_sys_modes, so it happens not very often but at least each time Emacs is loaded. */ +void sys_access_reinit () { uic = 0; @@ -4130,6 +4167,7 @@ getwd (pathname) return pathname; } +int getppid () { long item_code = JPI$_OWNER; @@ -4152,6 +4190,7 @@ sys_getuid () return (getgid () << 16) | getuid (); } +#undef read int sys_read (fildes, buf, nbyte) int fildes; @@ -4191,6 +4230,7 @@ sys_write (fildes, buf, nbyte) * Thus we do this stupidity below. */ +#undef write int sys_write (fildes, buf, nbytes) int fildes; @@ -4325,6 +4365,7 @@ creat_copy_attrs (old, new) #endif #endif +int sys_creat (va_alist) va_dcl { @@ -4441,6 +4482,7 @@ sys_creat (va_alist) #endif /* creat */ /* fwrite to stdout is S L O W. Speed it up by using fputc...*/ +int sys_fwrite (ptr, size, num, fp) register char * ptr; FILE * fp; @@ -4449,6 +4491,7 @@ sys_fwrite (ptr, size, num, fp) while (tot--) fputc (*ptr++, fp); + return num; } /* @@ -4736,6 +4779,7 @@ getpwuid (uid) /* return total address space available to the current process. This is the sum of the current p0 size, p1 size and free page table entries available. */ +int vlimit () { int item_code; @@ -4771,6 +4815,7 @@ vlimit () return free_pages + frep0va + (0x7fffffff - frep1va); } +int define_logical_name (varname, string) char *varname; char *string; @@ -4785,6 +4830,7 @@ define_logical_name (varname, string) return LIB$SET_LOGICAL (&envdsc, &strdsc, &lnmdsc, 0, 0); } +int delete_logical_name (varname) char *varname; { @@ -4796,15 +4842,23 @@ delete_logical_name (varname) return LIB$DELETE_LOGICAL (&envdsc, &lnmdsc); } +int ulimit () -{} +{ + return 0; +} +int setpgrp () -{} +{ + return 0; +} +int execvp () { error ("execvp system call not implemented"); + return -1; } int @@ -4927,6 +4981,7 @@ rename_sans_version (from,to) return 0; } +int link (file, new) char * file, * new; { @@ -4994,6 +5049,7 @@ link (file, new) return 0; } +void croak (badfunc) char *badfunc; { @@ -5009,6 +5065,7 @@ random () return rand () - (1 << 30); } +void srandom (seed) { srand (seed); @@ -5018,6 +5075,7 @@ srandom (seed) #ifdef AIXHFT /* Called from init_sys_modes. */ +void hft_init () { int junk; @@ -5038,7 +5096,7 @@ hft_init () there's no way to determine the old mapping, so in reset_sys_modes we need to assume that the normal map had been present. Of course, this code also doesn't help if on a terminal emulator which doesn't understand - HFT VTD's. */ + HFT VTD's. */ { struct hfbuf buf; struct hfkeymap keymap; @@ -5069,8 +5127,9 @@ hft_init () line_ins_del_ok = char_ins_del_ok = 0; } -/* Reset the rubout key to backspace. */ +/* Reset the rubout key to backspace. */ +void hft_reset () { struct hfbuf buf; @@ -5190,7 +5249,7 @@ bcopy (b1, b2, length) *b2++ = *b1++; #endif /* not VMS */ } -#endif /* (defined (BSTRING) && !defined (bcopy)) || defined (NEED_BCOPY) */ +#endif /* (!defined (BSTRING) && !defined (bcopy)) || defined (NEED_BCOPY) */ #ifndef BSTRING #ifndef bcmp @@ -5215,3 +5274,25 @@ bcmp (b1, b2, length) /* This could be a macro! */ } #endif /* no bcmp */ #endif /* not BSTRING */ + +#ifndef HAVE_STRSIGNAL +char * +strsignal (code) + int code; +{ + char *signame = 0; + + if (0 <= code && code < NSIG) + { +#ifdef VMS + signame = sys_errlist[code]; +#else + /* Cast to suppress warning if the table has const char *. */ + signame = (char *) sys_siglist[code]; +#endif + } + + return signame; +} +#endif /* HAVE_STRSIGNAL */ +