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

   static struct rmod_props far *rmod;
   static char cmdlinebuf[CMDLINE_MAXLEN + 2]; /* 1 extra byte for 0-terminator and another for memguard */
   static char *cmdline;
   static struct redir_data redirprops;
   static enum cmd_result cmdres;
+  static unsigned short i; /* general-purpose variable for short-lived things */
   rmod = rmod_find(BUFFER_len);
   if (rmod == NULL) {
     /* look at command line parameters (in case env size if set there) */
     parse_argv(&cfg);
     cmdline = cmdlinebuf;
     /* (re)load translation strings if needed */
     nls_langreload(BUFFER, *rmod_envseg);
+    /* load awaiting command, if any (used to run piped commands) */
+    if (rmod->awaitingcmd[0] != 0) {
+      _fstrcpy(cmdline, rmod->awaitingcmd);
+      rmod->awaitingcmd[0] = 0;
+      goto EXEC_CMDLINE;
+    }
     /* skip user input if I have a command to exec (/C or /K) */
     if (cfg.execcmd != NULL) {
       cmdline = cfg.execcmd;
       cfg.execcmd = NULL;
       goto EXEC_CMDLINE;
     /* update rmod's ptr to COMPSPEC so it is always up to date */
     rmod_updatecomspecptr(rmod->rmodseg, *rmod_envseg);
     /* handle redirections (if any) */
-    redir_parsecmd(&redirprops, cmdline);
+    i = redir_parsecmd(&redirprops, cmdline, rmod->awaitingcmd);
+    if (i != 0) {
+      nls_outputnl_doserr(i);
+      rmod->awaitingcmd[0] = 0;
+      continue;
+    }
     /* try matching (and executing) an internal command */
     cmdres = cmd_process(rmod, *rmod_envseg, cmdline, BUFFER, sizeof(BUFFER), &redirprops);
     if ((cmdres == CMD_OK) || (cmdres == CMD_FAIL)) {
       /* internal command executed */

Subversion Repositories SvarDOS

(root)/svarcom/trunk/command.c – Rev 538 → 543