From: Karl Heuer Date: Mon, 8 Jan 1996 22:34:43 +0000 (+0000) Subject: (PTY_TTY_NAME_SPRINTF): Make failure non-fatal. X-Git-Tag: emacs-19.34~1805 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ac098ffa96fa2f2828eebe488053eb1183c10be;p=emacs.git (PTY_TTY_NAME_SPRINTF): Make failure non-fatal. --- diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h index 2e5d068d193..9d9018aa0be 100644 --- a/src/s/sol2-3.h +++ b/src/s/sol2-3.h @@ -35,16 +35,16 @@ #undef PTY_TTY_NAME_SPRINTF #define PTY_TTY_NAME_SPRINTF \ { \ - char *ptsname(), *ptyname; \ + char *ptsname (), *ptyname; \ \ - sigblock(sigmask(SIGCLD)); \ - if (grantpt(fd) == -1) \ - fatal("could not grant slave pty"); \ - sigunblock(sigmask(SIGCLD)); \ - if (unlockpt(fd) == -1) \ - fatal("could not unlock slave pty"); \ - if (!(ptyname = ptsname(fd))) \ - fatal ("could not enable slave pty"); \ - strncpy(pty_name, ptyname, sizeof(pty_name)); \ - pty_name[sizeof(pty_name) - 1] = 0; \ + sigblock (sigmask (SIGCLD)); \ + if (grantpt (fd) == -1) \ + { close (fd); return -1; } \ + sigunblock (sigmask (SIGCLD)); \ + if (unlockpt (fd) == -1) \ + { close (fd); return -1; } \ + if (!(ptyname = ptsname (fd))) \ + { close (fd); return -1; } \ + strncpy (pty_name, ptyname, sizeof (pty_name)); \ + pty_name[sizeof (pty_name) - 1] = 0; \ }