/* Return the current working directory. Returns NULL on errors.
Any other returned value must be freed with free. This is used
only when get_current_dir_name is not defined on the system. */
-char*
+char *
get_current_dir_name (void)
{
char *buf;
void
stuff_char (char c)
{
- if (! FRAME_TERMCAP_P (SELECTED_FRAME ()))
+ if (! (FRAMEP (selected_frame)
+ && FRAME_LIVE_P (XFRAME (selected_frame))
+ && FRAME_TERMCAP_P (XFRAME (selected_frame))))
return;
/* Should perhaps error if in batch mode */
#endif /* not DOS_NT */
}
- baud_rate = (emacs_ospeed < EARRAYSIZE (baud_convert)
+ baud_rate = (emacs_ospeed < ARRAYELTS (baud_convert)
? baud_convert[emacs_ospeed] : 9600);
if (baud_rate == 0)
baud_rate = 1200;
#endif
void
-request_sigio (void)
+ignore_sigio (void)
{
#ifdef USABLE_SIGIO
- sigset_t unblocked;
-
- if (noninteractive)
- return;
-
- sigemptyset (&unblocked);
-# ifdef SIGWINCH
- sigaddset (&unblocked, SIGWINCH);
-# endif
- sigaddset (&unblocked, SIGIO);
- pthread_sigmask (SIG_UNBLOCK, &unblocked, 0);
-
- interrupts_deferred = 0;
+ signal (SIGIO, SIG_IGN);
#endif
}
+\f
+#ifndef MSDOS
+/* Block SIGCHLD. */
void
-unrequest_sigio (void)
+block_child_signal (sigset_t *oldset)
{
-#ifdef USABLE_SIGIO
sigset_t blocked;
-
- if (noninteractive)
- return;
-
sigemptyset (&blocked);
-# ifdef SIGWINCH
- sigaddset (&blocked, SIGWINCH);
-# endif
- sigaddset (&blocked, SIGIO);
- pthread_sigmask (SIG_BLOCK, &blocked, 0);
- interrupts_deferred = 1;
-#endif
+ sigaddset (&blocked, SIGCHLD);
+ sigaddset (&blocked, SIGINT);
+ pthread_sigmask (SIG_BLOCK, &blocked, oldset);
}
+/* Unblock SIGCHLD. */
+
void
-ignore_sigio (void)
+unblock_child_signal (sigset_t const *oldset)
{
-#ifdef USABLE_SIGIO
- signal (SIGIO, SIG_IGN);
-#endif
+ pthread_sigmask (SIG_SETMASK, oldset, 0);
}
+#endif /* !MSDOS */
\f
/* Saving and restoring the process group of Emacs's terminal. */
int i;
tty_turn_off_insert (tty_out);
- for (i = curX (tty_out); i < FrameCols (tty_out) - 1; i++)
+ for (i = cursorX (tty_out); i < FrameCols (tty_out) - 1; i++)
{
fputc (' ', tty_out->output);
}
/* When handling a signal, block nonfatal system signals that are caught
by Emacs. This makes race conditions less likely. */
sigaddset (&action->sa_mask, SIGALRM);
+#ifdef SIGCHLD
sigaddset (&action->sa_mask, SIGCHLD);
+#endif
#ifdef SIGDANGER
sigaddset (&action->sa_mask, SIGDANGER);
#endif
static _Noreturn void
handle_arith_signal (int sig)
{
- sigset_t blocked;
- sigemptyset (&blocked);
- sigaddset (&blocked, sig);
- pthread_sigmask (SIG_UNBLOCK, &blocked, 0);
+ pthread_sigmask (SIG_SETMASK, &empty_mask, 0);
xsignal0 (Qarith_error);
}
# ifdef SIGBUS
sys_siglist[SIGBUS] = "Bus error";
# endif
+# ifdef SIGCHLD
sys_siglist[SIGCHLD] = "Child status changed";
+# endif
# ifdef SIGCONT
sys_siglist[SIGCONT] = "Continued";
# endif
#ifdef SIGVTALRM
sigaction (SIGVTALRM, &process_fatal_action, 0);
#endif
-#ifdef SIGXCPU
- sigaction (SIGXCPU, &process_fatal_action, 0);
-#endif
#ifdef SIGXFSZ
sigaction (SIGXFSZ, &process_fatal_action, 0);
#endif
int
emacs_pipe (int fd[2])
{
+#ifdef MSDOS
+ return pipe (fd);
+#else /* !MSDOS */
int result = pipe2 (fd, O_CLOEXEC);
if (! O_CLOEXEC && result == 0)
{
fcntl (fd[1], F_SETFD, FD_CLOEXEC);
}
return result;
+#endif /* !MSDOS */
}
/* Approximate posix_close and POSIX_CLOSE_RESTART well enough for Emacs.
if (gr)
attrs = Fcons (Fcons (Qgroup, build_string (gr->gr_name)), attrs);
- count = SPECPDL_INDEX ();
+ dynwind_begin ();
strcpy (fn, procfn);
procfn_end = fn + strlen (fn);
strcpy (procfn_end, "/stat");
attrs = Fcons (Fcons (Qpmem, make_float (pmem)), attrs);
}
}
- unbind_to (count, Qnil);
+ dynwind_end ();
/* args */
strcpy (procfn_end, "/cmdline");
if (fd >= 0)
{
ptrdiff_t readsize, nread_incr;
+ dynwind_begin ();
record_unwind_protect_int (close_file_unwind, fd);
- record_unwind_protect_nothing ();
nread = cmdline_size = 0;
do
{
cmdline = xpalloc (cmdline, &cmdline_size, 2, STRING_BYTES_BOUND, 1);
- set_unwind_protect_ptr (count + 1, xfree, cmdline);
/* Leave room even if every byte needs escaping below. */
readsize = (cmdline_size >> 1) - nread;
nread = cmdsize + 2;
cmdline_size = nread + 1;
q = cmdline = xrealloc (cmdline, cmdline_size);
- set_unwind_protect_ptr (count + 1, xfree, cmdline);
sprintf (cmdline, "[%.*s]", cmdsize, cmd);
}
/* Command line is encoded in locale-coding-system; decode it. */
cmd_str = make_unibyte_string (q, nread);
decoded_cmd = code_convert_string_norecord (cmd_str,
Vlocale_coding_system, 0);
- unbind_to (count, Qnil);
+ dynwind_end ();
attrs = Fcons (Fcons (Qargs, decoded_cmd), attrs);
}
if (gr)
attrs = Fcons (Fcons (Qgroup, build_string (gr->gr_name)), attrs);
- count = SPECPDL_INDEX ();
+ dynwind_begin ();
strcpy (fn, procfn);
procfn_end = fn + strlen (fn);
strcpy (procfn_end, "/psinfo");
Vlocale_coding_system, 0));
attrs = Fcons (Fcons (Qargs, decoded_cmd), attrs);
}
- unbind_to (count, Qnil);
+ dynwind_end ();
UNGCPRO;
return attrs;
}