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.
 */
 
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 */
  int i;
  unsigned short availrows;  /* counter of available rows on display (used for /P) */
  #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
  unsigned char flags = 0;
//  unsigned char attribs_show = 0; /* show only files with ALL these attribs */
//  unsigned char attribs_hide = 0; /* hide files with ANY of these attribs */
 
  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);
  }
 
  /* 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;
          break;
        case 'p':
        case 'P':
          flags |= DIR_FLAG_PAUSE;
          if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);
          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 = ".";
 
  {
    unsigned short r = file_truename(filespecptr, p->BUFFER);
    if (r != 0) {
      outputnl(doserr(r));
      return(-1);
    }
  }
 
  if ((flags & DIR_FLAG_BARE) == 0) {
    unsigned char drv = p->BUFFER[0];
    if (drv >= 'a') {
      drv -= 'a';
    } else {
      drv -= 'A';
    }
    cmd_vol_internal(drv, p->BUFFER + 1024);
    sprintf(p->BUFFER + 1024, "Directory of %s", p->BUFFER);
    /* trim at first '?', if any */
    for (i = 0; p->BUFFER[i + 1024] != 0; i++) if (p->BUFFER[i + 1024] == '?') p->BUFFER[i + 1024] = 0;
    outputnl(p->BUFFER + 1024);
    outputnl("");
  }
 
  /* if dir then append \????????.??? */
  i = file_getattr(p->BUFFER);
  if ((i > 0) && (i & DOS_ATTR_DIR)) strcat(p->BUFFER, "\\????????.???");
 
  if (findfirst(dta, p->BUFFER, DOS_ATTR_RO | DOS_ATTR_HID | DOS_ATTR_SYS | DOS_ATTR_DIR | DOS_ATTR_ARC) != 0) return(-1);
 
  availrows = screen_getheight();
 
  outputnl(dta->fname);
  availrows--;
 
  while (findnext(dta) == 0) {
    outputnl(dta->fname);
    if (flags & DIR_FLAG_PAUSE) {
      availrows--;
      if (availrows < 2) {
        press_any_key();
        availrows = screen_getheight();
      }
    }
  }
 
  return(-1);
}
 

Rev 397	Rev 399
1	`/*`	1	`/*`
2	`* dir`	2	`* dir`
3	`*`	3	`*`
4	`* Displays a list of files and subdirectories in a directory.`	4	`* Displays a list of files and subdirectories in a directory.`
5	`*`	5	`*`
6	`* DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]`	6	`* DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]`
7	`*`	7	`*`
8	`* /P Pauses after each screenful of information.`	8	`* /P Pauses after each screenful of information.`
9	`* /W Uses wide list format.`	9	`* /W Uses wide list format.`
10	`*`	10	`*`
11	`* /A Displays file with specified attributes:`	11	`* /A Displays file with specified attributes:`
12	`* D Directories R Read-only files H Hidden files`	12	`* D Directories R Read-only files H Hidden files`
13	`* A Ready for archiving S System files - prefix meaning "not"`	13	`* A Ready for archiving S System files - prefix meaning "not"`
14	`*`	14	`*`
15	`* /O List files in sorted order:`	15	`* /O List files in sorted order:`
16	`* N by name S by size E by extension`	16	`* N by name S by size E by extension`
17	`* D by date G group dirs first - prefix to reverse order`	17	`* D by date G group dirs first - prefix to reverse order`
18	`*`	18	`*`
19	`* /S Displays files in specified directory and all subdirectories.`	19	`* /S Displays files in specified directory and all subdirectories.`
20	`* /B Uses bare format (no heading information or summary)`	20	`* /B Uses bare format (no heading information or summary)`
21	`* /L Uses lowercases`	21	`* /L Uses lowercases`
22	`*/`	22	`*/`
23		23
24	`/* NOTE: /A attributes are matched in an exclusive way, ie. only files with`	24	`/* NOTE: /A attributes are matched in an exclusive way, ie. only files with`
25	`* the specified attributes are matched. This is different from how DOS`	25	`* the specified attributes are matched. This is different from how DOS`
26	`* itself matches attributes hence DIR cannot rely on the attributes`	26	`* itself matches attributes hence DIR cannot rely on the attributes`
27	`* filter within FindFirst.`	27	`* filter within FindFirst.`
28	`*`	28	`*`
29	`* NOTE: Multiple /A are not supported - only the last one is significant.`	29	`* NOTE: Multiple /A are not supported - only the last one is significant.`
30	`*/`	30	`*/`
31		31
32	`static int cmd_dir(struct cmd_funcparam *p) {`	32	`static int cmd_dir(struct cmd_funcparam *p) {`
33	`const char *filespecptr = NULL;`	33	`const char *filespecptr = NULL;`
34	`struct DTA dta = (void )0x80; /* set DTA to its default location at 80h in PSP */`	34	`struct DTA dta = (void )0x80; /* set DTA to its default location at 80h in PSP */`
35	`int i;`	35	`int i;`
36	`unsigned short availrows; /* counter of available rows on display (used for /P) */`	36	`unsigned short availrows; /* counter of available rows on display (used for /P) */`
37	`#define DIR_FLAG_PAUSE 1`	37	`#define DIR_FLAG_PAUSE 1`
38	`#define DIR_FLAG_WIDE 2`	38	`#define DIR_FLAG_WIDE 2`
39	`#define DIR_FLAG_RECUR 4`	39	`#define DIR_FLAG_RECUR 4`
40	`#define DIR_FLAG_BARE 8`	40	`#define DIR_FLAG_BARE 8`
41	`#define DIR_FLAG_LCASE 16`	41	`#define DIR_FLAG_LCASE 16`
42	`unsigned char flags = 0;`	42	`unsigned char flags = 0;`
43	`// unsigned char attribs_show = 0; /* show only files with ALL these attribs */`	43	`// unsigned char attribs_show = 0; /* show only files with ALL these attribs */`
44	`// unsigned char attribs_hide = 0; /* hide files with ANY of these attribs */`	44	`// unsigned char attribs_hide = 0; /* hide files with ANY of these attribs */`
45		45
46	`if (cmd_ishlp(p)) {`	46	`if (cmd_ishlp(p)) {`
47	`outputnl("Displays a list of files and subdirectories in a directory");`	47	`outputnl("Displays a list of files and subdirectories in a directory");`
48	`outputnl("");`	48	`outputnl("");`
49	`outputnl("DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]");`	49	`outputnl("DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]");`
50	`outputnl("");`	50	`outputnl("");`
51	`outputnl("/P Pauses after each screenful of information");`	51	`outputnl("/P Pauses after each screenful of information");`
52	`outputnl("/W Uses wide list format");`	52	`outputnl("/W Uses wide list format");`
53	`outputnl("");`	53	`outputnl("");`
54	`outputnl("/A Displays files with specified attributes:");`	54	`outputnl("/A Displays files with specified attributes:");`
55	`outputnl(" D Directories R Read-only files H Hidden files");`	55	`outputnl(" D Directories R Read-only files H Hidden files");`
56	`outputnl(" A Ready for archiving S System files - prefix meaning \"not\"");`	56	`outputnl(" A Ready for archiving S System files - prefix meaning \"not\"");`
57	`outputnl("");`	57	`outputnl("");`
58	`outputnl("/O List files in sorted order:");`	58	`outputnl("/O List files in sorted order:");`
59	`outputnl(" N by name S by size E by extension");`	59	`outputnl(" N by name S by size E by extension");`
60	`outputnl(" D by date G group dirs first - prefix to reverse order");`	60	`outputnl(" D by date G group dirs first - prefix to reverse order");`
61	`outputnl("");`	61	`outputnl("");`
62	`outputnl("/S Displays files in specified directory and all subdirectories");`	62	`outputnl("/S Displays files in specified directory and all subdirectories");`
63	`outputnl("/B Uses bare format (no heading information or summary)");`	63	`outputnl("/B Uses bare format (no heading information or summary)");`
64	`outputnl("/L Uses lowercases");`	64	`outputnl("/L Uses lowercases");`
65		65
66	`/* TODO FIXME REMOVE THIS ONCE ALL IMPLEMENTED */`	66	`/* TODO FIXME REMOVE THIS ONCE ALL IMPLEMENTED */`
67	`outputnl("\r\n* THIS COMMAND IS NOT FULLY IMPLEMENTED YET *");`	67	`outputnl("\r\n* THIS COMMAND IS NOT FULLY IMPLEMENTED YET *");`
68		68
69	`return(-1);`	69	`return(-1);`
70	`}`	70	`}`
71		71
72	`/* parse command line */`	72	`/* parse command line */`
73	`for (i = 0; i < p->argc; i++) {`	73	`for (i = 0; i < p->argc; i++) {`
74	`if (p->argv[i][0] == '/') {`	74	`if (p->argv[i][0] == '/') {`
75	`char arg;`	75	`char arg;`
76	`char neg = 0;`	76	`char neg = 0;`
77	`/* detect negations and get actual argument */`	77	`/* detect negations and get actual argument */`
78	`if (p->argv[i][1] == '-') neg = 1;`	78	`if (p->argv[i][1] == '-') neg = 1;`
79	`arg = p->argv[i][1 + neg];`	79	`arg = p->argv[i][1 + neg];`
80	`/* */`	80	`/* */`
81	`switch (arg) {`	81	`switch (arg) {`
82	`case 'a':`	82	`case 'a':`
83	`case 'A':`	83	`case 'A':`
84	`/* TODO */`	84	`/* TODO */`
85	`outputnl("/A NOT IMPLEMENTED YET");`	85	`outputnl("/A NOT IMPLEMENTED YET");`
86	`return(-1);`	86	`return(-1);`
87	`break;`	87	`break;`
-		88	`case 'b':`
-		89	`case 'B':`
-		90	`flags \|= DIR_FLAG_BARE;`
-		91	`break;`
88	`case 'p':`	92	`case 'p':`
89	`case 'P':`	93	`case 'P':`
90	`flags \|= DIR_FLAG_PAUSE;`	94	`flags \|= DIR_FLAG_PAUSE;`
91	`if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);`	95	`if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);`
92	`break;`	96	`break;`
93	`default:`	97	`default:`
94	`outputnl("Invalid switch");`	98	`outputnl("Invalid switch");`
95	`return(-1);`	99	`return(-1);`
96	`}`	100	`}`
97	`} else { /* filespec */`	101	`} else { /* filespec */`
98	`if (filespecptr != NULL) {`	102	`if (filespecptr != NULL) {`
99	`outputnl("Too many parameters");`	103	`outputnl("Too many parameters");`
100	`return(-1);`	104	`return(-1);`
101	`}`	105	`}`
102	`filespecptr = p->argv[i];`	106	`filespecptr = p->argv[i];`
103	`}`	107	`}`
104	`}`	108	`}`
105		109
106	`if (filespecptr == NULL) filespecptr = ".";`	110	`if (filespecptr == NULL) filespecptr = ".";`
107		111
-		112	`{`
108	`file_truename(filespecptr, p->BUFFER);`	113	`unsigned short r = file_truename(filespecptr, p->BUFFER);`
-		114	`if (r != 0) {`
-		115	`outputnl(doserr(r));`
-		116	`return(-1);`
-		117	`}`
-		118	`}`
-		119
-		120	`if ((flags & DIR_FLAG_BARE) == 0) {`
-		121	`unsigned char drv = p->BUFFER[0];`
-		122	`if (drv >= 'a') {`
-		123	`drv -= 'a';`
-		124	`} else {`
-		125	`drv -= 'A';`
-		126	`}`
-		127	`cmd_vol_internal(drv, p->BUFFER + 1024);`
-		128	`sprintf(p->BUFFER + 1024, "Directory of %s", p->BUFFER);`
-		129	`/* trim at first '?', if any */`
-		130	`for (i = 0; p->BUFFER[i + 1024] != 0; i++) if (p->BUFFER[i + 1024] == '?') p->BUFFER[i + 1024] = 0;`
-		131	`outputnl(p->BUFFER + 1024);`
-		132	`outputnl("");`
-		133	`}`
109		134
110	`/* if dir then append \????????.??? */`	135	`/* if dir then append \????????.??? */`
111	`i = file_getattr(p->BUFFER);`	136	`i = file_getattr(p->BUFFER);`
112	`if ((i > 0) && (i & DOS_ATTR_DIR)) strcat(p->BUFFER, "\\????????.???");`	137	`if ((i > 0) && (i & DOS_ATTR_DIR)) strcat(p->BUFFER, "\\????????.???");`
113		138
114	`if (findfirst(dta, p->BUFFER, DOS_ATTR_RO \| DOS_ATTR_HID \| DOS_ATTR_SYS \| DOS_ATTR_DIR \| DOS_ATTR_ARC) != 0) return(-1);`	139	`if (findfirst(dta, p->BUFFER, DOS_ATTR_RO \| DOS_ATTR_HID \| DOS_ATTR_SYS \| DOS_ATTR_DIR \| DOS_ATTR_ARC) != 0) return(-1);`
115		140
116	`availrows = screen_getheight();`	141	`availrows = screen_getheight();`
117		142
118	`outputnl(dta->fname);`	143	`outputnl(dta->fname);`
119	`availrows--;`	144	`availrows--;`
120		145
121	`while (findnext(dta) == 0) {`	146	`while (findnext(dta) == 0) {`
122	`outputnl(dta->fname);`	147	`outputnl(dta->fname);`
123	`if (flags & DIR_FLAG_PAUSE) {`	148	`if (flags & DIR_FLAG_PAUSE) {`
124	`availrows--;`	149	`availrows--;`
125	`if (availrows < 2) {`	150	`if (availrows < 2) {`
126	`press_any_key();`	151	`press_any_key();`
127	`availrows = screen_getheight();`	152	`availrows = screen_getheight();`
128	`}`	153	`}`
129	`}`	154	`}`
130	`}`	155	`}`
131		156
132	`return(-1);`	157	`return(-1);`
133	`}`	158	`}`
134		159

Subversion Repositories SvarDOS

(root)/svarcom/trunk/cmd/dir.c – Rev 397 → 399