Changeset 227 for trunk/src/gmake

Timestamp:

Feb 9, 2005, 11:21:34 AM (20 years ago)

Author:

bird

Message:

builtin stuff.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• job.c (modified) (6 diffs)
• job.h (modified) (1 diff)
• kmkbuiltin.c (modified) (2 diffs)
• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/echo.c (added)
• kmkbuiltin/mkdir.c (modified) (8 diffs)
• kmkbuiltin/setmode.c (added)

trunk/src/gmake/Makefile.kmk

@@ -67 +67 @@
         vpath.c \
         remote-stub.c \
-        kmkbuiltin.c
+        kmkbuiltin.c \
+        kmkbuiltin/echo.c \
+        kmkbuiltin/mkdir.c \
+        kmkbuiltin/setmode.c
 
 kmk_SOURCES.os2 = \

trunk/src/gmake/job.c

@@ -490 +490 @@
       int child_failed;
       int any_remote, any_local;
-#ifdef MAKE_DLLSHELL
-      struct child *dllshelled_child = 0;
+#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+      struct child *completed_child = 0;
 #endif
 
@@ -527 +527 @@
           any_remote |= c->remote;
           any_local |= ! c->remote;
-#ifdef MAKE_DLLSHELL
-          if (c->dllshell_done)
-            dllshelled_child = c;
+#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+          if (c->have_status)
+              completed_child = c;
 #endif
           DB (DB_JOBS, (_("Live child 0x%08lx (%s) PID %ld %s\n"),
@@ -557 +557 @@
         {
           /* No remote children.  Check for local children.  */
-#ifdef MAKE_DLLSHELL
-          if (dllshelled_child)
+#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+          if (completed_child)
             {
-              pid = dllshelled_child->pid;
-              status = (WAIT_T)dllshelled_child->status;
+              pid = completed_child->pid;
+              status = (WAIT_T)completed_child->status;
             }
           else
@@ -1112 +1112 @@
   if ((flags & COMMANDS_BUILTIN) && !just_print_flag)
     {
+      int    rc;
       char **p2 = argv;
       while (*p2 && strncmp(*p2, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
@@ -1117 +1118 @@
       assert(*p2);
       set_command_state (child->file, cs_running);
-      int rc = kmk_builtin_command(p2);
+      if (p2 != argv)
+          rc = kmk_builtin_command(*p2);
+      else
+      {
+          int argc = 1;
+          while (argv[argc])
+              argc++;
+          rc = kmk_builtin_command_parsed(argc, argv);
+      }
+      printf("rc=%d\n", rc);
 #ifndef VMS
       free (argv[0]);
@@ -1124 +1134 @@
       if (!rc)
           goto next_command;
-      child->file->update_status = 2;
-      notice_finished_file (child->file);
+      child->pid = (pid_t)42424242;
+      child->status = rc << 8;
+      child->have_status = 1;
       return;
     }

trunk/src/gmake/job.h

@@ -58 +58 @@
 #endif
     char *sh_batch_file;        /* Script file for shell commands */
+#if defined(CONFIG_WITH_KMK_BUILTIN) || defined(MAKE_DLLSHELL)
+    int status;                 /* Status of the job. */
+    unsigned int have_status:1; /* Nonzero if status is available. */
+#endif
 #ifdef MAKE_DLLSHELL
-    int status;                 /* Status of the job.
-                                   Another thread might set this. */
-    char dllshell_done;         /* Nonzero if executed thru a dll shell.
-                                   Another thread might set this. */
     unsigned int dllshelled:1;  /* Nonzero if executed thru dllshell. */
 #endif

trunk/src/gmake/kmkbuiltin.c

@@ -26 +26 @@
 
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
+#include <ctype.h>
 #include "kmkbuiltin.h"
 
-int kmk_builtin_cp(char **argv)
+extern char **environ;
+
+extern int kmk_builtin_cp(int argc, char **argv, char **envp);
+extern int kmk_builtin_chmod(int argc, char **argv, char **envp);
+extern int kmk_builtin_echo(int argc, char **argv, char **envp);
+extern int kmk_builtin_mkdir(int argc, char **argv, char **envp);
+extern int kmk_builtin_mv(int argc, char **argv, char **envp);
+extern int kmk_builtin_rm(int argc, char **argv, char **envp);
+extern int kmk_builtin_rmdir(int argc, char **argv, char **envp);
+
+int kmk_builtin_command(const char *pszCmd)
 {
-    return 1;
+    int         argc;
+    char      **argv;
+    char       *psz;
+    int         rc;
+
+    /*
+     * Check and skip the prefix.
+     */
+    if (strncmp(pszCmd, "kmk_builtin_", sizeof("kmk_builtin_") - 1))
+    {
+        printf("kmk_builtin: Invalid command prefix '%s'!\n", pszCmd);
+        return 1;
+    }
+
+    /*
+     * Parse arguments.
+     */
+    argc = 0;
+    argv = NULL;
+    while (*pszCmd)
+    {
+        const char *pszEnd;
+        const char *pszNext;
+        int         fEscaped = 0;
+        size_t      cch;
+
+        /*
+         * Find start and end of the current command.
+         */
+        if (*pszCmd == '"' || *pszCmd == '\'')
+        {
+            pszEnd = pszCmd;
+            for (;;)
+            {
+                pszEnd = strchr(pszEnd + 1, *pszCmd);
+                if (!pszEnd)
+                {
+                    printf("kmk_builtin: Unbalanced quote in argument %d: %s\n", argc + 1, pszCmd);
+                    while (argc--)
+                        free(argv[argc]);
+                    free(argv);
+                    return 1;
+                }
+                /* two quotes -> escaped quote. */
+                if (pszEnd[0] != pszEnd[1])
+                    break;
+                fEscaped = 1;
+            }
+            pszNext = pszEnd + 1;
+            pszCmd++;
+        }
+        else
+        {
+            pszEnd = pszCmd + 1;
+            while (!isspace(*pszEnd))
+                pszEnd++;
+            pszNext = pszEnd;
+        }
+
+        /*
+         * Make argument.
+         */
+        if (!(argc % 16))
+        {
+            void *pv = realloc(argv, sizeof(char *) * (argc + 17));
+            if (!pv)
+            {
+                printf("kmk_builtin: out of memory. argc=%d\n", argc);
+                break;
+            }
+            argv = (char **)pv;
+        }
+        cch = pszEnd - pszCmd;
+        argv[argc] = malloc(cch + 1);
+        if (!argv[argc])
+        {
+            printf("kmk_builtin: out of memory. argc=%d len=%d\n", argc, pszEnd - pszCmd + 1);
+            break;
+        }
+        memcpy(argv[argc], pszCmd, cch);
+        argv[argc][cch] = '\0';
+
+        /* unescape quotes? */
+        if (fEscaped)
+        {
+            char ch = pszCmd[-1];
+            char *pszW = argv[argc];
+            char *pszR = argv[argc];
+            while (*pszR)
+            {
+                if (*pszR == ch)
+                    pszR++;
+                *pszW++ = *pszR++;
+            }
+            *pszW = '\0';
+        }
+        /* commit it */
+        argv[++argc] = NULL;
+
+        /*
+         * Next
+         */
+        pszCmd = pszNext;
+        if (isspace(*pszCmd))
+            pszCmd++;
+    }
+
+    /*
+     * Execute the command if parsing was successful.
+     */
+    if (!*pszCmd)
+        rc = kmk_builtin_command_parsed(argc, argv);
+    else
+        rc = 1;
+
+    /* clean up and return. */
+    while (argc--)
+        free(argv[argc]);
+    free(argv);
+    return rc;
 }
 
-int kmk_builtin_command(char **argv)
+
+int kmk_builtin_command_parsed(int argc, char **argv)
 {
     const char *pszCmd = argv[0];
@@ -52 +184 @@
      * String switch on the command.
      */
-    if (!strcmp(pszCmd, "cp"))
-        rc = kmk_builtin_cp(argv);
+    if (0) { }
+    //if (!strcmp(pszCmd, "cp"))
+    //    rc = kmk_builtin_cp(argc, argv, environ);
     //else if (!strcmp(pszCmd, "chmod"))
     //    rc = kmk_builtin_chmod(argv);
-    //else if (!strcmp(pszCmd, "mkdir"))
-    //    rc = kmk_builtin_mkdir(argv);
+    else if (!strcmp(pszCmd, "echo"))
+        rc = kmk_builtin_echo(argc, argv, environ);
+    else if (!strcmp(pszCmd, "mkdir"))
+        rc = kmk_builtin_mkdir(argc, argv, environ);
     //else if (!strcmp(pszCmd, "mv"))
     //    rc = kmk_builtin_mv(argv);

trunk/src/gmake/kmkbuiltin.h

@@ -25 +25 @@
  */
 
-int kmk_builtin_command(char **argv);
+int kmk_builtin_command(const char *pszCmd);
+int kmk_builtin_command_parsed(int argc, char **argv);
+

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -40 +40 @@
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
+//__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <err.h>
+//#include <err.h>
 #include <errno.h>
 #include <libgen.h>
@@ -54 +54 @@
 #include <unistd.h>
 
+extern void * setmode(const char *p);
+extern mode_t getmode(const void *bbox, mode_t omode);
+
 static int      build(char *, mode_t);
-static void     usage(void);
+static int      usage(void);
 
 int vflag;
 
 int
-main(int argc, char *argv[])
+kmk_builtin_mkdir(int argc, char *argv[])
 {
         int ch, exitval, success, pflag;
@@ -68 +71 @@
         omode = pflag = 0;
         mode = NULL;
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+        optind = 0; /* init */
         while ((ch = getopt(argc, argv, "m:pv")) != -1)
                 switch(ch) {
@@ -80 +87 @@
                         break;
                 case '?':
-                default:
-                        usage();
+                default:
+                        return usage();
                 }
 
@@ -87 +94 @@
         argv += optind;
         if (argv[0] == NULL)
-                usage();
+                return usage();
 
         if (mode == NULL) {
                 omode = S_IRWXU | S_IRWXG | S_IRWXO;
         } else {
-                if ((set = setmode(mode)) == NULL)
-                        errx(1, "invalid file mode: %s", mode);
+                if ((set = setmode(mode)) == NULL) {
+                        fprintf(stderr, "%s: invalid file mode: %s", mode, argv[0]);
+                        return 1;
+                }
                 omode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
                 free(set);
@@ -105 +114 @@
                 } else if (mkdir(*argv, omode) < 0) {
                         if (errno == ENOTDIR || errno == ENOENT)
-                                warn("%s", dirname(*argv));
+                                fprintf(stderr, "%s: %s", argv[0], dirname(*argv));
                         else
-                                warn("%s", *argv);
+                                fprintf(stderr, "%s: %s", argv[0], *argv);
                         success = 0;
                 } else if (vflag)
@@ -122 +131 @@
                  */
                 if (success && mode != NULL && chmod(*argv, omode) == -1) {
-                        warn("%s", *argv);
+                        fprintf(stderr, "%s: %s", argv[0], *argv);
                         exitval = 1;
                 }
         }
-        exit(exitval);
+        return exitval;
 }
 
@@ -200 +209 @@
 }
 
-void
+int
 usage(void)
 {
 
         (void)fprintf(stderr, "usage: mkdir [-pv] [-m mode] directory ...\n");
-        exit (EX_USAGE);
+        return EX_USAGE;
 }