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

 #include <string.h>
 #include "doserr.h"
 #include "env.h"
 #include "helpers.h"
+#include "redir.h"
 #include "rmodinit.h"
 #include "sayonara.h"
 struct cmd_funcparam {
   if (argvlist) argvlist[argc] = NULL;
   return(argc);
+}
-int cmd_process(struct rmod_props far *rmod, unsigned short env_seg, const char *cmdline, void *BUFFER, unsigned short BUFFERSZ) {
+int cmd_process(struct rmod_props far *rmod, unsigned short env_seg, const char *cmdline, void *BUFFER, unsigned short BUFFERSZ, const struct redir_data *redir) {
   const struct CMD_ID *cmdptr;
   unsigned short argoffset;
+  int cmdres;
   struct cmd_funcparam *p = (void *)BUFFER;
   p->BUFFERSZ = BUFFERSZ - sizeof(*p);
   /* special case: is this a drive change? (like "E:") */
   if ((cmdline[0] != 0) && (cmdline[1] == ':') && ((cmdline[2] == ' ') || (cmdline[2] == 0))) {
   cmdptr = cmd_match(cmdline, &argoffset);
   if (cmdptr == NULL) return(-2); /* command is not recognized as internal */
   /* printf("recognized internal command: '%s', tail of command at offset %u\r\n", cmdptr->cmd, argoffset); */
+  /* apply redirections (if any) */
+  if (redir_apply(redir) != 0) return(-1);
   /* prepare function parameters and feed it to the cmd handling function */
   p->argc = cmd_explode(p->argvbuf, cmdline + argoffset, p->argv);
   p->env_seg = env_seg;
   p->rmod = rmod;
   p->argoffset = argoffset;
   p->cmdline = cmdline;
-  return((cmdptr->func_ptr)(p));
+  cmdres = (cmdptr->func_ptr)(p);
+  /* cancel redirections */
+  redir_revert();
+  return(cmdres);
+}

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd.c – Rev 514 → 517