aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorPaul Eggert2013-07-11 19:03:47 -0700
committerPaul Eggert2013-07-11 19:03:47 -0700
commitbacba3c26522ef297662bace31947d3e4f47c87a (patch)
tree7937ff9ad18bca16aff3ecf1f791632a8dec2ce3 /src/term.c
parent1048af7c8ff6e8a84f802fbe655b95c261a6afc0 (diff)
downloademacs-bacba3c26522ef297662bace31947d3e4f47c87a.tar.gz
emacs-bacba3c26522ef297662bace31947d3e4f47c87a.zip
Fix races with threads and file descriptors.
* configure.ac (PTY_TTY_NAME_SPRINTF): Use emacs_close, not close. * src/callproc.c (Fcall_process_region): * src/dired.c (open_directory): * src/emacs.c (main, Fdaemon_initialized): * src/image.c (x_find_image_file): * src/inotify.c (Finotify_rm_watch): * src/lread.c (Flocate_file_internal): * src/process.c (Fnetwork_interface_list, Fnetwork_interface_info): * src/term.c (term_mouse_moveto, init_tty): * src/termcap.c (tgetent): * src/unexaix.c, src/unexcoff.c (report_error, report_error_1, adjust_lnnoptrs) * src/unexaix.c, src/unexcoff.c, src/unexcw.c, src/unexelf.c (unexec): * src/unexhp9k800.c, src/unexmacosx.c (unexec): * src/callproc.c (Fcall_process_region): Use emacs_close, not close. * src/sysdep.c (POSIX_CLOSE_RESTART, posix_close) [!POSIX_CLOSE_RESTART]: New macro and function, which emulates the POSIX_CLOSE_RESTART macro and posix_close function on current platforms (which all lack them). (emacs_close): Use it. This should fix the races on GNU/Linux and on AIX and on future platforms that support POSIX_CLOSE_RESTART, and it should avoid closing random victim file descriptors on other platforms.
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index 00a3f6837ee..b6878a0abd1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2478,7 +2478,7 @@ term_mouse_moveto (int x, int y)
2478 name = (const char *) ttyname (0); 2478 name = (const char *) ttyname (0);
2479 fd = emacs_open (name, O_WRONLY, 0); 2479 fd = emacs_open (name, O_WRONLY, 0);
2480 SOME_FUNCTION (x, y, fd); 2480 SOME_FUNCTION (x, y, fd);
2481 close (fd); 2481 emacs_close (fd);
2482 last_mouse_x = x; 2482 last_mouse_x = x;
2483 last_mouse_y = y; */ 2483 last_mouse_y = y; */
2484} 2484}
@@ -3012,7 +3012,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
3012 name); 3012 name);
3013 if (!isatty (fd)) 3013 if (!isatty (fd))
3014 { 3014 {
3015 close (fd); 3015 emacs_close (fd);
3016 maybe_fatal (must_succeed, terminal, 3016 maybe_fatal (must_succeed, terminal,
3017 "Not a tty device: %s", 3017 "Not a tty device: %s",
3018 "Not a tty device: %s", 3018 "Not a tty device: %s",