Changeset 2647 in kBuild for trunk/src

Timestamp:

Sep 9, 2012 3:21:35 AM (12 years ago)

Author:

bird

Message:

shfile.c: Fixed bug in shfile_movefd that caused sever file descriptor leakage when using redirection.

File:

• trunk/src/kash/shfile.c (modified) (2 diffs)

trunk/src/kash/shfile.c

@@ -1201 +1201 @@
 
 #else
-    return dup2(fdfrom, fdto);
+    int fdnew = dup2(fdfrom, fdto);
+    if (fdnew >= 0)
+        close(fdfrom);
+    return fdnew;
 #endif
 }
@@ -1503 +1506 @@
         case F_GETFL: TRACE2((NULL, "shfile_fcntl(%d,F_GETFL,ignored=%d) -> %d [%d]\n", fd, arg, rc, errno));  break;
         case F_SETFL: TRACE2((NULL, "shfile_fcntl(%d,F_SETFL,newflags=%#x) -> %d [%d]\n", fd, arg, rc, errno)); break;
-        case F_DUPFD: TRACE2((NULL, "shfile_fcntl(%d,F_DUPFS,minfd=%d) -> %d [%d]\n", fd, arg, rc, errno)); break;
+        case F_DUPFD: TRACE2((NULL, "shfile_fcntl(%d,F_DUPFD,minfd=%d) -> %d [%d]\n", fd, arg, rc, errno)); break;
         default:  TRACE2((NULL, "shfile_fcntl(%d,%d,%d) -> %d [%d]\n", fd, cmd, arg, rc, errno)); break;
     }