procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve init_tty readability

Browse source
This commit is contained in:
Daniel Colascione 2014-03-23 01:29:43 -07:00
parent 6ddc44225e
commit a31161883b
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-23 Daniel Colascione <dancol@dancol.org>
* term.c (init_tty): Rearrange condition for clarity; print
appropriate diagnostic.
2014-03-23 Daniel Colascione <dancol@dancol.org>
* process.c (DATAGRAM_CONN_P): Don't underflow datagram_address

7
src/term.c
View file

@ -4031,12 +4031,15 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
open a frame on the same terminal. */
int flags = O_RDWR | O_NOCTTY | (ctty ? 0 : O_IGNORE_CTTY);
int fd = emacs_open (name, flags, 0);
tty->input = tty->output = fd < 0 || ! isatty (fd) ? 0 : fdopen (fd, "w+");
tty->input = tty->output =
((fd < 0 || ! isatty (fd))
? NULL
: fdopen (fd, "w+"));
if (! tty->input)
{
char const *diagnostic
= tty->input ? "Not a tty device: %s" : "Could not open file: %s";
= (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s";
emacs_close (fd);
maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name);
}