Changeset 1198 for trunk/src/kash/shinstance.h

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/shinstance.h (modified) (9 diffs)

trunk/src/kash/shinstance.h

@@ -31 +31 @@
 #include "shthread.h"
 #include "shfile.h"
+#include "output.h"
+#include "options.h"
 
 #include "var.h"
+
+#define MINSIZE 504             /* minimum size of a block */
+struct stack_block {
+        struct stack_block *prev;
+        char space[MINSIZE];
+};
 
 
@@ -97 +105 @@
 #ifdef _MSC_VER
     struct var          vpath2;
-#endif 
+#endif
     struct var          vps1;
     struct var          vps2;
@@ -115 +123 @@
 
     /* memalloc.h */
-    char               *stacknxt;
-    int                 stacknleft;
+    char               *stacknxt/* = stackbase.space*/;
+    int                 stacknleft/* = MINSIZE*/;
     int                 sstrnleft;
-    int                 herefd;
+    int                 herefd/* = -1 */;
+
+    /* memalloc.c */
+    struct stack_block  stackbase;
+    struct stack_block *stackp/* = &stackbase*/;
+    struct stackmark   *markp;
+
 
     /* jobs.h */
@@ -151 +165 @@
     /* cd.c */
     char               *curdir;         /**< current working directory */
-    char               *prevdir;        /**< previous working directory */
+    char               *prevdir;        /**< previous working directory */
     char               *cdcomppath;
     int                 getpwd_first;   /**< static in getpwd. (initialized to 1!) */
@@ -160 +174 @@
     /* eval.c */
     int                 vforked;
+
+    /* mail.c */
+#define MAXMBOXES 10
+    int                 nmboxes;        /**< number of mailboxes */
+    time_t              mailtime[MAXMBOXES]; /**< times of mailboxes */
+
 } shinstance;
 
@@ -172 +192 @@
 #else
     typedef sigset_t sh_sigset_t;
-#endif 
+#endif
 
 typedef void (*sh_handler)(int);
@@ -179 +199 @@
 void sh_sigemptyset(sh_sigset_t *set);
 int sh_sigprocmask(shinstance *, int op, sh_sigset_t const *new, sh_sigset_t *old);
+void sh_abort(shinstance *);
 
 /* times */
@@ -193 +214 @@
 #   include <times.h>
     typedef struct tms sh_tms;
-#endif 
+#endif
 clock_t sh_times(sh_tms *);
 int sh_sysconf_clk_tck(void);
@@ -219 +240 @@
 #else
 #   include <sys/wait.h>
-#endif 
+#endif
 pid_t sh_waitpid(shinstance *, pid_t, int *, int);
 void sh__exit(shinstance *, int);
 
-#endif
+
+#endif