commit ebecf50229b50ad0718100debad85da224189dd5
author Dave Pickles <davep@cyw.uklinux.net> Tue Aug 01 22:02:18 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 01 22:02:18 2000 +0000
tree 8524ce37e793ab9e7450a25f1e42241775624d54
parent 1da10fdca83c7328150a400d8a405cca4b66649f

Added support for ERRORLEVEL.
Most errors reported via FormatMessage().
COPY command now works correctly if output specifier is a directory.

programs/wcmd/batch.c

diff --git a/programs/wcmd/batch.c b/programs/wcmd/batch.c
index 6bb9c22..acfbc1e 100644
--- a/programs/wcmd/batch.c
+++ b/programs/wcmd/batch.c
@@ -16,7 +16,7 @@
 extern int echo_mode;
 extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 extern BATCH_CONTEXT *context;
-
+extern DWORD errorlevel;
 
 
 /****************************************************************************
@@ -43,7 +43,8 @@
   if (strstr (string, ".bat") == NULL) strcat (string, ".bat");
   h = CreateFile (string, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (h == INVALID_HANDLE_VALUE) {
-    WCMD_output ("File %s not found\n", string);
+    SetLastError (ERROR_FILE_NOT_FOUND);
+    WCMD_print_error ();
     return;
   }
 
@@ -223,7 +224,7 @@
   }
 }
 
-/**************************************************************************** 
+/****************************************************************************
  * WCMD_fgets
  *
  * Get one line from a batch file. We can't use the native f* functions because
@@ -244,7 +245,7 @@
     if (*s == '\n') bytes = 0;
     else if (*s != '\r') {
       s++;
-    n--;
+      n--;
     }
     *s = '\0';
   } while ((bytes == 1) && (n > 1));