mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

* subshell.c (pty_open_master) [HAVE_SCO]: Fix ambigous `else'.

Browse Source 
[!HAVE_SCO && !HAVE_GRANTPT]: Likewise.
This commit is contained in:
Pavel Roskin 2001-05-17 16:53:35 +00:00
parent d21f09608b
commit 85e2dac3be
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-05-17 Pavel Roskin <proski@gnu.org>
* subshell.c (pty_open_master) [HAVE_SCO]: Fix ambigous `else'.
[!HAVE_SCO && !HAVE_GRANTPT]: Likewise.
2001-05-16 Pavel Roskin <proski@gnu.org>
* subshell.c: Define _GNU_SOURCE to enable prototypes for

12
src/subshell.c
View File

@ -1102,11 +1102,12 @@ static int pty_open_master (char *pty_name)
{
g_snprintf(ptr, 9, "%d",num); /* surpriiise ... SCO lacks itoa() */
/* Try to open master */
if ((pty_master = open (pty_name, O_RDWR)) == -1)
if ((pty_master = open (pty_name, O_RDWR)) == -1) {
if (errno == ENOENT) /* Different from EIO */
return -1; /* Out of pty devices */
else
continue; /* Try next pty device */
}
pty_name [5] = 't'; /* Change "pty" to "tty" */
if (access (pty_name, 6)){
close (pty_master);
@ -1140,7 +1141,7 @@ static int pty_open_slave (const char *pty_name)
/* }}} */
#elif HAVE_GRANTPT
#elif HAVE_GRANTPT /* !HAVE_SCO */
/* {{{ System V version of pty_open_master */
@ -1217,7 +1218,7 @@ static int pty_open_slave (const char *pty_name)
/* }}} */
#else
#else /* !HAVE_SCO && !HAVE_GRANTPT */
/* {{{ BSD version of pty_open_master */
@ -1235,11 +1236,12 @@ static int pty_open_master (char *pty_name)
pty_name [9] = *ptr2;
/* Try to open master */
if ((pty_master = open (pty_name, O_RDWR)) == -1)
if ((pty_master = open (pty_name, O_RDWR)) == -1) {
if (errno == ENOENT) /* Different from EIO */
return -1; /* Out of pty devices */
else
continue; /* Try next pty device */
}
pty_name [5] = 't'; /* Change "pty" to "tty" */
if (access (pty_name, 6)){
close (pty_master);
@ -1274,7 +1276,7 @@ static int pty_open_slave (const char *pty_name)
/* }}} */
#endif
#endif /* !HAVE_SCO && !HAVE_GRANTPT */
/* }}} */