Changeset 49 for trunk/src/kShell/kShell.c

Timestamp:

Apr 5, 2003, 5:22:30 AM (22 years ago)

Author:

bird

Message:

Made it compile.

File:

• trunk/src/kShell/kShell.c (modified) (7 diffs)

trunk/src/kShell/kShell.c

@@ -308 +308 @@
 void            kshellWordsDestroy(PKSHELLWORDS pWords);
 
-int             kshellSyntaxError(const char *pszCmd, const char *pszMessage);
-int             kshellError(const char *pszCmd, const char *pszMessage);
+int             kshellSyntaxError(const char *pszCmd, const char *pszMessage, ...);
+int             kshellError(const char *pszCmd, const char *pszMessage, ...);
 
 int             kshellCmd_copy(const char *pszCmd, PKSHELLWORDS pWords);
@@ -649 +649 @@
  * @param   pszMessage  Message text.
  */
-int             kshellSyntaxError(const char *pszCmd, const char *pszMessage)
-{
+int             kshellSyntaxError(const char *pszCmd, const char *pszMessage, ...)
+{
+    va_list args;
     fflush(stdout);
-    fprintf(stderr, "Syntax error while executing command '%s': %s\n", pszCmd, pszMessage);
+    fprintf(stderr, "Syntax error in '%s': ", pszCmd);
+    va_start(args, pszMessage);
+    vfprintf(stderr, pszMessage, args);
+    va_end(args);
+    fputs("\n", stderr);
     return KSHELL_ERROR_SYNTAX_ERROR;
 }
@@ -663 +668 @@
  * @param   pszMessage  Message text.
  */
-int             kshellError(const char *pszCmd, const char *pszMessage)
-{
+int             kshellError(const char *pszCmd, const char *pszMessage, ...)
+{
+    va_list args;
     fflush(stdout);
-    fprintf(stderr, "Error while executing command '%s': %s\n", pszCmd, pszMessage);
+
+    fprintf(stderr, "Error while '%s': ", pszCmd);
+    va_start(args, pszMessage);
+    vfprintf(stderr, pszMessage, args);
+    va_end(args);
+    fputs("\n", stderr);
     return -1;
 }
@@ -700 +711 @@
     KBOOL   fDstDir = -1;
     int     iSrc;
+    int     rc;
 
     /*
@@ -723 +735 @@
      * Copy sources to destination.
      */
-    for (iSrc = 1; iSrc < iDst && !rc; iSrc++)
+    for (iSrc = 1, rc = 0; iSrc < iDst && !rc; iSrc++)
     {
         if (pWords->aWords[iSrc].fFlags & KSWORD_FLAGS_PATTERN)
@@ -746 +758 @@
                 pszDst[pWords->aWords[iDst].cchWord] = KSHELL_SLASH;
                 kMemCpy(pszDst + pWords->aWords[iDst].cchWord + 1,
-                        pWords->aWords[iSrc].pszWord
+                        pWords->aWords[iSrc].pszWord,
                         pWords->aWords[iSrc].cchWord + 1);
             }
@@ -755 +767 @@
              * Do the copy.
              */
+            #if 0 /* @todo implement this */
             rc = kFileCopy(pWords->aWords[iSrc].pszWord, pszDst);
+            #endif
             if (rc)
             {
                 kshellError("copy", "failed to copy '%s' to '%s' rc=%d.",
-                            pWords->aWords[iSrc].pszWord,
-                            pDst, rc);
+                            pWords->aWords[iSrc].pszWord, pszDst, rc);
             }