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

 /*
  * dir
+ *
  * Displays a list of files and subdirectories in a directory.
+ *
  * DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]
+ *
  * /P Pauses after each screenful of information.
  * /W Uses wide list format.
+ *
  * /A Displays file with specified attributes:
  *     D Directories           R Read-only files     H Hidden files
  *     A Ready for archiving   S System files        - prefix meaning "not"
+ *
  * /O List files in sorted order:
  *     N by name            S by size              E by extension
  *     D by date            G group dirs first     - prefix to reverse order
+ *
  * /S Displays files in specified directory and all subdirectories.
  * /B Uses bare format (no heading information or summary)
  * /L Uses lowercases
  */
 /* NOTE: /A attributes are matched in an exclusive way, ie. only files with
  *       the specified attributes are matched. This is different from how DOS
  *       itself matches attributes hence DIR cannot rely on the attributes
  *       filter within FindFirst.
+ *
  * NOTE: Multiple /A are not supported - only the last one is significant.
  */
+#define WCOLWIDTH 15  /* width of a column in wide mode output */
 static int cmd_dir(struct cmd_funcparam *p) {
   const char *filespecptr = NULL;
   struct DTA *dta = (void *)0x80; /* set DTA to its default location at 80h in PSP */
   unsigned short i;
   unsigned short availrows;  /* counter of available rows on display (used for /P) */
+  unsigned short wcols = screen_getwidth() / WCOLWIDTH; /* number of columns in wide mode */
+  unsigned char wcolcount;
+  struct nls_patterns *nls = (void *)(p->BUFFER + (BUFFER_SIZE / 3));
+  char *buff2 = p->BUFFER + (BUFFER_SIZE / 3 * 2);
   #define DIR_FLAG_PAUSE  1
-  #define DIR_FLAG_WIDE   2
   #define DIR_FLAG_RECUR  4
-  #define DIR_FLAG_BARE   8
-  #define DIR_FLAG_LCASE 16
+  #define DIR_FLAG_LCASE  8
   unsigned char flags = 0;
+  #define DIR_OUTPUT_NORM 1
+  #define DIR_OUTPUT_WIDE 2
-//  unsigned char attribs_show = 0; /* show only files with ALL these attribs */
+  #define DIR_OUTPUT_BARE 3
-//  unsigned char attribs_hide = 0; /* hide files with ANY of these attribs */
+  unsigned char format = DIR_OUTPUT_NORM;
   if (cmd_ishlp(p)) {
     outputnl("Displays a list of files and subdirectories in a directory");
     outputnl("");
     outputnl("DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]");
     outputnl("");
     outputnl("/P Pauses after each screenful of information");
     outputnl("/W Uses wide list format");
     outputnl("");
     outputnl("/A Displays files with specified attributes:");
     outputnl("    D Directories            R Read-only files        H Hidden files");
     outputnl("    A Ready for archiving    S System files           - prefix meaning \"not\"");
     outputnl("");
     outputnl("/O List files in sorted order:");
     outputnl("    N by name                S by size                E by extension");
     outputnl("    D by date                G group dirs first       - prefix to reverse order");
     outputnl("");
     outputnl("/S Displays files in specified directory and all subdirectories");
     outputnl("/B Uses bare format (no heading information or summary)");
     outputnl("/L Uses lowercases");
     /* TODO FIXME REMOVE THIS ONCE ALL IMPLEMENTED */
     outputnl("\r\n*** THIS COMMAND IS NOT FULLY IMPLEMENTED YET ***");
     return(-1);
+  }
+  i = nls_getpatterns(nls);
+  if (i != 0) outputnl(doserr(i));
   /* parse command line */
   for (i = 0; i < p->argc; i++) {
     if (p->argv[i][0] == '/') {
       char arg;
       char neg = 0;
       /* detect negations and get actual argument */
       if (p->argv[i][1] == '-') neg = 1;
       arg = p->argv[i][1 + neg];
       /* */
       switch (arg) {
         case 'a':
         case 'A':
           /* TODO */
           outputnl("/A NOT IMPLEMENTED YET");
           return(-1);
           break;
         case 'b':
         case 'B':
-          flags |= DIR_FLAG_BARE;
+          format = DIR_OUTPUT_BARE;
+          break;
+        case 'w':
+        case 'W':
+          format = DIR_OUTPUT_WIDE;
           break;
         case 'p':
         case 'P':
           flags |= DIR_FLAG_PAUSE;
           if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);
           break;
+        case 'l':
+        case 'L':
+          flags |= DIR_FLAG_LCASE;
+          break;
         default:
           outputnl("Invalid switch");
           return(-1);
+      }
     } else {  /* filespec */
       if (filespecptr != NULL) {
         outputnl("Too many parameters");
         return(-1);
+      }
       filespecptr = p->argv[i];
+    }
+  }
   if (filespecptr == NULL) filespecptr = ".";
   /* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */
   if ((filespecptr[0] != 0) && (filespecptr[1] == ':') && (filespecptr[2] == 0)) {
     if ((filespecptr[0] >= 'a') && (filespecptr[0] <= 'z')) {
       p->BUFFER[0] = filespecptr[0] - ('a' - 1);
     } else {
       p->BUFFER[0] = filespecptr[0] - ('A' - 1);
+    }
     i = curpathfordrv(p->BUFFER, p->BUFFER[0]);
   } else {
     i = file_truename(filespecptr, p->BUFFER);
+  }
   if (i != 0) {
     outputnl(doserr(i));
     return(-1);
+  }
-  if ((flags & DIR_FLAG_BARE) == 0) {
+  if (format != DIR_OUTPUT_BARE) {
     unsigned char drv = p->BUFFER[0];
-    char *buff2 = p->BUFFER + (BUFFER_SIZE / 2);
     if (drv >= 'a') {
       drv -= 'a';
     } else {
       drv -= 'A';
+    }
     cmd_vol_internal(drv, buff2);
     sprintf(buff2, "Directory of %s", p->BUFFER);
     /* trim at first '?', if any */
     for (i = 0; buff2[i] != 0; i++) if (buff2[i] == '?') buff2[i] = 0;
     outputnl(buff2);
     outputnl("");
+  }
   /* if dir: append a backslash (also get its len) */
   i = path_appendbkslash_if_dir(p->BUFFER);
   /* if ends with a \ then append ????????.??? */
   if (p->BUFFER[i - 1] == '\\') strcat(p->BUFFER, "????????.???");
   i = findfirst(dta, p->BUFFER, DOS_ATTR_RO | DOS_ATTR_HID | DOS_ATTR_SYS | DOS_ATTR_DIR | DOS_ATTR_ARC);
   if (i != 0) {
     outputnl(doserr(i));
     return(-1);
+  }
   availrows = screen_getheight();
+  wcolcount = 0; /* may be used for columns counting with wide mode */
-  outputnl(dta->fname);
-  availrows--;
+  do {
+    if (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... */
+    switch (format) {
+      case DIR_OUTPUT_NORM:
+        /* print fname-space-extension (unless it's "." or "..", then print as-is) */
-  while (findnext(dta) == 0) {
+        if (dta->fname[0] == '.') {
-    outputnl(dta->fname);
+          output(dta->fname);
+          i = strlen(dta->fname);
+          while (i++ < 12) output(" ");
+        } else {
+          file_fname2fcb(buff2, dta->fname);
+          memmove(buff2 + 9, buff2 + 8, 4);
+          buff2[8] = ' ';
+          output(buff2);
+        }
+        output(" ");
+        /* either <DIR> or right aligned 10-chars byte size */
+        memset(buff2, ' ', 10);
-    if (flags & DIR_FLAG_PAUSE) {
+        if (dta->attr & DOS_ATTR_DIR) {
+          strcpy(buff2 + 10, "<DIR>");
-      availrows--;
+        } else {
+          _ultoa(dta->size, buff2 + 10, 10); /* OpenWatcom extension */
+        }
+        output(buff2 + strlen(buff2) - 10);
+        /* two spaces and NLS DATE */
+        buff2[0] = ' ';
+        buff2[1] = ' ';
+        nls_format_date(buff2 + 2, dta->date_yr + 1980, dta->date_mo, dta->date_dy, nls);
+        output(buff2);
+        /* one space and NLS TIME */
+        nls_format_time(buff2 + 1, dta->time_hour, dta->time_min, nls);
-      if (availrows < 2) {
+        outputnl(buff2);
-        press_any_key();
+        break;
+      case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */
-        availrows = screen_getheight();
+        i = strlen(dta->fname);
+        if (dta->attr & DOS_ATTR_DIR) {
+          i += 2;
+          output("[");
+          output(dta->fname);
+          output("]");
+        } else {
+          output(dta->fname);
+        }
+        while (i++ < WCOLWIDTH) output(" ");
+        if (++wcolcount == wcols) {
+          wcolcount = 0;
+          outputnl("");
-      }
+        }
+        break;
+      case DIR_OUTPUT_BARE:
+        outputnl(dta->fname);
+        break;
+    }
+    if ((flags & DIR_FLAG_PAUSE) && (--availrows < 2)) {
+      press_any_key();
+      availrows = screen_getheight();
-  }
+    }
+  } while (findnext(dta) == 0);
+  if (wcolcount != 0) outputnl("");
   return(-1);
+}

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd/dir.c @ 1092 – Rev 417 → 420