Changeset 1785 for trunk/src/kash/shfile.c

Timestamp:

Sep 14, 2008, 7:31:16 PM (17 years ago)

Author:

bird

Message:

kash: fixed signals. trace all wrapped system calls.

File:

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

trunk/src/kash/shfile.c

@@ -26 +26 @@
 
 #include "shfile.h"
+#include "shinstance.h" /* TRACE2 */
 #include <stdlib.h>
 #include <stdio.h>
@@ -43 +44 @@
 int shfile_open(shfdtab *pfdtab, const char *name, unsigned flags, mode_t mode)
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#elif defined(SH_STUB_MODE)
-    return open(name, flags, mode);
-#else
-#endif
+    int fd;
+
+#ifdef SH_PURE_STUB_MODE
+    fd = -1;
+#elif defined(SH_STUB_MODE)
+    fd = open(name, flags, mode);
+#else
+#endif
+
+    TRACE2((NULL, "shfile_open(%p:{%s}, %#x, 0%o) -> %d [%d]\n", name, name, flags, mode, fd, errno));
+    return fd;
 }
 
@@ -67 +73 @@
 int shfile_dup(shfdtab *pfdtab, int fd)
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#elif defined(SH_STUB_MODE)
-    return dup(fd);
-#else
-#endif
+    int rc;
+#ifdef SH_PURE_STUB_MODE
+    rc = -1;
+#elif defined(SH_STUB_MODE)
+    rc = dup(fd);
+#else
+#endif
+
+    TRACE2((NULL, "shfile_dup(%d) -> %d [%d]\n", fd, rc, errno));
+    return rc;
 }
 
 int shfile_close(shfdtab *pfdtab, unsigned fd)
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#elif defined(SH_STUB_MODE)
-    return close(fd);
-#else
-#endif
+    int rc;
+
+#ifdef SH_PURE_STUB_MODE
+    rc = -1;
+#elif defined(SH_STUB_MODE)
+    rc = close(fd);
+#else
+#endif
+
+    TRACE2((NULL, "shfile_close(%d) -> %d [%d]\n", fd, rc, errno));
+    return rc;
 }
 
@@ -202 +217 @@
 int shfile_isatty(shfdtab *pfdtab, int fd)
 {
-#ifdef SH_PURE_STUB_MODE
-    return 0;
-#elif defined(SH_STUB_MODE)
-    return isatty(fd);
-#else
-#endif
+    int rc;
+
+#ifdef SH_PURE_STUB_MODE
+    rc = 0;
+#elif defined(SH_STUB_MODE)
+    rc = isatty(fd);
+#else
+#endif
+
+    TRACE2((NULL, "isatty(%d) -> %d [%d]\n", fd, rc, errno));
+    return rc;
 }
 
@@ -213 +233 @@
 int shfile_cloexec(shfdtab *pfdtab, int fd, int closeit)
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#elif defined(SH_STUB_MODE)
-# ifdef _MSC_VER
-    return -1;
-# else
-    int rc = fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0)
-                              | (closeit ? FD_CLOEXEC : 0));
-    //fprintf(stderr, "shfile_cloexec(%d, %d) -> %d\n", fd, closeit, rc);
-    return rc;
-# endif
-#else
-#endif
-
+    int rc;
+
+#ifdef SH_PURE_STUB_MODE
+    rc = -1;
+#elif defined(SH_STUB_MODE)
+# ifdef _MSC_VER
+    rc = -1;
+# else
+    rc = fcntl(fd, F_SETFD, fcntl(fd, F_GETFD, 0)
+                          | (closeit ? FD_CLOEXEC : 0));
+# endif
+#else
+#endif
+
+    TRACE2((NULL, "shfile_cloexec(%d, %d) -> %d [%d]\n", fd, closeit, rc, errno));
+    return rc;
 }
 
@@ -232 +254 @@
 int shfile_ioctl(shfdtab *pfdtab, int fd, unsigned long request, void *buf)
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
-#elif defined(SH_STUB_MODE)
-# ifdef _MSC_VER
-    return -1;
-# else
-    int rc = ioctl(fd, request, buf);
-    //fprintf(stderr, "ioctl(%d, %#x, %p) -> %d\n", fd, request, buf, rc);
-    return rc;
-# endif
-#else
-#endif
+    int rc;
+
+#ifdef SH_PURE_STUB_MODE
+    rc = -1;
+#elif defined(SH_STUB_MODE)
+# ifdef _MSC_VER
+    rc = -1;
+# else
+    rc = ioctl(fd, request, buf);
+# endif
+#else
+#endif
+
+    TRACE2((NULL, "ioctl(%d, %#x, %p) -> %d\n", fd, request, buf, rc));
+    return rc;
 }