Changeset 883 in kBuild for trunk

Timestamp:

Apr 21, 2007 8:55:18 PM (18 years ago)

Author:

bird

Message:

hacking...

Location:

trunk/src/ash-messup

Files:

• cd.c (modified) (20 diffs)
• error.c (modified) (13 diffs)
• eval.c (modified) (1 diff)
• jobs.c (modified) (1 diff)
• main.c (modified) (1 diff)
• output.c (modified) (1 diff)
• output.h (modified) (1 diff)
• shfile.h (modified) (2 diffs)
• shinstance.c (modified) (1 diff)
• shinstance.h (modified) (2 diffs)
• shthread.h (modified) (1 diff)

trunk/src/ash-messup/cd.c

@@ -68 +68 @@
 #include "show.h"
 #include "cd.h"
-
-STATIC int docd(char *, int);
-STATIC char *getcomponent(void);
-STATIC void updatepwd(char *);
-STATIC void find_curdir(int noerror);
-
-char *curdir = NULL;            /* current working directory */
-char *prevdir;                  /* previous working directory */
-STATIC char *cdcomppath;
+#include "shinstance.h"
+
+STATIC int docd(shinstance *psh, char *, int);
+STATIC char *getcomponent(shinstance *psh);
+STATIC void updatepwd(shinstance *psh, char *);
+STATIC void find_curdir(shinstance *psh, int noerror);
+
+/*char *curdir = NULL;*/                /* current working directory */
+/*char *prevdir;*/                      /* previous working directory */
+/*STATIC char *cdcomppath;*/
 
 int
-cdcmd(int argc, char **argv)
+cdcmd(shinstance *psh, int argc, char **argv)
 {
         const char *dest;
@@ -85 +86 @@
         char *p, *d;
         struct stat statb;
-        int print = cdprint;    /* set -cdprint to enable */
-
-        nextopt(nullstr);
+        int print = psh->cdprint;       /* set -cdprint to enable */
+
+        nextopt(psh, nullstr);
 
         /*
@@ -93 +94 @@
          * it on entry to the shell, but we want 'cd fred; cd -' to work.
          */
-        getpwd(1);
-        dest = *argptr;
+        getpwd(psh, 1);
+        dest = *psh->argptr;
         if (dest == NULL) {
-                dest = bltinlookup("HOME", 1);
+                dest = bltinlookup(psh, "HOME", 1);
                 if (dest == NULL)
-                        error("HOME not set");
+                        error(psh, "HOME not set");
         } else {
-                if (argptr[1]) {
+                if (psh->argptr[1]) {
                         /* Do 'ksh' style substitution */
-                        if (!curdir)
-                                error("PWD not set");
-                        p = strstr(curdir, dest);
+                        if (!psh->curdir)
+                                error(psh, "PWD not set");
+                        p = strstr(psh->curdir, dest);
                         if (!p)
-                                error("bad substitution");
-                        d = stalloc(strlen(curdir) + strlen(argptr[1]) + 1);
-                        memcpy(d, curdir, p - curdir);
-                        strcpy(d + (p - curdir), argptr[1]);
+                                error(psh, "bad substitution");
+                        d = stalloc(psh, strlen(psh->curdir) + strlen(psh->argptr[1]) + 1);
+                        memcpy(d, psh->curdir, p - psh->curdir);
+                        strcpy(d + (p - psh->curdir), psh->argptr[1]);
                         strcat(d, p + strlen(dest));
                         dest = d;
@@ -117 +118 @@
 
         if (dest[0] == '-' && dest[1] == '\0') {
-                dest = prevdir ? prevdir : curdir;
+                dest = psh->prevdir ? psh->prevdir : psh->curdir;
                 print = 1;
         }
         if (*dest == '\0')
                 dest = ".";
-        if (IS_ROOT(dest) || (path = bltinlookup("CDPATH", 1)) == NULL)
+        if (IS_ROOT(dest) || (path = bltinlookup(psh, "CDPATH", 1)) == NULL)
                 path = nullstr;
-        while ((p = padvance(&path, dest)) != NULL) {
-                if (stat(p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {
+        while ((p = padvance(psh, &path, dest)) != NULL) {
+                if (shfile_stat(&psh->fdtab, p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {
                         if (!print) {
                                 /*
@@ -134 +135 @@
                                 print = strcmp(p, dest);
                         }
-                        if (docd(p, print) >= 0)
+                        if (docd(psh, p, print) >= 0)
                                 return 0;
 
                 }
         }
-        error("can't cd to %s", dest);
+        error(psh, "can't cd to %s", dest);
         /* NOTREACHED */
+        return 1;
 }
 
@@ -150 +152 @@
 
 STATIC int
-docd(char *dest, int print)
+docd(shinstance *psh, char *dest, int print)
 {
         char *p;
@@ -167 +169 @@
          */
         badstat = 0;
-        cdcomppath = stalloc(strlen(dest) + 1);
-        scopy(dest, cdcomppath);
+        psh->cdcomppath = stalloc(psh, strlen(dest) + 1);
+        scopy(dest, psh->cdcomppath);
         STARTSTACKSTR(p);
         if (IS_ROOT(dest)) {
                 STPUTC('/', p);
-                cdcomppath++;
+                psh->cdcomppath++;
         }
         first = 1;
-        while ((q = getcomponent()) != NULL) {
+        while ((q = getcomponent(psh)) != NULL) {
                 if (q[0] == '\0' || (q[0] == '.' && q[1] == '\0'))
                         continue;
@@ -187 +189 @@
                         continue;
                 STACKSTRNUL(p);
-                if ((lstat(stackblock(), &statb) < 0)
+                if ((shfile_lstat(&psh->fdtab, stackblock(), &statb) < 0)
                     || (S_ISLNK(statb.st_mode)))  {
                         /* print = 1; */
@@ -196 +198 @@
 
         INTOFF;
-        if (chdir(dest) < 0) {
+        if (shfile_chdir(&psh->fdtab, dest) < 0) {
                 INTON;
                 return -1;
         }
-        updatepwd(badstat ? NULL : dest);
+        updatepwd(psh, badstat ? NULL : dest);
         INTON;
-        if (print && iflag && curdir)
-                out1fmt("%s\n", curdir);
+        if (print && psh->iflag && psh->curdir)
+                out1fmt(psh, "%s\n", psh->curdir);
         return 0;
 }
@@ -209 +211 @@
 
 /*
- * Get the next component of the path name pointed to by cdcomppath.
- * This routine overwrites the string pointed to by cdcomppath.
+ * Get the next component of the path name pointed to by psh->cdcomppath.
+ * This routine overwrites the string pointed to by psh->cdcomppath.
  */
 
 STATIC char *
-getcomponent()
+getcomponent(shinstance *psh)
 {
         char *p;
         char *start;
 
-        if ((p = cdcomppath) == NULL)
+        if ((p = psh->cdcomppath) == NULL)
                 return NULL;
-        start = cdcomppath;
+        start = psh->cdcomppath;
         while (*p != '/' && *p != '\0')
                 p++;
         if (*p == '\0') {
-                cdcomppath = NULL;
+                psh->cdcomppath = NULL;
         } else {
                 *p++ = '\0';
-                cdcomppath = p;
+                psh->cdcomppath = p;
         }
         return start;
@@ -242 +244 @@
 
 STATIC void
-updatepwd(char *dir)
+updatepwd(shinstance *psh, char *dir)
 {
         char *new;
         char *p;
 
-        hashcd();                               /* update command hash table */
+        hashcd(psh);                            /* update command hash table */
 
         /*
@@ -254 +256 @@
          * we couldn't stat().
          */
-        if (dir == NULL || curdir == NULL)  {
-                if (prevdir)
-                        ckfree(prevdir);
+        if (dir == NULL || psh->curdir == NULL)  {
+                if (psh->prevdir)
+                        ckfree(psh->prevdir);
                 INTOFF;
-                prevdir = curdir;
-                curdir = NULL;
-                getpwd(1);
+                psh->prevdir = psh->curdir;
+                psh->curdir = NULL;
+                getpwd(psh, 1);
                 INTON;
-                if (curdir)
-                        setvar("PWD", curdir, VEXPORT);
+                if (psh->curdir)
+                        setvar(psh, "PWD", psh->curdir, VEXPORT);
                 else
-                        unsetvar("PWD", 0);
+                        unsetvar(psh, "PWD", 0);
                 return;
         }
-        cdcomppath = stalloc(strlen(dir) + 1);
-        scopy(dir, cdcomppath);
+        psh->cdcomppath = stalloc(psh, strlen(dir) + 1);
+        scopy(dir, psh->cdcomppath);
         STARTSTACKSTR(new);
         if (!IS_ROOT(dir)) {
-                p = curdir;
+                p = psh->curdir;
                 while (*p)
                         STPUTC(*p++, new);
@@ -278 +280 @@
                         STUNPUTC(new);
         }
-        while ((p = getcomponent()) != NULL) {
+        while ((p = getcomponent(psh)) != NULL) {
                 if (equal(p, "..")) {
                         while (new > stackblock() && (STUNPUTC(new), *new) != '/');
@@ -291 +293 @@
         STACKSTRNUL(new);
         INTOFF;
-        if (prevdir)
-                ckfree(prevdir);
-        prevdir = curdir;
-        curdir = savestr(stackblock());
-        setvar("PWD", curdir, VEXPORT);
+        if (psh->prevdir)
+                ckfree(psh->prevdir);
+        psh->prevdir = psh->curdir;
+        psh->curdir = savestr(stackblock());
+        setvar(psh, "PWD", psh->curdir, VEXPORT);
         INTON;
 }
@@ -308 +310 @@
 
 int
-pwdcmd(int argc, char **argv)
+pwdcmd(shinstance *psh, int argc, char **argv)
 {
         int i;
         char opt = 'L';
 
-        while ((i = nextopt("LP")) != '\0')
+        while ((i = nextopt(psh, "LP")) != '\0')
                 opt = i;
-        if (*argptr)
-                error("unexpected argument");
+        if (*psh->argptr)
+                error(psh, "unexpected argument");
 
         if (opt == 'L')
-                getpwd(0);
+                getpwd(psh, 0);
         else
-                find_curdir(0);
-
-        setvar("PWD", curdir, VEXPORT);
-        out1str(curdir);
-        out1c('\n');
+                find_curdir(psh, 0);
+
+        setvar(psh, "PWD", psh->curdir, VEXPORT);
+        out1str(psh, psh->curdir);
+        out1c(psh, '\n');
         return 0;
 }
@@ -339 +341 @@
  */
 void
-getpwd(int noerror)
+getpwd(shinstance *psh, int noerror)
 {
         char *pwd;
         struct stat stdot, stpwd;
-        static int first = 1;
-
-        if (curdir)
+        /*static int first = 1;*/
+
+        if (psh->curdir)
                 return;
 
-        if (first) {
-                first = 0;
-                pwd = getenv("PWD");
-                if (pwd && IS_ROOT(pwd) && stat(".", &stdot) != -1 &&
-                    stat(pwd, &stpwd) != -1 &&
+        if (psh->getpwd_first) {
+                psh->getpwd_first = 0;
+                pwd = sh_getenv(psh, "PWD");
+                if (pwd && IS_ROOT(pwd) && shfile_stat(&psh->fdtab, ".", &stdot) != -1 &&
+                    shfile_stat(&psh->fdtab, pwd, &stpwd) != -1 &&
                     stdot.st_dev == stpwd.st_dev &&
                     stdot.st_ino == stpwd.st_ino) {
-                        curdir = savestr(pwd);
+                        psh->curdir = savestr(pwd);
                         return;
                 }
         }
 
-        find_curdir(noerror);
+        find_curdir(psh, noerror);
 
         return;
@@ -366 +368 @@
 
 STATIC void
-find_curdir(int noerror)
+find_curdir(shinstance *psh, int noerror)
 {
         int i;
@@ -383 +385 @@
          * /bin/pwd.
          */
-#if defined(__NetBSD__) || defined(__SVR4) || defined(__INNOTEK_LIBC__)
+#if 1 //defined(__NetBSD__) || defined(__SVR4) || defined(__INNOTEK_LIBC__)
 
         for (i = MAXPWD;; i *= 2) {
-                pwd = stalloc(i);
-                if (getcwd(pwd, i) != NULL) {
-                        curdir = savestr(pwd);
+                pwd = stalloc(psh, i);
+                if (shfile_getcwd(&psh->fdtab, pwd, i) != NULL) {
+                        psh->curdir = savestr(pwd);
                         return;
                 }
-                stunalloc(pwd);
+                stunalloc(psh, pwd);
                 if (errno == ERANGE)
                         continue;
                 if (!noerror)
-                        error("getcwd() failed: %s", strerror(errno));
+                        error(psh, "getcwd() failed: %s", strerror(errno));
                 return;
         }
@@ -405 +407 @@
                 int pip[2];
 
-                pwd = stalloc(MAXPWD);
+                pwd = stalloc(psh, MAXPWD);
                 INTOFF;
                 if (pipe(pip) < 0)
@@ -442 +444 @@
                 p[-1] = '\0';
                 INTON;
-                curdir = savestr(pwd);
+                psh->curdir = savestr(pwd);
                 return;
         }

trunk/src/ash-messup/error.c

@@ -61 +61 @@
 #include "error.h"
 #include "show.h"
+#include "shinstance.h"
 
 
@@ -67 +68 @@
  */
 
-struct jmploc *handler;
+/*struct jmploc *handler;
 int exception;
 volatile int suppressint;
 volatile int intpending;
-char *commandname;
-
-
-static void exverror(int, const char *, va_list)
-    __attribute__((__noreturn__));
+char *commandname;*/
+
+
+static void exverror(shinstance *psh, int, const char *, va_list)
+    /*__attribute__((__noreturn__))*/;
 
 /*
@@ -84 +85 @@
 
 void
-exraise(int e)
-{
-        if (handler == NULL)
+exraise(shinstance *psh, int e)
+{
+        if (psh->handler == NULL)
                 abort();
-        exception = e;
-        longjmp(handler->loc, 1);
+        psh->exception = e;
+        longjmp(psh->handler->loc, 1);
 }
 
@@ -104 +105 @@
 
 void
-onint(void)
-{
-        sigset_t nsigset;
-
-        if (suppressint) {
-                intpending = 1;
+onint(shinstance *psh)
+{
+        sh_sigset_t nsigset;
+
+        if (psh->suppressint) {
+                psh->intpending = 1;
                 return;
         }
-        intpending = 0;
-        sigemptyset(&nsigset);
-        sigprocmask(SIG_SETMASK, &nsigset, NULL);
-        if (rootshell && iflag)
-                exraise(EXINT);
+        psh->intpending = 0;
+        sh_sigemptyset(&nsigset);
+        sh_sigprocmask(psh, SIG_SETMASK, &nsigset, NULL);
+        if (psh->rootshell && psh->iflag)
+                exraise(psh, EXINT);
         else {
-                signal(SIGINT, SIG_DFL);
-                raise(SIGINT);
+                sh_signal(psh, SIGINT, SIG_DFL);
+                sh_raise_sigint(psh);/*raise(psh, SIGINT);*/
         }
         /* NOTREACHED */
@@ -125 +126 @@
 
 static void
-exvwarning(int sv_errno, const char *msg, va_list ap)
+exvwarning(shinstance *psh, int sv_errno, const char *msg, va_list ap)
 {
         /* Partially emulate line buffered output so that:
@@ -133 +134 @@
          * both generate sensible text when stdout and stderr are merged.
          */
-        if (output.nextc != output.buf && output.nextc[-1] == '\n')
-                flushout(&output);
-        if (commandname)
-                outfmt(&errout, "%s: ", commandname);
+        if (psh->output.nextc != psh->output.buf && psh->output.nextc[-1] == '\n')
+                flushout(&psh->output);
+        if (psh->commandname)
+                outfmt(&psh->errout, "%s: ", psh->commandname);
         if (msg != NULL) {
-                doformat(&errout, msg, ap);
+                doformat(&psh->errout, msg, ap);
                 if (sv_errno >= 0)
-                        outfmt(&errout, ": ");
+                        outfmt(&psh->errout, ": ");
         }
         if (sv_errno >= 0)
-                outfmt(&errout, "%s", strerror(sv_errno));
-        out2c('\n');
-        flushout(&errout);
+                outfmt(&psh->errout, "%s", strerror(sv_errno));
+        out2c(psh, '\n');
+        flushout(&psh->errout);
 }
 
@@ -154 +155 @@
  */
 static void
-exverror(int cond, const char *msg, va_list ap)
+exverror(shinstance *psh, int cond, const char *msg, va_list ap)
 {
         CLEAR_PENDING_INT;
@@ -168 +169 @@
 #endif
         if (msg)
-                exvwarning(-1, msg, ap);
-
-        output_flushall();
-        exraise(cond);
+                exvwarning(psh, -1, msg, ap);
+
+        output_flushall(psh);
+        exraise(psh, cond);
         /* NOTREACHED */
 }
@@ -177 +178 @@
 
 void
-error(const char *msg, ...)
+error(shinstance *psh, const char *msg, ...)
 {
         va_list ap;
 
         va_start(ap, msg);
-        exverror(EXERROR, msg, ap);
+        exverror(psh, EXERROR, msg, ap);
         /* NOTREACHED */
         va_end(ap);
@@ -189 +190 @@
 
 void
-exerror(int cond, const char *msg, ...)
+exerror(shinstance *psh, int cond, const char *msg, ...)
 {
         va_list ap;
 
         va_start(ap, msg);
-        exverror(cond, msg, ap);
+        exverror(psh, cond, msg, ap);
         /* NOTREACHED */
         va_end(ap);
@@ -204 +205 @@
 
 void
-sh_exit(int rval)
-{
-        exerrno = rval & 255;
-        exraise(EXEXEC);
-}
-
-void
-sh_err(int status, const char *fmt, ...)
+sh_exit(shinstance *psh, int rval)
+{
+        psh->exerrno = rval & 255;
+        exraise(psh, EXEXEC);
+}
+
+void
+sh_err(shinstance *psh, int status, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(errno, fmt, ap);
-        va_end(ap);
-        sh_exit(status);
-}
-
-void
-sh_verr(int status, const char *fmt, va_list ap)
-{
-        exvwarning(errno, fmt, ap);
-        sh_exit(status);
-}
-
-void
-sh_errx(int status, const char *fmt, ...)
+        exvwarning(psh, errno, fmt, ap);
+        va_end(ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_verr(shinstance *psh, int status, const char *fmt, va_list ap)
+{
+        exvwarning(psh, errno, fmt, ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_errx(shinstance *psh, int status, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(-1, fmt, ap);
-        va_end(ap);
-        sh_exit(status);
-}
-
-void
-sh_verrx(int status, const char *fmt, va_list ap)
-{
-        exvwarning(-1, fmt, ap);
-        sh_exit(status);
-}
-
-void
-sh_warn(const char *fmt, ...)
+        exvwarning(psh, -1, fmt, ap);
+        va_end(ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_verrx(shinstance *psh, int status, const char *fmt, va_list ap)
+{
+        exvwarning(psh, -1, fmt, ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_warn(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(errno, fmt, ap);
-        va_end(ap);
-}
-
-void
-sh_vwarn(const char *fmt, va_list ap)
-{
-        exvwarning(errno, fmt, ap);
-}
-
-void
-sh_warnx(const char *fmt, ...)
+        exvwarning(psh, errno, fmt, ap);
+        va_end(ap);
+}
+
+void
+sh_vwarn(shinstance *psh, const char *fmt, va_list ap)
+{
+        exvwarning(psh, errno, fmt, ap);
+}
+
+void
+sh_warnx(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(-1, fmt, ap);
-        va_end(ap);
-}
-
-void
-sh_vwarnx(const char *fmt, va_list ap)
-{
-        exvwarning(-1, fmt, ap);
+        exvwarning(psh, -1, fmt, ap);
+        va_end(ap);
+}
+
+void
+sh_vwarnx(shinstance *psh, const char *fmt, va_list ap)
+{
+        exvwarning(psh, -1, fmt, ap);
 }
 
@@ -357 +358 @@
 
 const char *
-errmsg(int e, int action)
+errmsg(shinstance *psh, int e, int action)
 {
         struct errname const *ep;
-        static char buf[12];
+        /*static char buf[12];*/
 
         for (ep = errormsg ; ep->errcode ; ep++) {
@@ -366 +367 @@
                         return ep->msg;
         }
-        fmtstr(buf, sizeof buf, "error %d", e);
-        return buf;
-}
+        fmtstr(psh->errmsg_buf, sizeof psh->errmsg_buf, "error %d", e);
+        return psh->errmsg_buf;
+}

trunk/src/ash-messup/eval.c

@@ -100 +100 @@
 
 
-char *commandname;
+/*char *commandname;*/
 struct strlist *cmdenviron;
 int exitstatus;                 /* exit status of last command */

trunk/src/ash-messup/jobs.c

@@ -1021 +1021 @@
                  */
                 if (WIFSIGNALED(status) && WTERMSIG(status) == SIGINT)
-                        raise(SIGINT);
+                        sh_raise_sigint(psh);/*raise(SIGINT);*/
         }
 #endif

trunk/src/ash-messup/main.c

@@ -118 +118 @@
          * Create the root shell instance.
          */
-        psh = create_root_shell(NULL, argc, argv);
+        psh = sh_create_root_shell(NULL, argc, argv);
         if (!psh)
                 return 2;

trunk/src/ash-messup/output.c

@@ -253 +253 @@
         strout.fd = BLOCK_OUT;
         strout.flags = 0;
+        strout.psh = NULL;
         doformat(&strout, fmt, ap);
         outc('\0', &strout);

trunk/src/ash-messup/output.h

@@ -69 +69 @@
 void dprintf(struct shinstance *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void fmtstr(struct shinstance *, char *, size_t, const char *, ...)
-    __attribute__((__format__(__printf__,4,5)));
+void fmtstr(char *, size_t, const char *, ...)
+    __attribute__((__format__(__printf__,3,4)));
 void doformat(struct output *, const char *, va_list);
 int xwrite(int, char *, int);

trunk/src/ash-messup/shfile.h

@@ -46 +46 @@
 {
     shmtx               mtx;            /**< Mutex protecting any operations on the table and it's handles. */
+    char               *cwd;            /**< The current directory for this shell instance. */
     unsigned            size;           /**< The size of the table (number of entries). */
     shfile             *tab;            /**< Pointer to the table. */
@@ -52 +53 @@
 
 int shfile_open(shfdtab *, const char *, unsigned);
-int shfile_close(shfdtab *pfdtab, unsigned fd);
+int shfile_close(shfdtab *, unsigned);
 
+int shfile_stat(shfdtab *, const char *, struct stat *);
+int shfile_lstat(shfdtab *, const char *, struct stat *);
+int shfile_chdir(shfdtab *, const char *);
+char *shfile_getcwd(shfdtab *, char *, int);
+         
 #endif
 

trunk/src/ash-messup/shinstance.c

@@ -37 +37 @@
  * @returns pointer to root shell on success, NULL on failure.
  */
-shinstance *create_root_shell(shinstance *inherit, int argc, char **argv)
+shinstance *sh_create_root_shell(shinstance *inherit, int argc, char **argv)
 {
     shinstance *psh;

trunk/src/ash-messup/shinstance.h

@@ -25 +25 @@
  */
 
+#ifndef ___shinstance_h___
+#define ___shinstance_h___
+
 #include "shtypes.h"
 #include "shthread.h"
 #include "shfile.h"
+
+#include "var.h"
+
 
 /**
@@ -141 +147 @@
     struct alias       *atab[ATABSIZE];
 
+    /* cd.c */
+    char               *curdir;         /**< current working directory */
+    char               *prevdir;        /**< previous working directory */
+    char               *cdcomppath;
+    int                 getpwd_first;   /**< static in getpwd. (initialized to 1!) */
+
+    /* error.c */
+    char                errmsg_buf[16]; /**< static in errmsg. (bss) */
+
 } shinstance;
 
 
-extern shinstance *create_root_shell(shinstance *inherit, int argc, char **argv);
+extern shinstance *sh_create_root_shell(shinstance *inherit, int argc, char **argv);
+char *sh_getenv(shinstance *, const char *);
 
+/* signals */
+#include <signal.h>
+#ifdef _MSC_VER
+typedef uint32_t sh_sigset_t;
+#else
+typedef sigset_t sh_sigset_t;
+#endif 
+
+typedef void (*sh_handler)(int);
+sh_handler sh_signal(shinstance *, int, sh_handler handler);
+void sh_raise_sigint(shinstance *);
+void sh_sigemptyset(sh_sigset_t *set);
+int sh_sigprocmask(shinstance *, int op, sh_sigset_t const *new, sh_sigset_t *old);
+
+#endif

trunk/src/ash-messup/shthread.h

@@ -28 +28 @@
 #define ___shthread_h___
 
-#include <sys/types.h>
+#include "shtypes.h"
 
 typedef struct shmtx