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

 #include <dos.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <process.h>
+#include "svarlang.lib/svarlang.h"
 #include "cmd.h"
 #include "env.h"
 #include "helpers.h"
 #include "redir.h"
       case 'C':
         cfg->flags |= FLAG_EXEC_AND_QUIT;
         /* FALLTHRU */
       case 'k': /* /K = execute command and keep running */
       case 'K':
+        cmdline++;
+        while (*cmdline == ' ') cmdline++;
-        cfg->execcmd = cmdline + 1;
+        cfg->execcmd = cmdline;
+        break;
+      case 'y': /* /Y = execute batch file step-by-step (with /P, /K or /C) */
+      case 'Y':
+        cfg->flags |= FLAG_STEPBYSTEP;
-        return;
+        break;
       case 'd': /* /D = skip autoexec.bat processing */
       case 'D':
         cfg->flags |= FLAG_SKIP_AUTOEXEC;
         break;
         nls_outputnl(1,2); /* "/D      Skip AUTOEXEC.BAT processing (makes sense only with /P)" */
         nls_outputnl(1,3); /* "/E:nnn  Sets the environment size to nnn bytes" */
         nls_outputnl(1,4); /* "/P      Makes the new command interpreter permanent and run AUTOEXEC.BAT" */
         nls_outputnl(1,5); /* "/C      Executes the specified command and returns" */
         nls_outputnl(1,6); /* "/K      Executes the specified command and continues running" */
+        nls_outputnl(1,7); /* "/Y      Executes the batch program step by step" */
         exit(1);
         break;
       default:
         nls_output(0,2); /* invalid switch */
       return;
+    }
     /* fill the newly allocated batctx structure */
     _fstrcpy(newbat->fname, cmdfile); /* truename of the BAT file */
+    newbat->flags = flags & FLAG_STEPBYSTEP;
     /* explode args of the bat file and store them in rmod buff */
     cmd_explode(buff, cmdline, NULL);
     _fmemcpy(newbat->argv, buff, sizeof(newbat->argv));
     /* push the new bat to the top of rmod's linked list */
       goto EXEC_CMDLINE;
     } else {
       flags &= ~DELETE_STDIN_FILE;
+    }
-    /* skip user input if I have a command to exec (/C or /K) */
+    /* skip user input if I have a command to exec (/C or /K or /P) */
     if (cfg.execcmd != NULL) {
       cmdline = cfg.execcmd;
       cfg.execcmd = NULL;
+      /* */
+      if (cfg.flags & FLAG_STEPBYSTEP) flags |= FLAG_STEPBYSTEP;
       goto EXEC_CMDLINE;
+    }
     /* if batch file is being executed -> fetch next line */
     if (rmod->bat != NULL) {
       batpercrepl(cmdline, CMDLINE_MAXLEN, BUFFER, rmod, *rmod_envseg);
       /* skip any leading spaces */
       while (*cmdline == ' ') cmdline++;
       /* skip batch labels */
       if (*cmdline == ':') continue;
+      /* step-by-step execution? */
+      if (rmod->bat->flags & FLAG_STEPBYSTEP) {
+        if (*cmdline == 0) continue; /* skip empty lines */
+        if (askchoice(cmdline, svarlang_str(0,10)) != 0) continue;
+      }
       /* output prompt and command on screen if echo on and command is not
        * inhibiting it with the @ prefix */
       if ((rmod->flags & FLAG_ECHOFLAG) && (cmdline[0] != '@')) {
         build_and_display_prompt(BUFFER, *rmod_envseg);
         outputnl(cmdline);
     /* try matching (and executing) an internal command */
     cmdres = cmd_process(rmod, *rmod_envseg, cmdline, BUFFER, sizeof(BUFFER), &redirprops, flags & DELETE_STDIN_FILE);
     if ((cmdres == CMD_OK) || (cmdres == CMD_FAIL)) {
       /* internal command executed */
-      continue;
     } else if (cmdres == CMD_CHANGED) { /* cmdline changed, needs to be reprocessed */
       goto EXEC_CMDLINE;
     } else if (cmdres == CMD_CHANGED_BY_CALL) { /* cmdline changed *specifically* by CALL */
       /* the distinction is important since it changes the way batch files are processed */
       flags |= CALL_FLAG;
       goto EXEC_CMDLINE;
     } else if (cmdres == CMD_NOTFOUND) {
       /* this was not an internal command, try matching an external command */
       run_as_external(BUFFER, cmdline, *rmod_envseg, rmod, &redirprops, flags);
-      flags &= ~CALL_FLAG; /* reset callflag to make sure it is processed only once */
       /* is it a newly launched BAT file? */
       if ((rmod->bat != NULL) && (rmod->bat->nextline == 0)) goto SKIP_NEWLINE;
       /* run_as_external() does not return on success, if I am still alive then
        * external command failed to execute */
       nls_outputnl(0,5); /* "Bad command or file name" */
-      continue;
+    } else {
+      /* I should never ever land here */
+      outputnl("INTERNAL ERR: INVALID CMDRES");
+    }
-    /* I should never ever land here */
+    /* reset one-time only flags */
+    flags &= ~CALL_FLAG;
-    outputnl("INTERNAL ERR: INVALID CMDRES");
+    flags &= ~FLAG_STEPBYSTEP;
     /* repeat unless /C was asked - but always finish running an ongoing batch
      * file (otherwise only first BAT command would be executed with /C) */
   } while (((rmod->flags & FLAG_EXEC_AND_QUIT) == 0) || (rmod->bat != NULL));

Subversion Repositories SvarDOS

(root)/svarcom/trunk/command.c – Rev 989 → 1001