[CMD] Fix the errorlevel value set by the EXIT command, and when a batch file has...

[reactos.git] / base / shell / cmd / batch.c

diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c
index bf36ddb..148943a 100644 (file)
--- a/base/shell/cmd/batch.c
+++ b/base/shell/cmd/batch.c
@@ -299,7 +299,8 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd)
          * return until this context has been exited */
         new.prev = bc;
         /* copy some fields in the new structure if it is the same file */
-        if (same_fn) {
+        if (same_fn)
+        {
             new.mem     = bc->mem;
             new.memsize = bc->memsize;
             new.mempos  = 0;
@@ -366,6 +367,9 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd)
         FreeCommand(Cmd);
     }
 
+    /* Always return the current errorlevel */
+    ret = nErrorLevel;
+
     TRACE ("Batch: returns TRUE\n");
 
     fc = saved_fc;