JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix two small setmode()-related bugs

Browse Source
This commit is contained in:
mirabilos
2017-04-02 16:42:44 +02:00
parent a6619d1ef2
commit 9d00cfc02b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
funcs.c
View File

@@ -1971,6 +1971,7 @@ c_read(const char **wp)
#endif #endif
#if defined(__OS2__) && defined(MKSH_WITH_TEXTMODE) #if defined(__OS2__) && defined(MKSH_WITH_TEXTMODE)
int saved_mode; int saved_mode;
int saved_errno;
#endif #endif
while ((c = ksh_getopt(wp, &builtin_opt, c_read_opts)) != -1) while ((c = ksh_getopt(wp, &builtin_opt, c_read_opts)) != -1)
@@ -2105,7 +2106,9 @@ c_read(const char **wp)
#endif #endif
if ((bytesread = blocking_read(fd, xp, bytesleft)) == (size_t)-1) { if ((bytesread = blocking_read(fd, xp, bytesleft)) == (size_t)-1) {
#if defined(__OS2__) && defined(MKSH_WITH_TEXTMODE) #if defined(__OS2__) && defined(MKSH_WITH_TEXTMODE)
saved_errno = errno;
setmode(fd, saved_mode); setmode(fd, saved_mode);
errno = saved_errno;
#endif #endif
if (errno == EINTR) { if (errno == EINTR) {
/* check whether the signal would normally kill */ /* check whether the signal would normally kill */
@@ -2840,7 +2843,7 @@ c_exec(const char **wp MKSH_A_UNUSED)
return (0); return (0);
} }
#if HAVE_MKNOD #if HAVE_MKNOD && !defined(__OS2__)
int int
c_mknod(const char **wp) c_mknod(const char **wp)
{ {