Changeset 882 in kBuild for trunk

Timestamp:

Apr 21, 2007 6:22:16 PM (18 years ago)

Author:

bird

Message:

hacking...

Location:

trunk/src/ash-messup

Files:

• Makefile.kmk (modified) (2 diffs)
• alias.c (modified) (12 diffs)
• main.c (modified) (1 diff)
• shfile.c (added)
• shfile.h (modified) (2 diffs)
• shinstance.h (modified) (1 diff)
• shthread.c (added)
• shthread.h (modified) (2 diffs)

trunk/src/ash-messup/Makefile.kmk

@@ -59 +59 @@
         $(PATH_TARGET)/builtins.c \
         $(PATH_TARGET)/init.c \
-        $(PATH_TARGET)/nodes.c
+        $(PATH_TARGET)/nodes.c \
+        \
+        shinstance.c \
+        shthread.c \
+        shfile.c
 kmk_ash_SOURCES.linux = \
         sys_signame.c \
@@ -114 +118 @@
 #$(eval $(def_copy_generated)))
 
-kmk_ash_INCS += generated 
+kmk_ash_INCS += generated
+kmk_ash_DEFS += HAVE_SYS_CDEFS_H 
 
 include $(PATH_KBUILD)/footer.kmk

trunk/src/ash-messup/alias.c

@@ -54 +54 @@
 #include "options.h"    /* XXX for argptr (should remove?) */
 #include "var.h"
-
-#define ATABSIZE 39
-
-struct alias *atab[ATABSIZE];
-
-STATIC void setalias(char *, char *);
-STATIC int unalias(char *);
-STATIC struct alias **hashalias(char *);
+#include "shinstance.h"
+
+/*#define ATABSIZE 39
+
+struct alias *atab[ATABSIZE];*/
+
+STATIC void setalias(shinstance *, char *, char *);
+STATIC int unalias(shinstance *, char *);
+STATIC struct alias **hashalias(shinstance *, char *);
 
 STATIC
 void
-setalias(char *name, char *val)
+setalias(shinstance *psh, char *name, char *val)
 {
         struct alias *ap, **app;
 
-        app = hashalias(name);
+        app = hashalias(psh, name);
         for (ap = *app; ap; ap = ap->next) {
                 if (equal(name, ap->name)) {
@@ -117 +118 @@
 
 STATIC int
-unalias(char *name)
+unalias(shinstance *psh, char *name)
 {
         struct alias *ap, **app;
 
-        app = hashalias(name);
+        app = hashalias(psh, name);
 
         for (ap = *app; ap; app = &(ap->next), ap = ap->next) {
@@ -150 +151 @@
 
 #ifdef mkinit
-MKINIT void rmaliases(void);
+MKINIT void rmaliases(shinstance *psh);
 
 SHELLPROC {
-        rmaliases();
+        rmaliases(psh);
 }
 #endif
 
 void
-rmaliases(void)
+rmaliases(shinstance *psh)
 {
         struct alias *ap, *tmp;
@@ -165 +166 @@
         INTOFF;
         for (i = 0; i < ATABSIZE; i++) {
-                ap = atab[i];
-                atab[i] = NULL;
+                ap = psh->atab[i];
+                psh->atab[i] = NULL;
                 while (ap) {
                         ckfree(ap->name);
@@ -179 +180 @@
 
 struct alias *
-lookupalias(char *name, int check)
-{
-        struct alias *ap = *hashalias(name);
+lookupalias(shinstance *psh, char *name, int check)
+{
+        struct alias *ap = *hashalias(psh, name);
 
         for (; ap; ap = ap->next) {
@@ -195 +196 @@
 
 char *
-get_alias_text(char *name)
+get_alias_text(shinstance *psh, char *name)
 {
         struct alias *ap;
 
-        ap = lookupalias(name, 0);
+        ap = lookupalias(psh, name, 0);
         if (ap == NULL)
                 return NULL;
@@ -209 +210 @@
  */
 int
-aliascmd(int argc, char **argv)
+aliascmd(shinstance *psh, int argc, char **argv)
 {
         char *n, *v;
@@ -219 +220 @@
 
                 for (i = 0; i < ATABSIZE; i++)
-                        for (ap = atab[i]; ap; ap = ap->next) {
+                        for (ap = psh->atab[i]; ap; ap = ap->next) {
                                 if (*ap->name != '\0') {
-                                        out1fmt("alias %s=", ap->name);
-                                        print_quoted(ap->val);
-                                        out1c('\n');
+                                        out1fmt(psh, "alias %s=", ap->name);
+                                        print_quoted(psh, ap->val);
+                                        out1c(psh, '\n');
                                 }
                         }
@@ -230 +231 @@
         while ((n = *++argv) != NULL) {
                 if ((v = strchr(n+1, '=')) == NULL) { /* n+1: funny ksh stuff */
-                        if ((ap = lookupalias(n, 0)) == NULL) {
-                                outfmt(out2, "alias: %s not found\n", n);
+                        if ((ap = lookupalias(psh, n, 0)) == NULL) {
+                                outfmt(psh->out2, "alias: %s not found\n", n);
                                 ret = 1;
                         } else {
-                                out1fmt("alias %s=", n);
-                                print_quoted(ap->val);
-                                out1c('\n');
+                                out1fmt(psh, "alias %s=", n);
+                                print_quoted(psh, ap->val);
+                                out1c(psh, '\n');
                         }
                 } else {
                         *v++ = '\0';
-                        setalias(n, v);
+                        setalias(psh, n, v);
                 }
         }
@@ -248 +249 @@
 
 int
-unaliascmd(int argc, char **argv)
+unaliascmd(shinstance *psh, int argc, char **argv)
 {
         int i;
 
-        while ((i = nextopt("a")) != '\0') {
+        while ((i = nextopt(psh, "a")) != '\0') {
                 if (i == 'a') {
-                        rmaliases();
+                        rmaliases(psh);
                         return (0);
                 }
         }
-        for (i = 0; *argptr; argptr++)
-                i = unalias(*argptr);
+        for (i = 0; *psh->argptr; psh->argptr++)
+                i = unalias(psh, *psh->argptr);
 
         return (i);
@@ -265 +266 @@
 
 STATIC struct alias **
-hashalias(char *p)
+hashalias(shinstance *psh, char *p)
 {
         unsigned int hashval;
@@ -272 +273 @@
         while (*p)
                 hashval+= *p++;
-        return &atab[hashval % ATABSIZE];
-}
+        return &psh->atab[hashval % ATABSIZE];
+}

trunk/src/ash-messup/main.c

@@ -308 +308 @@
 
         INTOFF;
-        if ((fd = shfile_open(psh, name, O_RDONLY)) >= 0)
+        if ((fd = shfile_open(&psh->fdtab, name, O_RDONLY)) >= 0)
                 setinputfd(psh, fd, 1);
         INTON;

trunk/src/ash-messup/shfile.h

@@ -25 +25 @@
  */
 
+#ifndef ___shfile_h___
+#define ___shfile_h___
 
 #include "shtypes.h"
@@ -49 +51 @@
 
 
-int shfile_open(shinstance *, const char *, unsigned);
+int shfile_open(shfdtab *, const char *, unsigned);
+int shfile_close(shfdtab *pfdtab, unsigned fd);
 
+#endif
+

trunk/src/ash-messup/shinstance.h

@@ -137 +137 @@
     /* builtins.h */
 
+    /* alias.c */
+#define ATABSIZE 39
+    struct alias       *atab[ATABSIZE];
+
 } shinstance;
 

trunk/src/ash-messup/shthread.h

@@ -25 +25 @@
  */
 
+#ifndef ___shthread_h___
+#define ___shthread_h___
 
 #include <sys/types.h>
@@ -37 +39 @@
 void shthread_set_shell(struct shinstance *);
 struct shinstance *shthread_get_shell(void);
+
+#endif
+