Changeset 44 for trunk/src

Timestamp:

Mar 28, 2003, 12:22:18 PM (22 years ago)

Author:

bird

Message:

Playing with the shell code.

Location:

trunk/src/kShell

Files:

• kShell.c (modified) (5 diffs)
• kShell.h (modified) (1 diff)
• makefile (modified) (2 diffs)

trunk/src/kShell/kShell.c

@@ -254 +254 @@
 #define KSHELL_WILDCHAR(ch)     ( (ch) == '*' || (ch) == '?' )
 
+/**
+ * the a default kShell slash.
+ */
+#define KSHELL_SLASH            '/'
+
+/**
+ * Checks if the character is a slash or not.
+ */
+#define KSHELL_ISSLASH(ch)      ( (ch) == KSHELL_SLASH )
 
 
@@ -432 +441 @@
     pWords = kshellWordsParse(pszCmd, 1, NULL);
     if (!pWords)
-        return KSHELL_ERROR_NOT_ENOUGHT_MEMORY;
+        return KSHELL_ERROR_NOT_ENOUGH_MEMORY;
     if (!pWords->cWords)
         return 0;
@@ -455 +464 @@
         pWords = kshellWordsParse(pszCmd, aCmds[i].cWords, pWords);
         if (!pWords)
-            return KSHELL_ERROR_NOT_ENOUGHT_MEMORY;
+            return KSHELL_ERROR_NOT_ENOUGH_MEMORY;
     }
     rc = aCmds[i].pfnCmd(pszCmd, pWords);
@@ -688 +697 @@
 int             kshellCmd_copy(const char *pszCmd, PKSHELLWORDS pWords)
 {
+    int     iDst = pWords->cWords - 1;  /* Last word is destination. */
+    KBOOL   fDstDir = -1;
+    int     iSrc;
+
+    /*
+     * Syntax validation.
+     */
+    if (pWords->cWords < 3)
+        return kshellSyntaxError("copy", "too few arguments.");
+
+    /*
+     * Figure out if the destion is a directory or file specification.
+     */
+    if (KSHELL_ISSLASH(pWords->aWords[iDst].pszWord[pWords->aWords[iDst].cchWord - 1]))
+    {
+        fDstDir = TRUE;
+        while (KSHELL_ISSLASH(pWords->aWords[iDst].pszWord[pWords->aWords[iDst].cchWord - 1]))
+            pWords->aWords[iDst].cchWord--;
+        pWords->aWords[iDst].pszWord[pWords->aWords[iDst].cchWord] = '\0';
+    }
+    else
+        fDstDir = kDirExist(pWords->aWords[iDst].pszWord);
+
+    /*
+     * Copy sources to destination.
+     */
+    for (iSrc = 1; iSrc < iDst && !rc; iSrc++)
+    {
+        if (pWords->aWords[iSrc].fFlags & KSWORD_FLAGS_PATTERN)
+        {
+            /*
+             *
+             */
+        }
+        else
+        {   /*
+             * Construct destination name.
+             */
+            char *pszDst;
+            KBOOL fDstFree = FALSE;
+            if (fDstDir)
+            {
+                fDstFree = TRUE;
+                pszDst = malloc(pWords->aWords[iDst].cchWord + 1 + pWords->aWords[iSrc].cchWord + 1);
+                if (pszDst)
+                    return KSHELL_ERROR_NOT_ENOUGH_MEMORY;
+                kMemCpy(pszDst, pWords->aWords[iDst].pszWord, pWords->aWords[iDst].cchWord);
+                pszDst[pWords->aWords[iDst].cchWord] = KSHELL_SLASH;
+                kMemCpy(pszDst + pWords->aWords[iDst].cchWord + 1,
+                        pWords->aWords[iSrc].pszWord
+                        pWords->aWords[iSrc].cchWord + 1);
+            }
+            else
+                pszDst = pWords->aWords[iDst].pszWord;
+
+            /*
+             * Do the copy.
+             */
+            rc = kFileCopy(pWords->aWords[iSrc].pszWord, pszDst);
+            if (rc)
+            {
+                kshellError("copy", "failed to copy '%s' to '%s' rc=%d.",
+                            pWords->aWords[iSrc].pszWord,
+                            pDst, rc);
+            }
+
+            if (fDstFree)
+                free(pszDst);
+        }
+    }
+
     return -1;
 }
@@ -787 +867 @@
     if (pWords->cWords >= 2)
     {
-        unsigned uMsgLevel = kStrToUnsigned(pWords->aWords[1].pszWord, -2);
+        unsigned uMsgLevel = kStrToUDef(pWords->aWords[1].pszWord, -2, 0);
         if (uMsgLevel != -2)
         {
-            if (uMsgLevel <= kEnvGetUnsigned("KBUILD_MSG_LEVEL", 0))
+            if (uMsgLevel <= kEnvGetUDef("KBUILD_MSG_LEVEL", 0, 0))
             {
                 /* output all the words forcing one space separation */

trunk/src/kShell/kShell.h

@@ -31 +31 @@
  */
 #define KSHELL_ERROR_SYNTAX_ERROR           1700
-#define KSHELL_ERROR_NOT_ENOUGHT_MEMORY     1708
+#define KSHELL_ERROR_NOT_ENOUGH_MEMORY      1708
 #define KSHELL_ERROR_PROGRAM_NOT_FOUND      1742
 #define KSHELL_ERROR_COMMAND_TOO_LONG       1743

trunk/src/kShell/makefile

@@ -2 +2 @@
 
 #CC = icc /Q /Ti+ /I../kLib/Generic/include
-CC = icc /Q /Ti+ -DOS2 -D__i386__ -DDEBUG /Ig:/ktaskmgr/tree/Generic/include
-CC = icc /Q /Ti+ /O /Oi+ -DOS2 -D__i386__ -DDEBUG /Ig:/ktaskmgr/tree/Generic/include
+CC = icc /Q /Ti+ -DOS2 -D__i386__ -DDEBUG /I/ktaskmgr/tree/Generic/include
+CC = icc /Q /Ti+ /O /Oi+ -DOS2 -D__i386__ -DDEBUG /I/ktaskmgr/tree/Generic/include
 
 
@@ -10 +10 @@
                         
 kShellMain.exe: kShellMain.c kShell.c kShell.h
-        $(CC) kShellmain.c kShell.c
+        $(CC) kShellmain.c kShell.c /ktaskmgr/tree/lib/debug/klib.lib
         
 kShellMain.obj: kShellMain.c kShell.h