Changeset 1216 in kBuild for trunk/src/kash

Timestamp:

Oct 7, 2007 9:15:21 PM (17 years ago)

Author:

bird

Message:

more fixes.

Location:

trunk/src/kash

Files:

• eval.c (modified) (2 diffs)
• exec.c (modified) (1 diff)
• jobs.c (modified) (1 diff)
• jobs.h (modified) (1 diff)
• main.c (modified) (2 diffs)
• main.h (modified) (1 diff)
• mkbuiltins (modified) (2 diffs)
• output.h (modified) (1 diff)
• parser.c (modified) (1 diff)
• shell.h (modified) (1 diff)
• shinstance.h (modified) (4 diffs)
• syntax.c (modified) (5 diffs)
• syntax.h (modified) (2 diffs)

trunk/src/kash/eval.c

@@ -1254 +1254 @@
 timescmd(shinstance *psh, int argc, char **argv)
 {
-        struct sh_tms tms;
+        shtms tms;
         int u, s, cu, cs;
         char us[8], ss[8], cus[8], css[8];
@@ -1260 +1260 @@
         nextopt(psh, "");
 
-        sh_times(&tms);
+        sh_times(psh, &tms);
 
         u = conv_time(tms.tms_utime, us, sizeof(us));

trunk/src/kash/exec.c

@@ -200 +200 @@
         } while (errno == EINTR);
 #else
-        sh_execve(psh, cmd, argv, envp);
+        sh_execve(psh, cmd, (const char * const*)argv, (const char * const*)envp);
 #endif
         e = errno;

trunk/src/kash/jobs.c

@@ -49 +49 @@
 #if JOBS
 # include <termios.h>
-# undef CEOF                    /* syntax.h redefines this */
 #endif
 #include "redir.h"

trunk/src/kash/jobs.h

@@ -93 +93 @@
 int waitcmd(struct shinstance *, int, char **);
 int jobidcmd(struct shinstance *, int, char **);
+union node;
 struct job *makejob(struct shinstance *, union node *, int);
 int forkshell(struct shinstance *, struct job *, union node *, int);

trunk/src/kash/main.c

@@ -38 +38 @@
         The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
-
 #ifndef lint
 static char sccsid[] = "@(#)main.c      8.7 (Berkeley) 7/19/95";
@@ -44 +43 @@
 __RCSID("$NetBSD: main.c,v 1.48 2003/09/14 12:09:29 jmmv Exp $");
 #endif /* not lint */
-
 #endif
 

trunk/src/kash/main.h

@@ -35 +35 @@
  */
 
+#include "shtypes.h"
 /*extern int rootpid;*/ /* pid of main shell */
 /*extern int rootshell;*/       /* true if we aren't a child of the main shell */

trunk/src/kash/mkbuiltins

@@ -66 +66 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#include "shtypes.h"
 
 struct builtincmd {
       const char *name;
-      int (*builtin)(int, char **);
+      int (*builtin)(shinstance *, int, char **);
 };
 
@@ -107 +105 @@
                 shift
         }
-        echo 'int '"$func"'(int, char **);' >&4
+        echo 'int '"$func"'(shinstance *, int, char **);' >&4
         while
                 [ $# != 0 -a "$1" != '#' ]

trunk/src/kash/output.h

@@ -67 +67 @@
 void freestdout(struct shinstance *);
 void outfmt(struct output *, const char *, ...)
-    __attribute__((__format__(__printf__,3,4)));
+    __attribute__((__format__(__printf__,2,3)));
 void out1fmt(struct shinstance *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));

trunk/src/kash/parser.c

@@ -1111 +1111 @@
                                 PARSEBACKQOLD();
                                 break;
-                        case CEOF:
+                        case CSHEOF:
                                 goto endword;           /* exit outer loop */
                         default:

trunk/src/kash/shell.h

@@ -88 +88 @@
 #endif
 
+#include "shtypes.h"
+
 #endif

trunk/src/kash/shinstance.h

@@ -120 +120 @@
  * running in a thread and not a separate process.
  */
-typedef struct shinstance
+struct shinstance
 {
     struct shinstance  *next;           /**< The next shell instance. */
@@ -324 +324 @@
     struct t_op const  *t_wp_op;
 
-} shinstance;
+};
 
 
@@ -376 +376 @@
 #include <time.h>
 #ifdef _MSC_VER
-    typedef struct sh_tms
+    typedef struct shtms
     {
         clock_t tms_utime;
@@ -382 +382 @@
         clock_t tms_cutime;
         clock_t tms_cstime;
-    } sh_tms;
+    } shtms;
 #else
 #   include <sys/times.h>
-#   include <times.h>
-    typedef struct tms sh_tms;
-#endif
-clock_t sh_times(sh_tms *);
+    typedef struct tms shtms;
+#endif
+clock_t sh_times(shinstance *, shtms *);
 int sh_sysconf_clk_tck(void);
 

trunk/src/kash/syntax.c

@@ -8 +8 @@
 #ifdef _MSC_VER /* doesn't implement the fancy initializers I think... */
 
-char basesyntax[257] = {CEOF};
-char dqsyntax[257] = {CEOF};
-char sqsyntax[257] = {CEOF};
-char arisyntax[257] = {CEOF};
+char basesyntax[257] = {CSHEOF};
+char dqsyntax[257] = {CSHEOF};
+char sqsyntax[257] = {CSHEOF};
+char arisyntax[257] = {CSHEOF};
 char is_type[257] = {0};
 
@@ -114 +114 @@
 
 /* syntax table used when not in quotes */
-const char basesyntax[257] = { CEOF,
+const char basesyntax[257] = { CSHEOF,
     set_range(CTL_FIRST, CTL_LAST, CCTL)
     set('\n', CNL)
@@ -135 +135 @@
 
 /* syntax table used when in double quotes */
-const char dqsyntax[257] = { CEOF,
+const char dqsyntax[257] = { CSHEOF,
     set_range(CTL_FIRST, CTL_LAST, CCTL)
     set('\n', CNL)
@@ -156 +156 @@
 
 /* syntax table used when in single quotes */
-const char sqsyntax[257] = { CEOF,
+const char sqsyntax[257] = { CSHEOF,
     set_range(CTL_FIRST, CTL_LAST, CCTL)
     set('\n', CNL)
@@ -173 +173 @@
 
 /* syntax table used when in arithmetic */
-const char arisyntax[257] = { CEOF,
+const char arisyntax[257] = { CSHEOF,
     set_range(CTL_FIRST, CTL_LAST, CCTL)
     set('\n', CNL)

trunk/src/kash/syntax.h

@@ -33 +33 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
 #include <ctype.h>
 
@@ -49 +46 @@
 #define CLP 8                   /* a left paren in arithmetic */
 #define CRP 9                   /* a right paren in arithmetic */
-#define CEOF 10                 /* end of file */
+#define CSHEOF 10               /* end of file */
 #define CCTL 11                 /* like CWORD, except it must be escaped */
 #define CSPCL 12                /* these terminate a word */