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

   lastexitcode = MK_FP(rmod->rmodseg, RMOD_OFFSET_LEXITCODE);
   /* make COMSPEC point to myself */
   set_comspec_to_self(*rmod_envseg);
-  /* update rmod's ptr to COMSPEC so it is always up to date - this needs to be
-   * done early so it is up to date even if this instance of SvarCOM dies
-   * early (for example because of a CTRL+C event) */
-  rmod_updatecomspecptr(rmod->rmodseg, *rmod_envseg);
   /* on /P check for the presence of AUTOEXEC.BAT and execute it if found,
    * but skip this check if /D was also passed */
   if ((cfg.flags & (FLAG_PERMANENT | FLAG_SKIP_AUTOEXEC)) == FLAG_PERMANENT) {
     if (file_getattr("AUTOEXEC.BAT") >= 0) cfg.execcmd = "AUTOEXEC.BAT";
+  }
   do {
+    /* update rmod's ptr to COMSPEC so it is always up to date - this needs to be
+     * done early so it is up to date even if this instance of SvarCOM dies
+     * early (for example because of a CTRL+C event) */
+    rmod_updatecomspecptr(rmod->rmodseg, *rmod_envseg);
     /* terminate previous command with a CR/LF if ECHO ON (but not during BAT processing) */
     if ((rmod->flags & FLAG_ECHOFLAG) && (rmod->bat == NULL)) outputnl("");
     SKIP_NEWLINE:

Subversion Repositories SvarDOS