Changeset 228 for trunk/src/gmake

Timestamp:

Feb 9, 2005, 12:30:52 PM (20 years ago)

Author:

bird

Message:

fixing and adding more commands.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (4 diffs)
• job.c (modified) (1 diff)
• kmkbuiltin.c (modified) (4 diffs)
• kmkbuiltin/Makefile.kmk (added)
• kmkbuiltin/mkdir.c (modified) (7 diffs)
• kmkbuiltin/rm.c (added)
• kmkbuiltin/strmode.c (added)

trunk/src/gmake/Makefile.kmk

@@ -3 +3 @@
 
 PROGRAMS            = kmk
+PROGRAMS           += echo mkdir rm
 
-kmk_TOOL            = GCC3
-kmk_TOOL.os2        = GCC3OMF
-kmk_TOOL.win32      = VCC70
+TOOL                = GCC3
+TOOL.os2            = GCC3OMF
+TOOL.win32          = VCC70
 
-kmk_CFLAGS.linux.release    = -O3
-kmk_CFLAGS.os2.relase       = -O3
-kmk_CFLAGS.win32            = -MT -W3
+CFLAGS.linux.release= -O3
+CFLAGS.os2.relase   = -O3
+CFLAGS.win32        = -MT -W3
+
+LDFLAGS.linux.release       = -s
+LDFLAGS.os2                 = -Zhigh-mem -Zstack=1024
+LDFLAGS.os2.release         = -s
+LDFLAGS.win32               = /SUBSYSTEM:console /INCREMENTAL:no /NOD
+
+LIBS.linux              = rt
+LIBS.win32              = \
+        $(PATH_DEV)/x86.win32/vcc70/lib/libcmt.lib \
+        $(PATH_DEV)/x86.win32/vcc70/lib/oldnames.lib \
+        $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
+        $(PATH_DEV)/x86.win32/sdk200209/lib/User32.Lib \
+        $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib
 
 kmk_DEPS            = $(PATH_TARGET)/config.h
@@ -31 +45 @@
 kmk_DEFS.win32          = WINDOWS32 _CONSOLE WIN32
 kmk_DEFS.win32.release  = NDEBUG
-
-kmk_LDFLAGS.linux.release   = -s
-kmk_LDFLAGS.os2             = -Zhigh-mem -Zstack=1024
-kmk_LDFLAGS.os2.release     = -s
-kmk_LDFLAGS.win32           = /SUBSYSTEM:console /INCREMENTAL:no /NOD
-
-kmk_LIBS.linux              = rt
-kmk_LIBS.win32              = \
-        $(PATH_DEV)/x86.win32/vcc70/lib/libcmt.lib \
-        $(PATH_DEV)/x86.win32/vcc70/lib/oldnames.lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/Kernel32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/User32.Lib \
-        $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib
         
 kmk_SOURCES         = \
@@ -70 +71 @@
         kmkbuiltin/echo.c \
         kmkbuiltin/mkdir.c \
-        kmkbuiltin/setmode.c
+        kmkbuiltin/rm.c \
+        \
+        kmkbuiltin/setmode.c \
+        kmkbuiltin/strmode.c
 
 kmk_SOURCES.os2 = \
@@ -90 +94 @@
 #MAKE_DLLSHELL
 
+echo_DEFS = kmk_builtin_echo=main
+echo_SOURCES = \
+        kmkbuiltin/echo.c
+
+mkdir_DEFS = kmk_builtin_mkdir=main
+mkdir_SOURCES = \
+        kmkbuiltin/mkdir.c \
+        kmkbuiltin/setmode.c
+
+rm_DEFS = kmk_builtin_rm=main
+rm_SOURCES = \
+        kmkbuiltin/rm.c \
+        kmkbuiltin/setmode.c \
+        kmkbuiltin/strmode.c
+
+
 
 DEPTH = ../..

trunk/src/gmake/job.c

@@ -1127 +1127 @@
           rc = kmk_builtin_command_parsed(argc, argv);
       }
-      printf("rc=%d\n", rc);
 #ifndef VMS
       free (argv[0]);

trunk/src/gmake/kmkbuiltin.c

@@ -96 +96 @@
         else
         {
-            pszEnd = pszCmd + 1;
-            while (!isspace(*pszEnd))
+            pszEnd = pszCmd;
+            while (!isspace(*pszEnd) && *pszEnd)
                 pszEnd++;
             pszNext = pszEnd;
@@ -146 +146 @@
          */
         pszCmd = pszNext;
-        if (isspace(*pszCmd))
+        if (isspace(*pszCmd) && *pszCmd)
             pszCmd++;
     }
@@ -188 +188 @@
     //    rc = kmk_builtin_cp(argc, argv, environ);
     //else if (!strcmp(pszCmd, "chmod"))
-    //    rc = kmk_builtin_chmod(argv);
+    //    rc = kmk_builtin_chmod(argc, argv, environ);
     else if (!strcmp(pszCmd, "echo"))
         rc = kmk_builtin_echo(argc, argv, environ);
@@ -194 +194 @@
         rc = kmk_builtin_mkdir(argc, argv, environ);
     //else if (!strcmp(pszCmd, "mv"))
-    //    rc = kmk_builtin_mv(argv);
-    //else if (!strcmp(pszCmd, "rm"))
-    //    rc = kmk_builtin_rm(argv);
+    //    rc = kmk_builtin_mv(argc, argv, environ);
+    else if (!strcmp(pszCmd, "rm"))
+        rc = kmk_builtin_rm(argc, argv, environ);
     //else if (!strcmp(pszCmd, "rmdir"))
-    //    rc = kmk_builtin_rmdir(argv);
+    //    rc = kmk_builtin_rmdir(argc, argv, environ);
     else
     {

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -60 +60 @@
 static int      usage(void);
 
-int vflag;
+static int vflag;
 
 int
@@ -71 +71 @@
         omode = pflag = 0;
         mode = NULL;
+        vflag = 0;
         opterr = 1;
         optarg = NULL;
@@ -100 +101 @@
         } else {
                 if ((set = setmode(mode)) == NULL) {
-                        fprintf(stderr, "%s: invalid file mode: %s", mode, argv[0]);
+                        fprintf(stderr, "%s: invalid file mode: %s\n", mode, argv[0]);
                         return 1;
                 }
@@ -114 +115 @@
                 } else if (mkdir(*argv, omode) < 0) {
                         if (errno == ENOTDIR || errno == ENOENT)
-                                fprintf(stderr, "%s: %s", argv[0], dirname(*argv));
+                                fprintf(stderr, "%s: %s: %s\n", argv[0], dirname(*argv), strerror(errno));
                         else
-                                fprintf(stderr, "%s: %s", argv[0], *argv);
+                                fprintf(stderr, "%s: %s: %s\n", argv[0], *argv, strerror(errno));
                         success = 0;
                 } else if (vflag)
@@ -131 +132 @@
                  */
                 if (success && mode != NULL && chmod(*argv, omode) == -1) {
-                        fprintf(stderr, "%s: %s", argv[0], *argv);
+                        fprintf(stderr, "%s: %s: %s\n", argv[0], *argv, strerror(errno));
                         exitval = 1;
                 }
@@ -138 +139 @@
 }
 
-int
+static int
 build(char *path, mode_t omode)
 {
@@ -209 +210 @@
 }
 
-int
+static int
 usage(void)
 {