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


/* This file is part of the SvarCOM project and is published under the terms
 * of the MIT license.
 *
 * Copyright (C) 2021 Mateusz Viste
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */
 
/*
 * 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 */
 
 
/* fills freebytes with free bytes for drv (A=0, B=1, etc)
 * returns DOS ERR code on failure */
static unsigned short cmd_dir_df(unsigned long *freebytes, unsigned char drv) {
  unsigned short res = 0;
  unsigned short sects_per_clust = 0, avail_clusts = 0, bytes_per_sect = 0;
 
  _asm {
    push ax
    push bx
    push cx
    push dx
 
    mov ah, 0x36  /* DOS 2+ -- Get Disk Free Space */
    mov dl, [drv] /* A=1, B=2, etc (0 = DEFAULT DRIVE) */
    inc dl
    int 0x21      /* AX=sects_per_clust, BX=avail_clusts, CX=bytes_per_sect, DX=tot_clusters */
    cmp ax, 0xffff /* AX=0xffff on error (invalid drive) */
    jne COMPUTEDF
    mov [res], 0x0f /* fill res with DOS error code 15 ("invalid drive") */
    jmp DONE
 
    COMPUTEDF:
    /* freebytes = AX * BX * CX */
    mov [sects_per_clust], ax
    mov [avail_clusts], bx
    mov [bytes_per_sect], cx
 
    DONE:
    pop dx
    pop cx
    pop bx
    pop ax
  }
 
  /* multiple steps to avoid uint16 overflow */
  *freebytes = sects_per_clust;
  *freebytes *= avail_clusts;
  *freebytes *= bytes_per_sect;
 
  return(res);
}
 
 
static void dir_pagination(unsigned short *availrows) {
  *availrows -= 1;
  if (*availrows == 0) {
    press_any_key();
    *availrows = screen_getheight() - 1;
  }
}
 
 
/* 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) {
  for (; *arg != 0; arg++) {
    unsigned char curattr;
    char not;
    if (*arg == '-') {
      not = 1;
      arg++;
    } else {
      not = 0;
    }
    switch (*arg) {
      case 'd':
      case 'D':
        curattr = DOS_ATTR_DIR;
        break;
      case 'r':
      case 'R':
        curattr = DOS_ATTR_RO;
        break;
      case 'a':
      case 'A':
        curattr = DOS_ATTR_ARC;
        break;
      case 'h':
      case 'H':
        curattr = DOS_ATTR_HID;
        break;
      case 's':
      case 'S':
        curattr = DOS_ATTR_SYS;
        break;
      default:
        return(-1);
    }
    /* update res bitfield */
    if (not) {
      *attrfilter_may &= ~curattr;
    } else {
      *attrfilter_must |= curattr;
    }
  }
  return(0);
}
 
 
#define DIR_ATTR_DEFAULT (DOS_ATTR_RO | DOS_ATTR_DIR | DOS_ATTR_ARC)
 
static enum cmd_result 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 + (p->BUFFERSZ / 2));
  char *buff2 = p->BUFFER + (p->BUFFERSZ / 2) + sizeof(*nls);
  unsigned long summary_fcount = 0;
  unsigned long summary_totsz = 0;
  unsigned char drv = 0;
  unsigned char attrfilter_may = DIR_ATTR_DEFAULT;
  unsigned char attrfilter_must = 0;
 
  #define DIR_FLAG_PAUSE  1
  #define DIR_FLAG_RECUR  4
  #define DIR_FLAG_LCASE  8
  unsigned char flags = 0;
 
  #define DIR_OUTPUT_NORM 1
  #define DIR_OUTPUT_WIDE 2
  #define DIR_OUTPUT_BARE 3
  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");
    return(CMD_OK);
  }
 
  i = nls_getpatterns(nls);
  if (i != 0) nls_outputnl_doserr(i);
 
  /* parse command line */
  for (i = 0; i < p->argc; i++) {
    if (p->argv[i][0] == '/') {
      const char *arg = p->argv[i] + 1;
      char neg = 0;
      /* detect negations and get actual argument */
      if (*arg == '-') {
        neg = 1;
        arg++;
      }
      /* */
      switch (*arg) {
        case 'a':
        case 'A':
          arg++;
          /* preset defaults */
          attrfilter_may = DIR_ATTR_DEFAULT;
          attrfilter_must = 0;
          /* /-A only allowed without further parameters (used to cancel possible previous /Asmth) */
          if (neg) {
            if (*arg != 0) {
              nls_outputnl_err(0, 2); /* invalid switch */
              return(CMD_FAIL);
            }
          } else {
            /* start with "allow everything" */
            attrfilter_may = (DOS_ATTR_ARC | DOS_ATTR_DIR | DOS_ATTR_HID | DOS_ATTR_SYS | DOS_ATTR_RO);
            if (dir_parse_attr_list(arg, &attrfilter_may, &attrfilter_must) != 0) {
              nls_outputnl_err(0, 3); /* invalid parameter format */
              return(CMD_FAIL);
            }
          }
          break;
        case 'b':
        case 'B':
          format = DIR_OUTPUT_BARE;
          break;
        case 'l':
        case 'L':
          flags |= DIR_FLAG_LCASE;
          break;
        case 'o':
        case 'O':
          /* TODO */
          outputnl("/O NOT IMPLEMENTED YET");
          return(CMD_FAIL);
          break;
        case 'p':
        case 'P':
          flags |= DIR_FLAG_PAUSE;
          if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);
          break;
        case 's':
        case 'S':
          /* TODO */
          outputnl("/S NOT IMPLEMENTED YET");
          return(CMD_FAIL);
          break;
        case 'w':
        case 'W':
          format = DIR_OUTPUT_WIDE;
          break;
        default:
          nls_outputnl_err(0, 2); /* invalid switch */
          return(CMD_FAIL);
      }
    } else {  /* filespec */
      if (filespecptr != NULL) {
        nls_outputnl_err(0, 4); /* too many parameters */
        return(CMD_FAIL);
      }
      filespecptr = p->argv[i];
    }
  }
 
  if (filespecptr == NULL) filespecptr = ".";
 
  availrows = screen_getheight() - 2;
 
  /* 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) {
    nls_outputnl_doserr(i);
    return(CMD_FAIL);
  }
 
  if (format != DIR_OUTPUT_BARE) {
    drv = p->BUFFER[0];
    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("");
    availrows -= 3;
  }
 
  /* 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, "????????.???");
 
  /* ask DOS for list of files, but only with allowed attribs */
  i = findfirst(dta, p->BUFFER, attrfilter_may);
  if (i != 0) {
    nls_outputnl_doserr(i);
    return(CMD_FAIL);
  }
 
  wcolcount = 0; /* may be used for columns counting with wide mode */
 
  do {
    /* if mandatory attribs are requested, filter them now */
    if ((attrfilter_must & dta->attr) != attrfilter_must) continue;
 
    /* if file contains attributes that are not allowed -> skip */
    if ((~attrfilter_may & dta->attr) != 0) continue;
 
    /* turn string lcase (/L) */
    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... */
 
    summary_fcount++;
    if ((dta->attr & DOS_ATTR_DIR) == 0) summary_totsz += dta->size;
 
    switch (format) {
      case DIR_OUTPUT_NORM:
        /* print fname-space-extension (unless it's "." or "..", then print as-is) */
        if (dta->fname[0] == '.') {
          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 (dta->attr & DOS_ATTR_DIR) {
          strcpy(buff2 + 10, "<DIR>");
        } 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, 0xff, nls);
        outputnl(buff2);
        break;
 
      case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */
        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("");
        } else {
          availrows++; /* wide mode is the only one that does not write one line per file */
        }
        break;
 
      case DIR_OUTPUT_BARE:
        outputnl(dta->fname);
        break;
    }
 
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
 
  } while (findnext(dta) == 0);
 
  if (wcolcount != 0) {
    outputnl(""); /* in wide mode make sure to end on a clear row */
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
  }
 
  /* print out summary (unless bare output mode) */
  if (format != DIR_OUTPUT_BARE) {
    unsigned short alignpos;
    /* x file(s) */
    memset(buff2, ' ', 13); /* 13 is the max len of a 32 bit number with thousand separators (4'000'000'000) */
    i = nls_format_number(buff2 + 13, summary_fcount, nls);
    alignpos = sprintf(buff2 + 13 + i, " %s ", "file(s)");
    output(buff2 + i);
    /* xxxx bytes */
    i = nls_format_number(buff2 + 13, summary_totsz, nls);
    output(buff2 + i);
    output(" ");
    outputnl("bytes");
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
    /* xxxx bytes free */
    i = cmd_dir_df(&summary_totsz, drv);
    if (i != 0) nls_outputnl_doserr(i);
    alignpos += 13 + 13;
    memset(buff2, ' ', alignpos); /* align the freebytes value to same column as totbytes */
    i = nls_format_number(buff2 + alignpos, summary_totsz, nls);
    output(buff2 + i);
    output(" ");
    outputnl("bytes free");
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
  }
 
  return(CMD_OK);
}
 

Rev 538	Rev 542
1	`/* This file is part of the SvarCOM project and is published under the terms`	1	`/* This file is part of the SvarCOM project and is published under the terms`
2	`* of the MIT license.`	2	`* of the MIT license.`
3	`*`	3	`*`
4	`* Copyright (C) 2021 Mateusz Viste`	4	`* Copyright (C) 2021 Mateusz Viste`
5	`*`	5	`*`
6	`* Permission is hereby granted, free of charge, to any person obtaining a`	6	`* Permission is hereby granted, free of charge, to any person obtaining a`
7	`* copy of this software and associated documentation files (the "Software"),`	7	`* copy of this software and associated documentation files (the "Software"),`
8	`* to deal in the Software without restriction, including without limitation`	8	`* to deal in the Software without restriction, including without limitation`
9	`* the rights to use, copy, modify, merge, publish, distribute, sublicense,`	9	`* the rights to use, copy, modify, merge, publish, distribute, sublicense,`
10	`* and/or sell copies of the Software, and to permit persons to whom the`	10	`* and/or sell copies of the Software, and to permit persons to whom the`
11	`* Software is furnished to do so, subject to the following conditions:`	11	`* Software is furnished to do so, subject to the following conditions:`
12	`*`	12	`*`
13	`* The above copyright notice and this permission notice shall be included in`	13	`* The above copyright notice and this permission notice shall be included in`
14	`* all copies or substantial portions of the Software.`	14	`* all copies or substantial portions of the Software.`
15	`*`	15	`*`
16	`* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR`	16	`* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR`
17	`* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,`	17	`* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,`
18	`* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE`	18	`* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE`
19	`* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER`	19	`* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER`
20	`* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING`	20	`* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING`
21	`* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER`	21	`* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER`
22	`* DEALINGS IN THE SOFTWARE.`	22	`* DEALINGS IN THE SOFTWARE.`
23	`*/`	23	`*/`
24		24
25	`/*`	25	`/*`
26	`* dir`	26	`* dir`
27	`*`	27	`*`
28	`* Displays a list of files and subdirectories in a directory.`	28	`* Displays a list of files and subdirectories in a directory.`
29	`*`	29	`*`
30	`* DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]`	30	`* DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]`
31	`*`	31	`*`
32	`* /P Pauses after each screenful of information.`	32	`* /P Pauses after each screenful of information.`
33	`* /W Uses wide list format.`	33	`* /W Uses wide list format.`
34	`*`	34	`*`
35	`* /A Displays file with specified attributes:`	35	`* /A Displays file with specified attributes:`
36	`* D Directories R Read-only files H Hidden files`	36	`* D Directories R Read-only files H Hidden files`
37	`* A Ready for archiving S System files - prefix meaning "not"`	37	`* A Ready for archiving S System files - prefix meaning "not"`
38	`*`	38	`*`
39	`* /O List files in sorted order:`	39	`* /O List files in sorted order:`
40	`* N by name S by size E by extension`	40	`* N by name S by size E by extension`
41	`* D by date G group dirs first - prefix to reverse order`	41	`* D by date G group dirs first - prefix to reverse order`
42	`*`	42	`*`
43	`* /S Displays files in specified directory and all subdirectories.`	43	`* /S Displays files in specified directory and all subdirectories.`
44	`* /B Uses bare format (no heading information or summary)`	44	`* /B Uses bare format (no heading information or summary)`
45	`* /L Uses lowercases`	45	`* /L Uses lowercases`
46	`*/`	46	`*/`
47		47
48	`/* NOTE: /A attributes are matched in an exclusive way, ie. only files with`	48	`/* NOTE: /A attributes are matched in an exclusive way, ie. only files with`
49	`* the specified attributes are matched. This is different from how DOS`	49	`* the specified attributes are matched. This is different from how DOS`
50	`* itself matches attributes hence DIR cannot rely on the attributes`	50	`* itself matches attributes hence DIR cannot rely on the attributes`
51	`* filter within FindFirst.`	51	`* filter within FindFirst.`
52	`*`	52	`*`
53	`* NOTE: Multiple /A are not supported - only the last one is significant.`	53	`* NOTE: Multiple /A are not supported - only the last one is significant.`
54	`*/`	54	`*/`
55		55
56	`#define WCOLWIDTH 15 /* width of a column in wide mode output */`	56	`#define WCOLWIDTH 15 /* width of a column in wide mode output */`
57		57
58		58
59	`/* fills freebytes with free bytes for drv (A=0, B=1, etc)`	59	`/* fills freebytes with free bytes for drv (A=0, B=1, etc)`
60	`* returns DOS ERR code on failure */`	60	`* returns DOS ERR code on failure */`
61	`static unsigned short cmd_dir_df(unsigned long *freebytes, unsigned char drv) {`	61	`static unsigned short cmd_dir_df(unsigned long *freebytes, unsigned char drv) {`
62	`unsigned short res = 0;`	62	`unsigned short res = 0;`
63	`unsigned short sects_per_clust = 0, avail_clusts = 0, bytes_per_sect = 0;`	63	`unsigned short sects_per_clust = 0, avail_clusts = 0, bytes_per_sect = 0;`
64		64
65	`_asm {`	65	`_asm {`
66	`push ax`	66	`push ax`
67	`push bx`	67	`push bx`
68	`push cx`	68	`push cx`
69	`push dx`	69	`push dx`
70		70
71	`mov ah, 0x36 /* DOS 2+ -- Get Disk Free Space */`	71	`mov ah, 0x36 /* DOS 2+ -- Get Disk Free Space */`
72	`mov dl, [drv] /* A=1, B=2, etc (0 = DEFAULT DRIVE) */`	72	`mov dl, [drv] /* A=1, B=2, etc (0 = DEFAULT DRIVE) */`
73	`inc dl`	73	`inc dl`
74	`int 0x21 /* AX=sects_per_clust, BX=avail_clusts, CX=bytes_per_sect, DX=tot_clusters */`	74	`int 0x21 /* AX=sects_per_clust, BX=avail_clusts, CX=bytes_per_sect, DX=tot_clusters */`
75	`cmp ax, 0xffff /* AX=0xffff on error (invalid drive) */`	75	`cmp ax, 0xffff /* AX=0xffff on error (invalid drive) */`
76	`jne COMPUTEDF`	76	`jne COMPUTEDF`
77	`mov [res], 0x0f /* fill res with DOS error code 15 ("invalid drive") */`	77	`mov [res], 0x0f /* fill res with DOS error code 15 ("invalid drive") */`
78	`jmp DONE`	78	`jmp DONE`
79		79
80	`COMPUTEDF:`	80	`COMPUTEDF:`
81	`/* freebytes = AX * BX * CX */`	81	`/* freebytes = AX * BX * CX */`
82	`mov [sects_per_clust], ax`	82	`mov [sects_per_clust], ax`
83	`mov [avail_clusts], bx`	83	`mov [avail_clusts], bx`
84	`mov [bytes_per_sect], cx`	84	`mov [bytes_per_sect], cx`
85		85
86	`DONE:`	86	`DONE:`
87	`pop dx`	87	`pop dx`
88	`pop cx`	88	`pop cx`
89	`pop bx`	89	`pop bx`
90	`pop ax`	90	`pop ax`
91	`}`	91	`}`
92		92
93	`/* multiple steps to avoid uint16 overflow */`	93	`/* multiple steps to avoid uint16 overflow */`
94	`*freebytes = sects_per_clust;`	94	`*freebytes = sects_per_clust;`
95	`freebytes = avail_clusts;`	95	`freebytes = avail_clusts;`
96	`freebytes = bytes_per_sect;`	96	`freebytes = bytes_per_sect;`
97		97
98	`return(res);`	98	`return(res);`
99	`}`	99	`}`
100		100
101		101
102	`static void dir_pagination(unsigned short *availrows) {`	102	`static void dir_pagination(unsigned short *availrows) {`
103	`*availrows -= 1;`	103	`*availrows -= 1;`
104	`if (*availrows == 0) {`	104	`if (*availrows == 0) {`
105	`press_any_key();`	105	`press_any_key();`
106	`*availrows = screen_getheight() - 1;`	106	`*availrows = screen_getheight() - 1;`
107	`}`	107	`}`
108	`}`	108	`}`
109		109
110		110
-		111	`/* parse an attr list like "Ar-hS" and fill bitfield into attrfilter_may and attrfilter_must.`
-		112	`* /AHS -> adds S and H to mandatory attribs ("must")`
-		113	`* /A-S -> removes S from allowed attribs ("may")`
-		114	`* returns non-zero on error. */`
-		115	`static int dir_parse_attr_list(const char arg, unsigned char attrfilter_may, unsigned char *attrfilter_must) {`
-		116	`for (; *arg != 0; arg++) {`
-		117	`unsigned char curattr;`
-		118	`char not;`
-		119	`if (*arg == '-') {`
-		120	`not = 1;`
-		121	`arg++;`
-		122	`} else {`
-		123	`not = 0;`
-		124	`}`
-		125	`switch (*arg) {`
-		126	`case 'd':`
-		127	`case 'D':`
-		128	`curattr = DOS_ATTR_DIR;`
-		129	`break;`
-		130	`case 'r':`
-		131	`case 'R':`
-		132	`curattr = DOS_ATTR_RO;`
-		133	`break;`
-		134	`case 'a':`
-		135	`case 'A':`
-		136	`curattr = DOS_ATTR_ARC;`
-		137	`break;`
-		138	`case 'h':`
-		139	`case 'H':`
-		140	`curattr = DOS_ATTR_HID;`
-		141	`break;`
-		142	`case 's':`
-		143	`case 'S':`
-		144	`curattr = DOS_ATTR_SYS;`
-		145	`break;`
-		146	`default:`
-		147	`return(-1);`
-		148	`}`
-		149	`/* update res bitfield */`
-		150	`if (not) {`
-		151	`*attrfilter_may &= ~curattr;`
-		152	`} else {`
-		153	`*attrfilter_must \|= curattr;`
-		154	`}`
-		155	`}`
-		156	`return(0);`
-		157	`}`
-		158
-		159
-		160	`#define DIR_ATTR_DEFAULT (DOS_ATTR_RO \| DOS_ATTR_DIR \| DOS_ATTR_ARC)`
-		161
111	`static enum cmd_result cmd_dir(struct cmd_funcparam *p) {`	162	`static enum cmd_result cmd_dir(struct cmd_funcparam *p) {`
112	`const char *filespecptr = NULL;`	163	`const char *filespecptr = NULL;`
113	`struct DTA dta = (void )0x80; /* set DTA to its default location at 80h in PSP */`	164	`struct DTA dta = (void )0x80; /* set DTA to its default location at 80h in PSP */`
114	`unsigned short i;`	165	`unsigned short i;`
115	`unsigned short availrows; /* counter of available rows on display (used for /P) */`	166	`unsigned short availrows; /* counter of available rows on display (used for /P) */`
116	`unsigned short wcols = screen_getwidth() / WCOLWIDTH; /* number of columns in wide mode */`	167	`unsigned short wcols = screen_getwidth() / WCOLWIDTH; /* number of columns in wide mode */`
117	`unsigned char wcolcount;`	168	`unsigned char wcolcount;`
118	`struct nls_patterns nls = (void )(p->BUFFER + (p->BUFFERSZ / 2));`	169	`struct nls_patterns nls = (void )(p->BUFFER + (p->BUFFERSZ / 2));`
119	`char buff2 = p->BUFFER + (p->BUFFERSZ / 2) + sizeof(nls);`	170	`char buff2 = p->BUFFER + (p->BUFFERSZ / 2) + sizeof(nls);`
120	`unsigned long summary_fcount = 0;`	171	`unsigned long summary_fcount = 0;`
121	`unsigned long summary_totsz = 0;`	172	`unsigned long summary_totsz = 0;`
122	`unsigned char drv = 0;`	173	`unsigned char drv = 0;`
-		174	`unsigned char attrfilter_may = DIR_ATTR_DEFAULT;`
-		175	`unsigned char attrfilter_must = 0;`
123		176
124	`#define DIR_FLAG_PAUSE 1`	177	`#define DIR_FLAG_PAUSE 1`
125	`#define DIR_FLAG_RECUR 4`	178	`#define DIR_FLAG_RECUR 4`
126	`#define DIR_FLAG_LCASE 8`	179	`#define DIR_FLAG_LCASE 8`
127	`unsigned char flags = 0;`	180	`unsigned char flags = 0;`
128		181
129	`#define DIR_OUTPUT_NORM 1`	182	`#define DIR_OUTPUT_NORM 1`
130	`#define DIR_OUTPUT_WIDE 2`	183	`#define DIR_OUTPUT_WIDE 2`
131	`#define DIR_OUTPUT_BARE 3`	184	`#define DIR_OUTPUT_BARE 3`
132	`unsigned char format = DIR_OUTPUT_NORM;`	185	`unsigned char format = DIR_OUTPUT_NORM;`
133		186
134	`if (cmd_ishlp(p)) {`	187	`if (cmd_ishlp(p)) {`
135	`outputnl("Displays a list of files and subdirectories in a directory");`	188	`outputnl("Displays a list of files and subdirectories in a directory");`
136	`outputnl("");`	189	`outputnl("");`
137	`outputnl("DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]");`	190	`outputnl("DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]");`
138	`outputnl("");`	191	`outputnl("");`
139	`outputnl("/P Pauses after each screenful of information");`	192	`outputnl("/P Pauses after each screenful of information");`
140	`outputnl("/W Uses wide list format");`	193	`outputnl("/W Uses wide list format");`
141	`outputnl("");`	194	`outputnl("");`
142	`outputnl("/A Displays files with specified attributes:");`	195	`outputnl("/A Displays files with specified attributes:");`
143	`outputnl(" D Directories R Read-only files H Hidden files");`	196	`outputnl(" D Directories R Read-only files H Hidden files");`
144	`outputnl(" A Ready for archiving S System files - prefix meaning \"not\"");`	197	`outputnl(" A Ready for archiving S System files - prefix meaning \"not\"");`
145	`outputnl("");`	198	`outputnl("");`
146	`outputnl("/O List files in sorted order:");`	199	`outputnl("/O List files in sorted order:");`
147	`outputnl(" N by name S by size E by extension");`	200	`outputnl(" N by name S by size E by extension");`
148	`outputnl(" D by date G group dirs first - prefix to reverse order");`	201	`outputnl(" D by date G group dirs first - prefix to reverse order");`
149	`outputnl("");`	202	`outputnl("");`
150	`outputnl("/S Displays files in specified directory and all subdirectories");`	203	`outputnl("/S Displays files in specified directory and all subdirectories");`
151	`outputnl("/B Uses bare format (no heading information or summary)");`	204	`outputnl("/B Uses bare format (no heading information or summary)");`
152	`outputnl("/L Uses lowercases");`	205	`outputnl("/L Uses lowercases");`
153	`return(CMD_OK);`	206	`return(CMD_OK);`
154	`}`	207	`}`
155		208
156	`i = nls_getpatterns(nls);`	209	`i = nls_getpatterns(nls);`
157	`if (i != 0) nls_outputnl_doserr(i);`	210	`if (i != 0) nls_outputnl_doserr(i);`
158		211
159	`/* parse command line */`	212	`/* parse command line */`
160	`for (i = 0; i < p->argc; i++) {`	213	`for (i = 0; i < p->argc; i++) {`
161	`if (p->argv[i][0] == '/') {`	214	`if (p->argv[i][0] == '/') {`
162	`char arg;`	215	`const char *arg = p->argv[i] + 1;`
163	`char neg = 0;`	216	`char neg = 0;`
164	`/* detect negations and get actual argument */`	217	`/* detect negations and get actual argument */`
165	`if (p->argv[i][1] == '-') neg = 1;`	218	`if (*arg == '-') {`
-		219	`neg = 1;`
166	`arg = p->argv[i][1 + neg];`	220	`arg++;`
-		221	`}`
167	`/* */`	222	`/* */`
168	`switch (arg) {`	223	`switch (*arg) {`
169	`case 'a':`	224	`case 'a':`
170	`case 'A':`	225	`case 'A':`
-		226	`arg++;`
-		227	`/* preset defaults */`
-		228	`attrfilter_may = DIR_ATTR_DEFAULT;`
-		229	`attrfilter_must = 0;`
-		230	`/* /-A only allowed without further parameters (used to cancel possible previous /Asmth) */`
-		231	`if (neg) {`
-		232	`if (*arg != 0) {`
-		233	`nls_outputnl_err(0, 2); /* invalid switch */`
-		234	`return(CMD_FAIL);`
-		235	`}`
171	`/* TODO */`	236	`} else {`
172	`outputnl("/A NOT IMPLEMENTED YET");`	237	`/* start with "allow everything" */`
-		238	`attrfilter_may = (DOS_ATTR_ARC \| DOS_ATTR_DIR \| DOS_ATTR_HID \| DOS_ATTR_SYS \| DOS_ATTR_RO);`
-		239	`if (dir_parse_attr_list(arg, &attrfilter_may, &attrfilter_must) != 0) {`
-		240	`nls_outputnl_err(0, 3); /* invalid parameter format */`
173	`return(CMD_FAIL);`	241	`return(CMD_FAIL);`
-		242	`}`
-		243	`}`
174	`break;`	244	`break;`
175	`case 'b':`	245	`case 'b':`
176	`case 'B':`	246	`case 'B':`
177	`format = DIR_OUTPUT_BARE;`	247	`format = DIR_OUTPUT_BARE;`
178	`break;`	248	`break;`
179	`case 'l':`	249	`case 'l':`
180	`case 'L':`	250	`case 'L':`
181	`flags \|= DIR_FLAG_LCASE;`	251	`flags \|= DIR_FLAG_LCASE;`
182	`break;`	252	`break;`
183	`case 'o':`	253	`case 'o':`
184	`case 'O':`	254	`case 'O':`
185	`/* TODO */`	255	`/* TODO */`
186	`outputnl("/O NOT IMPLEMENTED YET");`	256	`outputnl("/O NOT IMPLEMENTED YET");`
187	`return(CMD_FAIL);`	257	`return(CMD_FAIL);`
188	`break;`	258	`break;`
189	`case 'p':`	259	`case 'p':`
190	`case 'P':`	260	`case 'P':`
191	`flags \|= DIR_FLAG_PAUSE;`	261	`flags \|= DIR_FLAG_PAUSE;`
192	`if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);`	262	`if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);`
193	`break;`	263	`break;`
194	`case 's':`	264	`case 's':`
195	`case 'S':`	265	`case 'S':`
196	`/* TODO */`	266	`/* TODO */`
197	`outputnl("/S NOT IMPLEMENTED YET");`	267	`outputnl("/S NOT IMPLEMENTED YET");`
198	`return(CMD_FAIL);`	268	`return(CMD_FAIL);`
199	`break;`	269	`break;`
200	`case 'w':`	270	`case 'w':`
201	`case 'W':`	271	`case 'W':`
202	`format = DIR_OUTPUT_WIDE;`	272	`format = DIR_OUTPUT_WIDE;`
203	`break;`	273	`break;`
204	`default:`	274	`default:`
205	`outputnl("Invalid switch");`	275	`nls_outputnl_err(0, 2); /* invalid switch */`
206	`return(CMD_FAIL);`	276	`return(CMD_FAIL);`
207	`}`	277	`}`
208	`} else { /* filespec */`	278	`} else { /* filespec */`
209	`if (filespecptr != NULL) {`	279	`if (filespecptr != NULL) {`
210	`outputnl("Too many parameters");`	280	`nls_outputnl_err(0, 4); /* too many parameters */`
211	`return(CMD_FAIL);`	281	`return(CMD_FAIL);`
212	`}`	282	`}`
213	`filespecptr = p->argv[i];`	283	`filespecptr = p->argv[i];`
214	`}`	284	`}`
215	`}`	285	`}`
216		286
217	`if (filespecptr == NULL) filespecptr = ".";`	287	`if (filespecptr == NULL) filespecptr = ".";`
218		288
219	`availrows = screen_getheight() - 2;`	289	`availrows = screen_getheight() - 2;`
220		290
221	`/* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */`	291	`/* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */`
222	`if ((filespecptr[0] != 0) && (filespecptr[1] == ':') && (filespecptr[2] == 0)) {`	292	`if ((filespecptr[0] != 0) && (filespecptr[1] == ':') && (filespecptr[2] == 0)) {`
223	`if ((filespecptr[0] >= 'a') && (filespecptr[0] <= 'z')) {`	293	`if ((filespecptr[0] >= 'a') && (filespecptr[0] <= 'z')) {`
224	`p->BUFFER[0] = filespecptr[0] - ('a' - 1);`	294	`p->BUFFER[0] = filespecptr[0] - ('a' - 1);`
225	`} else {`	295	`} else {`
226	`p->BUFFER[0] = filespecptr[0] - ('A' - 1);`	296	`p->BUFFER[0] = filespecptr[0] - ('A' - 1);`
227	`}`	297	`}`
228	`i = curpathfordrv(p->BUFFER, p->BUFFER[0]);`	298	`i = curpathfordrv(p->BUFFER, p->BUFFER[0]);`
229	`} else {`	299	`} else {`
230	`i = file_truename(filespecptr, p->BUFFER);`	300	`i = file_truename(filespecptr, p->BUFFER);`
231	`}`	301	`}`
232	`if (i != 0) {`	302	`if (i != 0) {`
233	`nls_outputnl_doserr(i);`	303	`nls_outputnl_doserr(i);`
234	`return(CMD_FAIL);`	304	`return(CMD_FAIL);`
235	`}`	305	`}`
236		306
237	`if (format != DIR_OUTPUT_BARE) {`	307	`if (format != DIR_OUTPUT_BARE) {`
238	`drv = p->BUFFER[0];`	308	`drv = p->BUFFER[0];`
239	`if (drv >= 'a') {`	309	`if (drv >= 'a') {`
240	`drv -= 'a';`	310	`drv -= 'a';`
241	`} else {`	311	`} else {`
242	`drv -= 'A';`	312	`drv -= 'A';`
243	`}`	313	`}`
244	`cmd_vol_internal(drv, buff2);`	314	`cmd_vol_internal(drv, buff2);`
245	`sprintf(buff2, "Directory of %s", p->BUFFER);`	315	`sprintf(buff2, "Directory of %s", p->BUFFER);`
246	`/* trim at first '?', if any */`	316	`/* trim at first '?', if any */`
247	`for (i = 0; buff2[i] != 0; i++) if (buff2[i] == '?') buff2[i] = 0;`	317	`for (i = 0; buff2[i] != 0; i++) if (buff2[i] == '?') buff2[i] = 0;`
248	`outputnl(buff2);`	318	`outputnl(buff2);`
249	`outputnl("");`	319	`outputnl("");`
250	`availrows -= 3;`	320	`availrows -= 3;`
251	`}`	321	`}`
252		322
253	`/* if dir: append a backslash (also get its len) */`	323	`/* if dir: append a backslash (also get its len) */`
254	`i = path_appendbkslash_if_dir(p->BUFFER);`	324	`i = path_appendbkslash_if_dir(p->BUFFER);`
255		325
256	`/* if ends with a \ then append ????????.??? */`	326	`/* if ends with a \ then append ????????.??? */`
257	`if (p->BUFFER[i - 1] == '\\') strcat(p->BUFFER, "????????.???");`	327	`if (p->BUFFER[i - 1] == '\\') strcat(p->BUFFER, "????????.???");`
258		328
-		329	`/* ask DOS for list of files, but only with allowed attribs */`
259	`i = findfirst(dta, p->BUFFER, DOS_ATTR_RO \| DOS_ATTR_HID \| DOS_ATTR_SYS \| DOS_ATTR_DIR \| DOS_ATTR_ARC);`	330	`i = findfirst(dta, p->BUFFER, attrfilter_may);`
260	`if (i != 0) {`	331	`if (i != 0) {`
261	`nls_outputnl_doserr(i);`	332	`nls_outputnl_doserr(i);`
262	`return(CMD_FAIL);`	333	`return(CMD_FAIL);`
263	`}`	334	`}`
264		335
265	`wcolcount = 0; /* may be used for columns counting with wide mode */`	336	`wcolcount = 0; /* may be used for columns counting with wide mode */`
266		337
267	`do {`	338	`do {`
-		339	`/* if mandatory attribs are requested, filter them now */`
-		340	`if ((attrfilter_must & dta->attr) != attrfilter_must) continue;`
-		341
-		342	`/* if file contains attributes that are not allowed -> skip */`
-		343	`if ((~attrfilter_may & dta->attr) != 0) continue;`
-		344
-		345	`/* turn string lcase (/L) */`
268	`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... */`	346	`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... */`
269		347
270	`summary_fcount++;`	348	`summary_fcount++;`
271	`if ((dta->attr & DOS_ATTR_DIR) == 0) summary_totsz += dta->size;`	349	`if ((dta->attr & DOS_ATTR_DIR) == 0) summary_totsz += dta->size;`
272		350
273	`switch (format) {`	351	`switch (format) {`
274	`case DIR_OUTPUT_NORM:`	352	`case DIR_OUTPUT_NORM:`
275	`/* print fname-space-extension (unless it's "." or "..", then print as-is) */`	353	`/* print fname-space-extension (unless it's "." or "..", then print as-is) */`
276	`if (dta->fname[0] == '.') {`	354	`if (dta->fname[0] == '.') {`
277	`output(dta->fname);`	355	`output(dta->fname);`
278	`i = strlen(dta->fname);`	356	`i = strlen(dta->fname);`
279	`while (i++ < 12) output(" ");`	357	`while (i++ < 12) output(" ");`
280	`} else {`	358	`} else {`
281	`file_fname2fcb(buff2, dta->fname);`	359	`file_fname2fcb(buff2, dta->fname);`
282	`memmove(buff2 + 9, buff2 + 8, 4);`	360	`memmove(buff2 + 9, buff2 + 8, 4);`
283	`buff2[8] = ' ';`	361	`buff2[8] = ' ';`
284	`output(buff2);`	362	`output(buff2);`
285	`}`	363	`}`
286	`output(" ");`	364	`output(" ");`
287	`/* either <DIR> or right aligned 10-chars byte size */`	365	`/* either <DIR> or right aligned 10-chars byte size */`
288	`memset(buff2, ' ', 10);`	366	`memset(buff2, ' ', 10);`
289	`if (dta->attr & DOS_ATTR_DIR) {`	367	`if (dta->attr & DOS_ATTR_DIR) {`
290	`strcpy(buff2 + 10, "<DIR>");`	368	`strcpy(buff2 + 10, "<DIR>");`
291	`} else {`	369	`} else {`
292	`_ultoa(dta->size, buff2 + 10, 10); /* OpenWatcom extension */`	370	`_ultoa(dta->size, buff2 + 10, 10); /* OpenWatcom extension */`
293	`}`	371	`}`
294	`output(buff2 + strlen(buff2) - 10);`	372	`output(buff2 + strlen(buff2) - 10);`
295	`/* two spaces and NLS DATE */`	373	`/* two spaces and NLS DATE */`
296	`buff2[0] = ' ';`	374	`buff2[0] = ' ';`
297	`buff2[1] = ' ';`	375	`buff2[1] = ' ';`
298	`nls_format_date(buff2 + 2, dta->date_yr + 1980, dta->date_mo, dta->date_dy, nls);`	376	`nls_format_date(buff2 + 2, dta->date_yr + 1980, dta->date_mo, dta->date_dy, nls);`
299	`output(buff2);`	377	`output(buff2);`
300		378
301	`/* one space and NLS TIME */`	379	`/* one space and NLS TIME */`
302	`nls_format_time(buff2 + 1, dta->time_hour, dta->time_min, 0xff, nls);`	380	`nls_format_time(buff2 + 1, dta->time_hour, dta->time_min, 0xff, nls);`
303	`outputnl(buff2);`	381	`outputnl(buff2);`
304	`break;`	382	`break;`
305		383
306	`case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */`	384	`case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */`
307	`i = strlen(dta->fname);`	385	`i = strlen(dta->fname);`
308	`if (dta->attr & DOS_ATTR_DIR) {`	386	`if (dta->attr & DOS_ATTR_DIR) {`
309	`i += 2;`	387	`i += 2;`
310	`output("[");`	388	`output("[");`
311	`output(dta->fname);`	389	`output(dta->fname);`
312	`output("]");`	390	`output("]");`
313	`} else {`	391	`} else {`
314	`output(dta->fname);`	392	`output(dta->fname);`
315	`}`	393	`}`
316	`while (i++ < WCOLWIDTH) output(" ");`	394	`while (i++ < WCOLWIDTH) output(" ");`
317	`if (++wcolcount == wcols) {`	395	`if (++wcolcount == wcols) {`
318	`wcolcount = 0;`	396	`wcolcount = 0;`
319	`outputnl("");`	397	`outputnl("");`
320	`} else {`	398	`} else {`
321	`availrows++; /* wide mode is the only one that does not write one line per file */`	399	`availrows++; /* wide mode is the only one that does not write one line per file */`
322	`}`	400	`}`
323	`break;`	401	`break;`
324		402
325	`case DIR_OUTPUT_BARE:`	403	`case DIR_OUTPUT_BARE:`
326	`outputnl(dta->fname);`	404	`outputnl(dta->fname);`
327	`break;`	405	`break;`
328	`}`	406	`}`
329		407
330	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`	408	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`
331		409
332	`} while (findnext(dta) == 0);`	410	`} while (findnext(dta) == 0);`
333		411
334	`if (wcolcount != 0) {`	412	`if (wcolcount != 0) {`
335	`outputnl(""); /* in wide mode make sure to end on a clear row */`	413	`outputnl(""); /* in wide mode make sure to end on a clear row */`
336	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`	414	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`
337	`}`	415	`}`
338		416
339	`/* print out summary (unless bare output mode) */`	417	`/* print out summary (unless bare output mode) */`
340	`if (format != DIR_OUTPUT_BARE) {`	418	`if (format != DIR_OUTPUT_BARE) {`
341	`unsigned short alignpos;`	419	`unsigned short alignpos;`
342	`/* x file(s) */`	420	`/* x file(s) */`
343	`memset(buff2, ' ', 13); /* 13 is the max len of a 32 bit number with thousand separators (4'000'000'000) */`	421	`memset(buff2, ' ', 13); /* 13 is the max len of a 32 bit number with thousand separators (4'000'000'000) */`
344	`i = nls_format_number(buff2 + 13, summary_fcount, nls);`	422	`i = nls_format_number(buff2 + 13, summary_fcount, nls);`
345	`alignpos = sprintf(buff2 + 13 + i, " %s ", "file(s)");`	423	`alignpos = sprintf(buff2 + 13 + i, " %s ", "file(s)");`
346	`output(buff2 + i);`	424	`output(buff2 + i);`
347	`/* xxxx bytes */`	425	`/* xxxx bytes */`
348	`i = nls_format_number(buff2 + 13, summary_totsz, nls);`	426	`i = nls_format_number(buff2 + 13, summary_totsz, nls);`
349	`output(buff2 + i);`	427	`output(buff2 + i);`
350	`output(" ");`	428	`output(" ");`
351	`outputnl("bytes");`	429	`outputnl("bytes");`
352	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`	430	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`
353	`/* xxxx bytes free */`	431	`/* xxxx bytes free */`
354	`i = cmd_dir_df(&summary_totsz, drv);`	432	`i = cmd_dir_df(&summary_totsz, drv);`
355	`if (i != 0) nls_outputnl_doserr(i);`	433	`if (i != 0) nls_outputnl_doserr(i);`
356	`alignpos += 13 + 13;`	434	`alignpos += 13 + 13;`
357	`memset(buff2, ' ', alignpos); /* align the freebytes value to same column as totbytes */`	435	`memset(buff2, ' ', alignpos); /* align the freebytes value to same column as totbytes */`
358	`i = nls_format_number(buff2 + alignpos, summary_totsz, nls);`	436	`i = nls_format_number(buff2 + alignpos, summary_totsz, nls);`
359	`output(buff2 + i);`	437	`output(buff2 + i);`
360	`output(" ");`	438	`output(" ");`
361	`outputnl("bytes free");`	439	`outputnl("bytes free");`
362	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`	440	`if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);`
363	`}`	441	`}`
364		442
365	`return(CMD_OK);`	443	`return(CMD_OK);`
366	`}`	444	`}`
367		445

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd/dir.c – Rev 538 → 542