WebSVN – SvarDOS – Diff – /svarcom/trunk/command.c

     rmod->version = BYTE_VERSION;
   } else {
     /* printf("rmod found at %Fp\r\n", rmod); */
     /* if I was spawned by rmod and FLAG_EXEC_AND_QUIT is set, then I should
      * die asap, because the command has been executed already, so I no longer
+     * have a purpose in life, UNLESS I still have a batch file to run or
-     * have a purpose in life */
+     * a FOR loop to execute */
-    if (rmod->flags & FLAG_EXEC_AND_QUIT) sayonara(rmod);
+    if ((rmod->flags & FLAG_EXEC_AND_QUIT) && (rmod->bat == NULL) && (rmod->forloop == NULL)) {
+      sayonara(rmod);
+    }
     /* */
     if (rmod->version != BYTE_VERSION) {
       nls_outputnl_err(2,0);
       _asm {
         HALT:
     /* am I inside a FOR loop? */
     if (rmod->forloop) {
       if (forloop_process(cmdlinebuf, rmod->forloop) != 0) {
         rmod_ffree(rmod->forloop);
         rmod->forloop = NULL;
+        continue; /* needed so we quit if the FOR loop was ran through COMMAND/C */
       } else {
         /* output prompt and command on screen if echo on and command is not
          * inhibiting it with the @ prefix */
         if (rmod->flags & FLAG_ECHOFLAG) {
           build_and_display_prompt(BUFFER, *rmod_envseg);

Subversion Repositories SvarDOS