Changeset 1240 in kBuild for trunk

Timestamp:

Oct 10, 2007 2:32:54 AM (17 years ago)

Author:

bird

Message:

shfile_cloexec. signal types.

Location:

trunk/src/kash

Files:

• error.c (modified) (1 diff)
• jobs.c (modified) (3 diffs)
• shfile.c (modified) (3 diffs)
• shfile.h (modified) (1 diff)
• shinstance.c (modified) (3 diffs)
• shinstance.h (modified) (2 diffs)
• trap.c (modified) (3 diffs)

trunk/src/kash/error.c

@@ -102 +102 @@
 onint(shinstance *psh)
 {
-        sh_sigset_t nsigset;
+        shsigset_t nsigset;
 
         if (psh->suppressint) {

trunk/src/kash/jobs.c

@@ -102 +102 @@
                 return;
         if (on) {
-#if defined(FIOCLEX) || defined(FD_CLOEXEC)
                 int err;
                 int i;
@@ -125 +124 @@
                         psh->ttyfd = err;
                 }
-#ifdef FIOCLEX
-                err = shfile_ioctl(&psh->fdtab, psh->ttyfd, FIOCLEX, 0);
-#elif FD_CLOEXEC
-                err = shfile_fcntl(&psh->fdtab, psh->ttyfd, F_SETFD,
-                    shfile_fcntl(&psh->fdtab, psh->ttyfd, F_GETFD, 0) | FD_CLOEXEC);
-#endif
+                err = shfile_cloexec(&psh->fdtab, psh->ttyfd, 1);
                 if (err == -1) {
                         shfile_close(&psh->fdtab, psh->ttyfd);
@@ -136 +130 @@
                         goto out;
                 }
-#else
-                out2str(psh, "sh: Need FIOCLEX or FD_CLOEXEC to support job control");
-                goto out;
-#endif
                 do { /* while we are in the background */
                         if ((psh->initialpgrp = sh_tcgetpgrp(psh, psh->ttyfd)) < 0) {

trunk/src/kash/shfile.c

@@ -27 +27 @@
 #include "shfile.h"
 #include <stdlib.h>
+#include <stdio.h>
 
 #ifdef KBUILD_OS_WINDOWS
@@ -210 +211 @@
 
 
+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 shfile_ioctl(shfdtab *pfdtab, int fd, unsigned long request, void *buf)
 {
@@ -218 +238 @@
     return -1;
 # else
-    return ioctl(fd, request, buf);
-# endif
-#else
-#endif
-}
+    int rc = ioctl(fd, request, buf);
+    fprintf(stderr, "ioctl(%d, %#x, %p) -> %d\n", fd, request, buf, rc);
+    return rc;
+# endif
+#else
+#endif
+}
+
 
 mode_t shfile_get_umask(shfdtab *pfdtab)

trunk/src/kash/shfile.h

@@ -132 +132 @@
 int shfile_access(shfdtab *, const char *, int);
 int shfile_isatty(shfdtab *, int);
+int shfile_cloexec(shfdtab *, int, int);
 int shfile_ioctl(shfdtab *, int, unsigned long, void *);
 #ifdef _MSC_VER

trunk/src/kash/shinstance.c

@@ -129 +129 @@
 }
 
-int sh_sigaction(int signo, const struct sh_sigaction *newp, struct sh_sigaction *oldp)
+int sh_sigaction(shinstance *psh, int signo, const struct shsigaction *newp, struct shsigaction *oldp)
 {
 #ifdef SH_PURE_STUB_MODE
@@ -151 +151 @@
 }
 
-sh_sig_t sh_signal(shinstance *psh, int signo, sh_sig_t handler)
-{
-    return (sh_sig_t)-1;
+shsig_t sh_signal(shinstance *psh, int signo, shsig_t handler)
+{
+    return (shsig_t)-1;
 }
 
@@ -161 +161 @@
 }
 
-void sh_sigemptyset(sh_sigset_t *setp)
+void sh_sigemptyset(shsigset_t *setp)
 {
     memset(setp, 0, sizeof(*setp));
 }
 
-int sh_sigprocmask(shinstance *psh, int operation, sh_sigset_t const *newp, sh_sigset_t *oldp)
+int sh_sigprocmask(shinstance *psh, int operation, shsigset_t const *newp, shsigset_t *oldp)
 {
     return -1;

trunk/src/kash/shinstance.h

@@ -332 +332 @@
 
 /* signals */
-typedef void (*sh_sig_t)(shinstance *, int);
-#ifdef _MSC_VER
-    typedef uint32_t sh_sigset_t;
+typedef void (*shsig_t)(shinstance *, int);
+#ifdef _MSC_VER
+    typedef uint32_t shsigset_t;
 #else
-    typedef sigset_t sh_sigset_t;
-#endif
-struct sh_sigaction
+    typedef sigset_t shsigset_t;
+#endif
+struct shsigaction
 {
-    sh_sig_t    sh_handler;
-    sh_sigset_t sh_mask;
+    shsig_t     sh_handler;
+    shsigset_t  sh_mask;
     int         sh_flags;
 };
-#define SH_SIG_DFL ((sh_sig_t)SIG_DFL)
-#define SH_SIG_IGN ((sh_sig_t)SIG_IGN)
+#define SH_SIG_DFL ((shsig_t)SIG_DFL)
+#define SH_SIG_IGN ((shsig_t)SIG_IGN)
 #ifdef _MSC_VER
 #   define SIG_BLOCK         1
@@ -366 +366 @@
 #endif
 
-int sh_sigaction(int, const struct sh_sigaction *, struct sh_sigaction *);
-sh_sig_t sh_signal(shinstance *, int, sh_sig_t);
+int sh_sigaction(shinstance *, int, const struct shsigaction *, struct shsigaction *);
+shsig_t sh_signal(shinstance *, int, shsig_t);
 int sh_siginterrupt(shinstance *, int, int);
-void sh_sigemptyset(sh_sigset_t *);
-int sh_sigprocmask(shinstance *, int, sh_sigset_t const *, sh_sigset_t *);
+void sh_sigemptyset(shsigset_t *);
+int sh_sigprocmask(shinstance *, int, shsigset_t const *, shsigset_t *);
 void sh_abort(shinstance *) __attribute__((__noreturn__));
 void sh_raise_sigint(shinstance *);

trunk/src/kash/trap.c

@@ -82 +82 @@
 //int pendingsigs;              /* indicates some signal received */
 
-static int getsigaction(shinstance *, int, sh_sig_t *);
+static int getsigaction(shinstance *, int, shsig_t *);
 
 /*
@@ -245 +245 @@
 {
         int action;
-        sh_sig_t sigact = SH_SIG_DFL;
+        shsig_t sigact = SH_SIG_DFL;
         char *t, tsig;
 
@@ -321 +321 @@
  */
 static int
-getsigaction(shinstance *psh, int signo, sh_sig_t *sigact)
-{
-        struct sh_sigaction sa;
-
-        if (sh_sigaction(signo, NULL, &sa) == -1)
+getsigaction(shinstance *psh, int signo, shsig_t *sigact)
+{
+        struct shsigaction sa;
+
+        if (sh_sigaction(psh, signo, NULL, &sa) == -1)
                 return 0;
-        *sigact = (sh_sig_t)sa.sh_handler;
+        *sigact = (shsig_t)sa.sh_handler;
         return 1;
 }