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

     *availrows = screen_getheight() - 1;
+  }
+}
+/* add a new dirname to path, C:\XXX\*.EXE + YYY -> C:\XXX\YYY\*.EXE */
+static void path_add(char *path, const char *dirname) {
+  short i, ostatni = -1, slen;
+  printf("path_add(%s,%s) -> ", path, dirname);
+  /* find the last backslash */
+  for (i = 0; path[i] != 0; i++) {
+    if (path[i] == '\\') ostatni = i;
+  }
+  /* abort on error */
+  if (ostatni == -1) return;
+  /* do the trick */
+  slen = strlen(dirname);
+  memmove(path + ostatni + slen + 1, path + ostatni, slen + 1);
+  memcpy(path + ostatni + 1, dirname, slen);
+  printf("'%s'\n", path);
+}
+/* take back last dir from path, C:\XXX\YYY\*.EXE -> C:\XXX\*.EXE */
+static void path_back(char *path) {
+  short i, ostatni = -1, przedostatni = -1;
+  /* find the two last backslashes */
+  for (i = 0; path[i] != 0; i++) {
+    if (path[i] == '\\') {
+      przedostatni = ostatni;
+      ostatni = i;
+    }
+  }
+  /* abort on error */
+  if (przedostatni == -1) return;
+  /* do the trick */
+  for (i = przedostatni; path[i] != 0; i++) {
+    path[i] = path[ostatni++];
+  }
+}
 /* parse an attr list like "Ar-hS" and fill bitfield into attrfilter_may and attrfilter_must.
  * /AHS   -> adds S and H to mandatory attribs ("must")
  * /A-S   -> removes S from allowed attribs ("may")
  * returns non-zero on error. */
 static int dir_parse_attr_list(const char *arg, unsigned char *attrfilter_may, unsigned char *attrfilter_must) {
           req->flags |= DIR_FLAG_PAUSE;
           if (neg) req->flags &= (0xff ^ DIR_FLAG_PAUSE);
           break;
         case 's':
         case 'S':
-          /* TODO */
-          outputnl("/S NOT IMPLEMENTED YET");
+          req->flags |= DIR_FLAG_RECUR;
-          return(-1);
           break;
         case 'w':
         case 'W':
           req->format = DIR_OUTPUT_WIDE;
           break;
   return(0);
+}
+#define MAX_SORTABLE_FILES 8192
 static enum cmd_result cmd_dir(struct cmd_funcparam *p) {
   struct DTA *dta = (void *)0x80; /* set DTA to its default location at 80h in PSP */
   struct TINYDTA far *dtabuf = NULL; /* used to buffer results when sorting is enabled */
   unsigned short dtabufcount = 0;
   unsigned short i;
   unsigned char wcolcount;
   struct {
     struct nls_patterns nls;
     char buff64[64];
     char path[128];
+    struct DTA dtastack[64]; /* used for /S, max number of subdirs in DOS5 is 42 (A/B/C/...) */
+    unsigned char dirpending; /* set if a dir has been added to dtastack */
+    unsigned char dtastacklen;
-    unsigned short orderidx[65535 / sizeof(struct TINYDTA)];
+    unsigned short orderidx[MAX_SORTABLE_FILES / sizeof(struct TINYDTA)];
-  } *buf = (void *)(p->BUFFER);
+  } *buf;
   unsigned long summary_fcount = 0;
   unsigned long summary_totsz = 0;
   unsigned char drv = 0;
   struct dirrequest req;
-  /* make sure there's no risk of buffer overflow */
-  if (sizeof(*buf) > p->BUFFERSZ) {
-    sprintf(p->BUFFER, "INTERNAL DIR ERROR: p->BUFFERSZ=%u / required=%u", p->BUFFERSZ, sizeof(*buf));
-    outputnl(p->BUFFER);
-    return(CMD_FAIL);
-  }
   if (cmd_ishlp(p)) {
     nls_outputnl(37,0); /* "Displays a list of files and subdirectories in a directory" */
     outputnl("");
     nls_outputnl(37,1); /* "DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]" */
     outputnl("");
     nls_outputnl(37,9); /* "    D by date                G group dirs first       - prefix to reverse order" */
     outputnl("");
     nls_outputnl(37,10); /* "/S Displays files in specified directory and all subdirectories" */
     nls_outputnl(37,11); /* "/B Uses bare format (no heading information or summary)" */
     nls_outputnl(37,12); /* "/L Uses lowercases" */
-    return(CMD_OK);
+    goto OK;
+  }
+  /* allocate buf */
+  buf = calloc(sizeof(*buf), 1);
+  if (buf == NULL) {
+    nls_output_err(255, 8); /* insufficient memory */
+    goto FAIL;
+  }
   /* zero out glob_sortcmp_dat and init the collation table */
   bzero(&glob_sortcmp_dat, sizeof(glob_sortcmp_dat));
   for (i = 0; i < 256; i++) {
     cmd_explode(buf->buff64, dircmd, argvptrs);
     if ((dir_parse_cmdline(&req, argvptrs) != 0) || (req.filespecptr != NULL)) {
       nls_output(255, 10);/* bad environment */
       output(" - ");
       outputnl("DIRCMD");
-      return(CMD_FAIL);
+      goto FAIL;
+    }
+  }
+  }
   /* parse user's command line */
-  if (dir_parse_cmdline(&req, p->argv) != 0) return(CMD_FAIL);
+  if (dir_parse_cmdline(&req, p->argv) != 0) goto FAIL;
-  /* if no filespec provided, then it's about the current directory */
-  if (req.filespecptr == NULL) req.filespecptr = ".";
   /*** PARSING COMMAND LINE DONE *********************************************/
+  /* if no filespec provided, then it's about the current directory */
+  if (req.filespecptr == NULL) req.filespecptr = ".";
   availrows = screen_getheight() - 2;
   /* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */
   if ((req.filespecptr[0] != 0) && (req.filespecptr[1] == ':') && (req.filespecptr[2] == 0)) {
   } else {
     i = file_truename(req.filespecptr, buf->path);
+  }
   if (i != 0) {
     nls_outputnl_doserr(i);
-    return(CMD_FAIL);
+    goto FAIL;
+  }
   if (req.format != DIR_OUTPUT_BARE) {
     drv = buf->path[0];
     if (drv >= 'a') {
   i = path_appendbkslash_if_dir(buf->path);
   /* if ends with a \ then append ????????.??? */
   if (buf->path[i - 1] == '\\') strcat(buf->path, "????????.???");
+  NEXT_ITER: /* re-entry point for /S recursing */
-  /* ask DOS for list of files, but only with allowed attribs */
+  /* ask DOS for list of files, but only with allowed attribs (+directories, because
+   * I need them for /S) */
-  i = findfirst(dta, buf->path, req.attrfilter_may);
+  i = findfirst(dta, buf->path, req.attrfilter_may | DIR_FLAG_RECUR);
   if (i != 0) {
     nls_outputnl_doserr(i);
-    return(CMD_FAIL);
+    goto FAIL;
+  }
   /* if sorting is involved, then let's buffer all results (and sort them) */
   if (req.flags & DIR_FLAG_SORT) {
     /* allocate a memory buffer - try several sizes until one succeeds */
       if (dtabuf != NULL) break;
+    }
     if (dtabuf == NULL) {
       nls_outputnl_doserr(8); /* out of memory */
-      return(CMD_FAIL);
+      goto FAIL;
+    }
     /* remember the address so I can free it afterwards */
     glob_sortcmp_dat.dtabuf_root = dtabuf;
     /* compute the amount of DTAs I can buffer */
     max_dta_bufcount = memsz[i] / sizeof(struct TINYDTA);
+    if (max_dta_bufcount > MAX_SORTABLE_FILES) max_dta_bufcount = MAX_SORTABLE_FILES;
     /* printf("max_dta_bufcount = %u\n", max_dta_bufcount); */
     do {
+      /* if /S then remember first directory encountered (but not . nor ..) */
+      if ((req.flags & DIR_FLAG_RECUR) && (buf->dirpending == 0) && (dta->attr & DOS_ATTR_DIR) && (dta->fname[0] != '.')) {
+        buf->dirpending = 1;
+        memcpy(&(buf->dtastack[buf->dtastacklen]), dta, sizeof(struct DTA));
+      }
       /* filter out files with uninteresting attributes */
       if (filter_attribs(dta, req.attrfilter_must, req.attrfilter_may) == 0) continue;
       /* normalize "size" of directories to zero because kernel returns garbage
        * sizes for directories which might confuse the sorting routine later */
     /* no match? kein gluck! (this can happen when filtering attribs with /A:xxx
      * because while findfirst() succeeds, all entries can be rejected) */
     if (dtabufcount == 0) {
       nls_outputnl_doserr(2); /* "File not found" */
-      return(CMD_FAIL);
+      goto FAIL;
+    }
     /* sort the list - the tricky part is that my array is a far address while
      * qsort works only with near pointers, so I have to use an ugly (and
      * global) auxiliary table */
   wcolcount = 0; /* may be used for columns counting with wide mode */
   for (;;) {
+    /* if /S then remember first directory encountered */
+      if ((req.flags & DIR_FLAG_RECUR) && (buf->dirpending == 0) && (dta->attr & DOS_ATTR_DIR) && (dta->fname[0] != '.')) {
+      buf->dirpending = 1;
+      puts("GOT DIR (/S)");
+      memcpy(&(buf->dtastack[buf->dtastacklen]), dta, sizeof(struct DTA));
+    }
     /* filter out attributes (skip if entry comes from buffer, then it was already veted) */
     if (filter_attribs(dta, req.attrfilter_must, req.attrfilter_may) == 0) goto NEXT_ENTRY;
     /* turn string lcase (/L) */
     if (req.flags & DIR_FLAG_LCASE) _strlwr(dta->fname); /* OpenWatcom extension, probably does not care about NLS so results may be odd with non-A-Z characters... */
     output(" ");
     nls_outputnl(37,24); /* "bytes free" */
     if (req.flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
+  }
+  /* /S processing */
+  if (buf->dirpending) {
+    buf->dirpending = 0;
+    /* add dir to path and redo scan */
+    printf("DIR PENDING: %s\n", buf->dtastack[buf->dtastacklen].fname);
+    path_add(buf->path, buf->dtastack[buf->dtastacklen].fname);
+    buf->dtastacklen++;
+    goto NEXT_ITER;
+  }
+  while (buf->dtastacklen > 0) {
+    /* rewind path one directory back, pop the next dta and do a FindNext */
+    path_back(buf->path);
+    buf->dtastacklen--;
+    TRYNEXTENTRY:
+    if (findnext(&(buf->dtastack[buf->dtastacklen])) != 0) continue;
+    if ((buf->dtastack[buf->dtastacklen].attr & DOS_ATTR_DIR) == 0) goto TRYNEXTENTRY;
+    /* something found -> add dir to path and redo scan */
+    path_add(buf->path, buf->dtastack[buf->dtastacklen].fname);
+    goto NEXT_ITER;
+  }
   /* free the buffer memory (if used) */
   if (glob_sortcmp_dat.dtabuf_root != NULL) _ffree(glob_sortcmp_dat.dtabuf_root);
+  FAIL:
+  free(buf);
+  return(CMD_FAIL);
+  OK:
+  free(buf);
   return(CMD_OK);
+}

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd/dir.c – Rev 2190 → 2193