Subversion Repositories SvarDOS

Rev

Rev 1720 | Rev 1724 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1720 Rev 1721
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-2024 Mateusz Viste
4
 * Copyright (C) 2021-2024 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
/* a "tiny" DTA is a DTA that is stripped from bytes that are not needed for
59
/* a "tiny" DTA is a DTA that is stripped from bytes that are not needed for
60
 * DIR operations */
60
 * DIR operations */
61
_Packed struct TINYDTA {
61
_Packed struct TINYDTA {
62
/*  char reserved[21];
62
/*  char reserved[21];
63
  unsigned char attr; */
63
  unsigned char attr; */
64
  unsigned short time_sec2:5;
64
  unsigned short time_sec2:5;
65
  unsigned short time_min:6;
65
  unsigned short time_min:6;
66
  unsigned short time_hour:5;
66
  unsigned short time_hour:5;
67
  unsigned short date_dy:5;
67
  unsigned short date_dy:5;
68
  unsigned short date_mo:4;
68
  unsigned short date_mo:4;
69
  unsigned short date_yr:7;
69
  unsigned short date_yr:7;
70
  unsigned long size;
70
  unsigned long size;
71
/*  char fname[13]; */
71
/*  char fname[13]; */
72
  char fname[12];
72
  char fname[12];
73
};
73
};
74
 
74
 
75
 
75
 
76
/* fills freebytes with free bytes for drv (A=0, B=1, etc)
76
/* fills freebytes with free bytes for drv (A=0, B=1, etc)
77
 * returns DOS ERR code on failure */
77
 * returns DOS ERR code on failure */
78
static unsigned short cmd_dir_df(unsigned long *freebytes, unsigned char drv) {
78
static unsigned short cmd_dir_df(unsigned long *freebytes, unsigned char drv) {
79
  unsigned short res = 0;
79
  unsigned short res = 0;
80
  unsigned short sects_per_clust = 0, avail_clusts = 0, bytes_per_sect = 0;
80
  unsigned short sects_per_clust = 0, avail_clusts = 0, bytes_per_sect = 0;
81
 
81
 
82
  _asm {
82
  _asm {
83
    push ax
83
    push ax
84
    push bx
84
    push bx
85
    push cx
85
    push cx
86
    push dx
86
    push dx
87
 
87
 
88
    mov ah, 0x36  /* DOS 2+ -- Get Disk Free Space */
88
    mov ah, 0x36  /* DOS 2+ -- Get Disk Free Space */
89
    mov dl, [drv] /* A=1, B=2, etc (0 = DEFAULT DRIVE) */
89
    mov dl, [drv] /* A=1, B=2, etc (0 = DEFAULT DRIVE) */
90
    inc dl
90
    inc dl
91
    int 0x21      /* AX=sects_per_clust, BX=avail_clusts, CX=bytes_per_sect, DX=tot_clusters */
91
    int 0x21      /* AX=sects_per_clust, BX=avail_clusts, CX=bytes_per_sect, DX=tot_clusters */
92
    cmp ax, 0xffff /* AX=0xffff on error (invalid drive) */
92
    cmp ax, 0xffff /* AX=0xffff on error (invalid drive) */
93
    jne COMPUTEDF
93
    jne COMPUTEDF
94
    mov [res], 0x0f /* fill res with DOS error code 15 ("invalid drive") */
94
    mov [res], 0x0f /* fill res with DOS error code 15 ("invalid drive") */
95
    jmp DONE
95
    jmp DONE
96
 
96
 
97
    COMPUTEDF:
97
    COMPUTEDF:
98
    /* freebytes = AX * BX * CX */
98
    /* freebytes = AX * BX * CX */
99
    mov [sects_per_clust], ax
99
    mov [sects_per_clust], ax
100
    mov [avail_clusts], bx
100
    mov [avail_clusts], bx
101
    mov [bytes_per_sect], cx
101
    mov [bytes_per_sect], cx
102
 
102
 
103
    DONE:
103
    DONE:
104
    pop dx
104
    pop dx
105
    pop cx
105
    pop cx
106
    pop bx
106
    pop bx
107
    pop ax
107
    pop ax
108
  }
108
  }
109
 
109
 
110
  /* multiple steps to avoid uint16 overflow */
110
  /* multiple steps to avoid uint16 overflow */
111
  *freebytes = sects_per_clust;
111
  *freebytes = sects_per_clust;
112
  *freebytes *= avail_clusts;
112
  *freebytes *= avail_clusts;
113
  *freebytes *= bytes_per_sect;
113
  *freebytes *= bytes_per_sect;
114
 
114
 
115
  return(res);
115
  return(res);
116
}
116
}
117
 
117
 
118
 
118
 
119
static void dir_pagination(unsigned short *availrows) {
119
static void dir_pagination(unsigned short *availrows) {
120
  *availrows -= 1;
120
  *availrows -= 1;
121
  if (*availrows == 0) {
121
  if (*availrows == 0) {
122
    press_any_key();
122
    press_any_key();
123
    *availrows = screen_getheight() - 1;
123
    *availrows = screen_getheight() - 1;
124
  }
124
  }
125
}
125
}
126
 
126
 
127
 
127
 
128
/* parse an attr list like "Ar-hS" and fill bitfield into attrfilter_may and attrfilter_must.
128
/* parse an attr list like "Ar-hS" and fill bitfield into attrfilter_may and attrfilter_must.
129
 * /AHS   -> adds S and H to mandatory attribs ("must")
129
 * /AHS   -> adds S and H to mandatory attribs ("must")
130
 * /A-S   -> removes S from allowed attribs ("may")
130
 * /A-S   -> removes S from allowed attribs ("may")
131
 * returns non-zero on error. */
131
 * returns non-zero on error. */
132
static int dir_parse_attr_list(const char *arg, unsigned char *attrfilter_may, unsigned char *attrfilter_must) {
132
static int dir_parse_attr_list(const char *arg, unsigned char *attrfilter_may, unsigned char *attrfilter_must) {
133
  for (; *arg != 0; arg++) {
133
  for (; *arg != 0; arg++) {
134
    unsigned char curattr;
134
    unsigned char curattr;
135
    char not;
135
    char not;
136
    if (*arg == '-') {
136
    if (*arg == '-') {
137
      not = 1;
137
      not = 1;
138
      arg++;
138
      arg++;
139
    } else {
139
    } else {
140
      not = 0;
140
      not = 0;
141
    }
141
    }
142
    switch (*arg) {
142
    switch (*arg) {
143
      case 'd':
143
      case 'd':
144
      case 'D':
144
      case 'D':
145
        curattr = DOS_ATTR_DIR;
145
        curattr = DOS_ATTR_DIR;
146
        break;
146
        break;
147
      case 'r':
147
      case 'r':
148
      case 'R':
148
      case 'R':
149
        curattr = DOS_ATTR_RO;
149
        curattr = DOS_ATTR_RO;
150
        break;
150
        break;
151
      case 'a':
151
      case 'a':
152
      case 'A':
152
      case 'A':
153
        curattr = DOS_ATTR_ARC;
153
        curattr = DOS_ATTR_ARC;
154
        break;
154
        break;
155
      case 'h':
155
      case 'h':
156
      case 'H':
156
      case 'H':
157
        curattr = DOS_ATTR_HID;
157
        curattr = DOS_ATTR_HID;
158
        break;
158
        break;
159
      case 's':
159
      case 's':
160
      case 'S':
160
      case 'S':
161
        curattr = DOS_ATTR_SYS;
161
        curattr = DOS_ATTR_SYS;
162
        break;
162
        break;
163
      default:
163
      default:
164
        return(-1);
164
        return(-1);
165
    }
165
    }
166
    /* update res bitfield */
166
    /* update res bitfield */
167
    if (not) {
167
    if (not) {
168
      *attrfilter_may &= ~curattr;
168
      *attrfilter_may &= ~curattr;
169
    } else {
169
    } else {
170
      *attrfilter_must |= curattr;
170
      *attrfilter_must |= curattr;
171
    }
171
    }
172
  }
172
  }
173
  return(0);
173
  return(0);
174
}
174
}
175
 
175
 
176
 
176
 
177
/* compare attributes in a DTA node to mandatory and optional attributes. returns 1 on match, 0 otherwise */
177
/* compare attributes in a DTA node to mandatory and optional attributes. returns 1 on match, 0 otherwise */
178
static int filter_attribs(const struct DTA *dta, unsigned char attrfilter_must, unsigned char attrfilter_may) {
178
static int filter_attribs(const struct DTA *dta, unsigned char attrfilter_must, unsigned char attrfilter_may) {
179
  /* if mandatory attribs are requested, filter them now */
179
  /* if mandatory attribs are requested, filter them now */
180
  if ((attrfilter_must & dta->attr) != attrfilter_must) return(0);
180
  if ((attrfilter_must & dta->attr) != attrfilter_must) return(0);
181
 
181
 
182
  /* if file contains attributes that are not allowed -> skip */
182
  /* if file contains attributes that are not allowed -> skip */
183
  if ((~attrfilter_may & dta->attr) != 0) return(0);
183
  if ((~attrfilter_may & dta->attr) != 0) return(0);
184
 
184
 
185
  return(1);
185
  return(1);
186
}
186
}
187
 
187
 
188
 
188
 
189
static struct {
189
static struct {
190
  struct TINYDTA far *dtabuf_root;
190
  struct TINYDTA far *dtabuf_root;
191
  char order[8]; /* GNESD values (ucase = lower first ; lcase = higher first) */
191
  char order[8]; /* GNESD values (ucase = lower first ; lcase = higher first) */
192
} glob_sortcmp_dat;
192
} glob_sortcmp_dat;
193
 
193
 
194
 
194
 
195
/* translates an order string like "GNE-S" into values fed into the order[]
195
/* translates an order string like "GNE-S" into values fed into the order[]
196
 * table of glob_sortcmp_dat. returns 0 on success, non-zero otherwise. */
196
 * table of glob_sortcmp_dat. returns 0 on success, non-zero otherwise. */
197
static int process_order_directive(const char *ordstring) {
197
static int process_order_directive(const char *ordstring) {
198
  const char *gnesd = "gnesd"; /* must be lower case */
198
  const char *gnesd = "gnesd"; /* must be lower case */
199
  int ordi, orderi = 0, i;
199
  int ordi, orderi = 0, i;
200
 
200
 
201
  /* tabula rasa */
201
  /* tabula rasa */
202
  glob_sortcmp_dat.order[0] = 0;
202
  glob_sortcmp_dat.order[0] = 0;
203
 
203
 
-
 
204
  /* /O alone is a short hand for /OGN */
-
 
205
  if (*ordstring == 0) {
-
 
206
    glob_sortcmp_dat.order[0] = 'G';
-
 
207
    glob_sortcmp_dat.order[1] = 'N';
-
 
208
    glob_sortcmp_dat.order[2] = 0;
-
 
209
  }
-
 
210
 
204
  /* parsing */
211
  /* parsing */
205
  for (ordi = 0; ordstring[ordi] != 0; ordi++) {
212
  for (ordi = 0; ordstring[ordi] != 0; ordi++) {
206
    if (ordstring[ordi] == '-') {
213
    if (ordstring[ordi] == '-') {
207
      if ((ordstring[ordi + 1] == '-') || (ordstring[ordi + 1] == 0)) return(-1);
214
      if ((ordstring[ordi + 1] == '-') || (ordstring[ordi + 1] == 0)) return(-1);
208
      continue;
215
      continue;
209
    }
216
    }
210
    if (orderi == sizeof(glob_sortcmp_dat.order)) return(-1);
217
    if (orderi == sizeof(glob_sortcmp_dat.order)) return(-1);
211
 
218
 
212
    for (i = 0; gnesd[i] != 0; i++) {
219
    for (i = 0; gnesd[i] != 0; i++) {
213
      if ((ordstring[ordi] | 32) == gnesd[i]) { /* | 32 is lcase-ing the char */
220
      if ((ordstring[ordi] | 32) == gnesd[i]) { /* | 32 is lcase-ing the char */
214
        if ((ordi > 0) && (ordstring[ordi - 1] == '-')) {
221
        if ((ordi > 0) && (ordstring[ordi - 1] == '-')) {
215
          glob_sortcmp_dat.order[orderi] = gnesd[i];
222
          glob_sortcmp_dat.order[orderi] = gnesd[i];
216
        } else {
223
        } else {
217
          glob_sortcmp_dat.order[orderi] = gnesd[i] ^ 32;
224
          glob_sortcmp_dat.order[orderi] = gnesd[i] ^ 32;
218
        }
225
        }
219
        orderi++;
226
        orderi++;
220
        break;
227
        break;
221
      }
228
      }
222
    }
229
    }
223
    if (gnesd[i] == 0) return(-1);
230
    if (gnesd[i] == 0) return(-1);
224
  }
231
  }
225
 
232
 
226
  return(0);
233
  return(0);
227
}
234
}
228
 
235
 
229
 
236
 
230
static int sortcmp(const void *dtaid1, const void *dtaid2) {
237
static int sortcmp(const void *dtaid1, const void *dtaid2) {
231
  struct TINYDTA far *dta1 = &(glob_sortcmp_dat.dtabuf_root[*((unsigned short *)dtaid1)]);
238
  struct TINYDTA far *dta1 = &(glob_sortcmp_dat.dtabuf_root[*((unsigned short *)dtaid1)]);
232
  struct TINYDTA far *dta2 = &(glob_sortcmp_dat.dtabuf_root[*((unsigned short *)dtaid2)]);
239
  struct TINYDTA far *dta2 = &(glob_sortcmp_dat.dtabuf_root[*((unsigned short *)dtaid2)]);
233
  char *ordconf = glob_sortcmp_dat.order;
240
  char *ordconf = glob_sortcmp_dat.order;
234
 
241
 
235
  /* debug stuff
242
  /* debug stuff
236
  {
243
  {
237
    int i;
244
    int i;
238
    printf("%lu vs %lu | ", dta1->size, dta2->size);
245
    printf("%lu vs %lu | ", dta1->size, dta2->size);
239
    for (i = 0; dta1->fname[i] != 0; i++) printf("%c", dta1->fname[i]);
246
    for (i = 0; dta1->fname[i] != 0; i++) printf("%c", dta1->fname[i]);
240
    printf(" vs ");
247
    printf(" vs ");
241
    for (i = 0; dta2->fname[i] != 0; i++) printf("%c", dta2->fname[i]);
248
    for (i = 0; dta2->fname[i] != 0; i++) printf("%c", dta2->fname[i]);
242
    printf("\n");
249
    printf("\n");
243
  } */
250
  } */
244
 
251
 
245
  for (;;) {
252
  for (;;) {
246
    int r = -1;
253
    int r = -1;
247
    if (*ordconf & 32) r = 1;
254
    if (*ordconf & 32) r = 1;
248
 
255
 
249
    switch (*ordconf | 32) {
256
    switch (*ordconf | 32) {
250
      case 'g': /* sort by type (directories first, then files) */
257
      case 'g': /* sort by type (directories first, then files) */
251
        if ((dta1->time_sec2 & DOS_ATTR_DIR) > (dta2->time_sec2 & DOS_ATTR_DIR)) return(0 - r);
258
        if ((dta1->time_sec2 & DOS_ATTR_DIR) > (dta2->time_sec2 & DOS_ATTR_DIR)) return(0 - r);
252
        if ((dta1->time_sec2 & DOS_ATTR_DIR) < (dta2->time_sec2 & DOS_ATTR_DIR)) return(r);
259
        if ((dta1->time_sec2 & DOS_ATTR_DIR) < (dta2->time_sec2 & DOS_ATTR_DIR)) return(r);
253
        break;
260
        break;
254
      case ' ': /* default (last resort) sort: by name */
261
      case ' ': /* default (last resort) sort: by name */
255
      case 'e': /* sort by extension */
262
      case 'e': /* sort by extension */
256
      case 'n': /* sort by filename */
263
      case 'n': /* sort by filename */
257
      {
264
      {
258
        const char far *f1 = dta1->fname;
265
        const char far *f1 = dta1->fname;
259
        const char far *f2 = dta2->fname;
266
        const char far *f2 = dta2->fname;
260
        int i, limit = 12;
267
        int i, limit = 12;
261
        /* special handling for '.' and '..' entries */
268
        /* special handling for '.' and '..' entries */
262
        if ((f1[0] == '.') && (f2[0] != '.')) return(0 - r);
269
        if ((f1[0] == '.') && (f2[0] != '.')) return(0 - r);
263
        if ((f2[0] == '.') && (f1[0] != '.')) return(r);
270
        if ((f2[0] == '.') && (f1[0] != '.')) return(r);
264
 
271
 
265
        if ((*ordconf | 32) == 'e') {
272
        if ((*ordconf | 32) == 'e') {
266
          /* fast-forward to extension or end of filename */
273
          /* fast-forward to extension or end of filename */
267
          while ((*f1 != 0) && (*f1 != '.')) f1++;
274
          while ((*f1 != 0) && (*f1 != '.')) f1++;
268
          while ((*f2 != 0) && (*f2 != '.')) f2++;
275
          while ((*f2 != 0) && (*f2 != '.')) f2++;
269
          limit = 4; /* TINYDTA structs are not nul-terminated */
276
          limit = 4; /* TINYDTA structs are not nul-terminated */
270
        }
277
        }
271
        /* cmp */
278
        /* cmp */
272
        for (i = 0; i < limit; i++) {
279
        for (i = 0; i < limit; i++) {
273
          if ((*f1 | 32) < (*f2 | 32)) return(0 - r);
280
          if ((*f1 | 32) < (*f2 | 32)) return(0 - r);
274
          if ((*f1 | 32) > (*f2 | 32)) return(r);
281
          if ((*f1 | 32) > (*f2 | 32)) return(r);
275
          if (*f1 == 0) break;
282
          if (*f1 == 0) break;
276
          f1++;
283
          f1++;
277
          f2++;
284
          f2++;
278
        }
285
        }
279
      }
286
      }
280
        break;
287
        break;
281
      case 's': /* sort by size */
288
      case 's': /* sort by size */
282
        if (dta1->size > dta2->size) return(r);
289
        if (dta1->size > dta2->size) return(r);
283
        if (dta1->size < dta2->size) return(0 - r);
290
        if (dta1->size < dta2->size) return(0 - r);
284
        break;
291
        break;
285
      case 'd': /* sort by date */
292
      case 'd': /* sort by date */
286
        if (dta1->date_yr < dta2->date_yr) return(0 - r);
293
        if (dta1->date_yr < dta2->date_yr) return(0 - r);
287
        if (dta1->date_yr > dta2->date_yr) return(r);
294
        if (dta1->date_yr > dta2->date_yr) return(r);
288
        if (dta1->date_mo < dta2->date_mo) return(0 - r);
295
        if (dta1->date_mo < dta2->date_mo) return(0 - r);
289
        if (dta1->date_mo > dta2->date_mo) return(r);
296
        if (dta1->date_mo > dta2->date_mo) return(r);
290
        if (dta1->date_dy < dta2->date_dy) return(0 - r);
297
        if (dta1->date_dy < dta2->date_dy) return(0 - r);
291
        if (dta1->date_dy > dta2->date_dy) return(r);
298
        if (dta1->date_dy > dta2->date_dy) return(r);
292
        if (dta1->time_hour < dta2->time_hour) return(0 - r);
299
        if (dta1->time_hour < dta2->time_hour) return(0 - r);
293
        if (dta1->time_hour > dta2->time_hour) return(r);
300
        if (dta1->time_hour > dta2->time_hour) return(r);
294
        if (dta1->time_min < dta2->time_min) return(0 - r);
301
        if (dta1->time_min < dta2->time_min) return(0 - r);
295
        if (dta1->time_min > dta2->time_min) return(r);
302
        if (dta1->time_min > dta2->time_min) return(r);
296
        break;
303
        break;
297
    }
304
    }
298
 
305
 
299
    if (*ordconf == 0) break;
306
    if (*ordconf == 0) break;
300
    ordconf++;
307
    ordconf++;
301
  }
308
  }
302
 
309
 
303
  return(0);
310
  return(0);
304
}
311
}
305
 
312
 
306
 
313
 
307
#define DIR_ATTR_DEFAULT (DOS_ATTR_RO | DOS_ATTR_DIR | DOS_ATTR_ARC)
314
#define DIR_ATTR_DEFAULT (DOS_ATTR_RO | DOS_ATTR_DIR | DOS_ATTR_ARC)
308
 
315
 
309
static enum cmd_result cmd_dir(struct cmd_funcparam *p) {
316
static enum cmd_result cmd_dir(struct cmd_funcparam *p) {
310
  const char *filespecptr = NULL;
317
  const char *filespecptr = NULL;
311
  struct DTA *dta = (void *)0x80; /* set DTA to its default location at 80h in PSP */
318
  struct DTA *dta = (void *)0x80; /* set DTA to its default location at 80h in PSP */
312
  struct TINYDTA far *dtabuf = NULL; /* used to buffer results when sorting is enabled */
319
  struct TINYDTA far *dtabuf = NULL; /* used to buffer results when sorting is enabled */
313
  unsigned short dtabufcount = 0;
320
  unsigned short dtabufcount = 0;
314
  unsigned short i;
321
  unsigned short i;
315
  unsigned short availrows;  /* counter of available rows on display (used for /P) */
322
  unsigned short availrows;  /* counter of available rows on display (used for /P) */
316
  unsigned short screenw = screen_getwidth();
323
  unsigned short screenw = screen_getwidth();
317
  unsigned short wcols = screenw / WCOLWIDTH; /* number of columns in wide mode */
324
  unsigned short wcols = screenw / WCOLWIDTH; /* number of columns in wide mode */
318
  unsigned char wcolcount;
325
  unsigned char wcolcount;
319
  struct {
326
  struct {
320
    struct nls_patterns nls;
327
    struct nls_patterns nls;
321
    char buff64[64];
328
    char buff64[64];
322
    char path[128];
329
    char path[128];
323
    unsigned short orderidx[65535 / sizeof(struct TINYDTA)];
330
    unsigned short orderidx[65535 / sizeof(struct TINYDTA)];
324
  } *buf = (void *)(p->BUFFER);
331
  } *buf = (void *)(p->BUFFER);
325
  unsigned long summary_fcount = 0;
332
  unsigned long summary_fcount = 0;
326
  unsigned long summary_totsz = 0;
333
  unsigned long summary_totsz = 0;
327
  unsigned char drv = 0;
334
  unsigned char drv = 0;
328
  unsigned char attrfilter_may = DIR_ATTR_DEFAULT;
335
  unsigned char attrfilter_may = DIR_ATTR_DEFAULT;
329
  unsigned char attrfilter_must = 0;
336
  unsigned char attrfilter_must = 0;
330
 
337
 
331
  #define DIR_FLAG_PAUSE  1
338
  #define DIR_FLAG_PAUSE  1
332
  #define DIR_FLAG_RECUR  4
339
  #define DIR_FLAG_RECUR  4
333
  #define DIR_FLAG_LCASE  8
340
  #define DIR_FLAG_LCASE  8
334
  #define DIR_FLAG_SORT  16
341
  #define DIR_FLAG_SORT  16
335
  unsigned char flags = 0;
342
  unsigned char flags = 0;
336
 
343
 
337
  #define DIR_OUTPUT_NORM 1
344
  #define DIR_OUTPUT_NORM 1
338
  #define DIR_OUTPUT_WIDE 2
345
  #define DIR_OUTPUT_WIDE 2
339
  #define DIR_OUTPUT_BARE 3
346
  #define DIR_OUTPUT_BARE 3
340
  unsigned char format = DIR_OUTPUT_NORM;
347
  unsigned char format = DIR_OUTPUT_NORM;
341
 
348
 
342
  /* make sure there's no risk of buffer overflow */
349
  /* make sure there's no risk of buffer overflow */
343
  if (sizeof(buf) > p->BUFFERSZ) {
350
  if (sizeof(buf) > p->BUFFERSZ) {
344
    outputnl("INTERNAL MEM ERROR IN " __FILE__);
351
    outputnl("INTERNAL MEM ERROR IN " __FILE__);
345
    return(CMD_FAIL);
352
    return(CMD_FAIL);
346
  }
353
  }
347
 
354
 
348
  bzero(&glob_sortcmp_dat, sizeof(glob_sortcmp_dat));
355
  bzero(&glob_sortcmp_dat, sizeof(glob_sortcmp_dat));
349
 
356
 
350
  if (cmd_ishlp(p)) {
357
  if (cmd_ishlp(p)) {
351
    nls_outputnl(37,0); /* "Displays a list of files and subdirectories in a directory" */
358
    nls_outputnl(37,0); /* "Displays a list of files and subdirectories in a directory" */
352
    outputnl("");
359
    outputnl("");
353
    nls_outputnl(37,1); /* "DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]" */
360
    nls_outputnl(37,1); /* "DIR [drive:][path][filename] [/P] [/W] [/A[:]attributes] [/O[[:]sortorder]] [/S] [/B] [/L]" */
354
    outputnl("");
361
    outputnl("");
355
    nls_outputnl(37,2); /* "/P Pauses after each screenful of information" */
362
    nls_outputnl(37,2); /* "/P Pauses after each screenful of information" */
356
    nls_outputnl(37,3); /* "/W Uses wide list format" */
363
    nls_outputnl(37,3); /* "/W Uses wide list format" */
357
    outputnl("");
364
    outputnl("");
358
    nls_outputnl(37,4); /* "/A Displays files with specified attributes:" */
365
    nls_outputnl(37,4); /* "/A Displays files with specified attributes:" */
359
    nls_outputnl(37,5); /* "    D Directories            R Read-only files        H Hidden files" */
366
    nls_outputnl(37,5); /* "    D Directories            R Read-only files        H Hidden files" */
360
    nls_outputnl(37,6); /* "    A Ready for archiving    S System files           - prefix meaning "not"" */
367
    nls_outputnl(37,6); /* "    A Ready for archiving    S System files           - prefix meaning "not"" */
361
    outputnl("");
368
    outputnl("");
362
    nls_outputnl(37,7); /* "/O List files in sorted order:" */
369
    nls_outputnl(37,7); /* "/O List files in sorted order:" */
363
    nls_outputnl(37,8); /* "    N by name                S by size                E by extension" */
370
    nls_outputnl(37,8); /* "    N by name                S by size                E by extension" */
364
    nls_outputnl(37,9); /* "    D by date                G group dirs first       - prefix to reverse order" */
371
    nls_outputnl(37,9); /* "    D by date                G group dirs first       - prefix to reverse order" */
365
    outputnl("");
372
    outputnl("");
366
    nls_outputnl(37,10); /* "/S Displays files in specified directory and all subdirectories" */
373
    nls_outputnl(37,10); /* "/S Displays files in specified directory and all subdirectories" */
367
    nls_outputnl(37,11); /* "/B Uses bare format (no heading information or summary)" */
374
    nls_outputnl(37,11); /* "/B Uses bare format (no heading information or summary)" */
368
    nls_outputnl(37,12); /* "/L Uses lowercases" */
375
    nls_outputnl(37,12); /* "/L Uses lowercases" */
369
    return(CMD_OK);
376
    return(CMD_OK);
370
  }
377
  }
371
 
378
 
372
  i = nls_getpatterns(&(buf->nls));
379
  i = nls_getpatterns(&(buf->nls));
373
  if (i != 0) nls_outputnl_doserr(i);
380
  if (i != 0) nls_outputnl_doserr(i);
374
 
381
 
375
  /* disable usage of thousands separator on narrow screens */
382
  /* disable usage of thousands separator on narrow screens */
376
  if (screenw < 80) buf->nls.thousep[0] = 0;
383
  if (screenw < 80) buf->nls.thousep[0] = 0;
377
 
384
 
378
  /* parse command line */
385
  /* parse command line */
379
  for (i = 0; i < p->argc; i++) {
386
  for (i = 0; i < p->argc; i++) {
380
    if (p->argv[i][0] == '/') {
387
    if (p->argv[i][0] == '/') {
381
      const char *arg = p->argv[i] + 1;
388
      const char *arg = p->argv[i] + 1;
382
      char neg = 0;
389
      char neg = 0;
383
      /* detect negations and get actual argument */
390
      /* detect negations and get actual argument */
384
      if (*arg == '-') {
391
      if (*arg == '-') {
385
        neg = 1;
392
        neg = 1;
386
        arg++;
393
        arg++;
387
      }
394
      }
388
      /* */
395
      /* */
389
      switch (*arg) {
396
      switch (*arg) {
390
        case 'a':
397
        case 'a':
391
        case 'A':
398
        case 'A':
392
          arg++;
399
          arg++;
393
          /* preset defaults */
400
          /* preset defaults */
394
          attrfilter_may = DIR_ATTR_DEFAULT;
401
          attrfilter_may = DIR_ATTR_DEFAULT;
395
          attrfilter_must = 0;
402
          attrfilter_must = 0;
396
          /* /-A only allowed without further parameters (used to cancel possible previous /Asmth) */
403
          /* /-A only allowed without further parameters (used to cancel possible previous /Asmth) */
397
          if (neg) {
404
          if (neg) {
398
            if (*arg != 0) {
405
            if (*arg != 0) {
399
              nls_outputnl_err(0, 2); /* invalid switch */
406
              nls_outputnl_err(0, 2); /* invalid switch */
400
              return(CMD_FAIL);
407
              return(CMD_FAIL);
401
            }
408
            }
402
          } else {
409
          } else {
403
            /* skip colon if present */
410
            /* skip colon if present */
404
            if (*arg == ':') arg++;
411
            if (*arg == ':') arg++;
405
            /* start with "allow everything" */
412
            /* start with "allow everything" */
406
            attrfilter_may = (DOS_ATTR_ARC | DOS_ATTR_DIR | DOS_ATTR_HID | DOS_ATTR_SYS | DOS_ATTR_RO);
413
            attrfilter_may = (DOS_ATTR_ARC | DOS_ATTR_DIR | DOS_ATTR_HID | DOS_ATTR_SYS | DOS_ATTR_RO);
407
            if (dir_parse_attr_list(arg, &attrfilter_may, &attrfilter_must) != 0) {
414
            if (dir_parse_attr_list(arg, &attrfilter_may, &attrfilter_must) != 0) {
408
              nls_outputnl_err(0, 3); /* invalid parameter format */
415
              nls_outputnl_err(0, 3); /* invalid parameter format */
409
              return(CMD_FAIL);
416
              return(CMD_FAIL);
410
            }
417
            }
411
          }
418
          }
412
          break;
419
          break;
413
        case 'b':
420
        case 'b':
414
        case 'B':
421
        case 'B':
415
          format = DIR_OUTPUT_BARE;
422
          format = DIR_OUTPUT_BARE;
416
          break;
423
          break;
417
        case 'l':
424
        case 'l':
418
        case 'L':
425
        case 'L':
419
          flags |= DIR_FLAG_LCASE;
426
          flags |= DIR_FLAG_LCASE;
420
          break;
427
          break;
421
        case 'o':
428
        case 'o':
422
        case 'O':
429
        case 'O':
423
          if (neg) {
430
          if (neg) {
424
            flags &= (0xff ^ DIR_FLAG_SORT);
431
            flags &= (0xff ^ DIR_FLAG_SORT);
425
            break;
432
            break;
426
          }
433
          }
427
          if (process_order_directive(arg+1) != 0) {
434
          if (process_order_directive(arg+1) != 0) {
428
            nls_output_err(0, 3); /* invalid parameter format */
435
            nls_output_err(0, 3); /* invalid parameter format */
429
            output(": ");
436
            output(": ");
430
            outputnl(arg);
437
            outputnl(arg);
431
            return(CMD_FAIL);
438
            return(CMD_FAIL);
432
          }
439
          }
433
          flags |= DIR_FLAG_SORT;
440
          flags |= DIR_FLAG_SORT;
434
          break;
441
          break;
435
        case 'p':
442
        case 'p':
436
        case 'P':
443
        case 'P':
437
          flags |= DIR_FLAG_PAUSE;
444
          flags |= DIR_FLAG_PAUSE;
438
          if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);
445
          if (neg) flags &= (0xff ^ DIR_FLAG_PAUSE);
439
          break;
446
          break;
440
        case 's':
447
        case 's':
441
        case 'S':
448
        case 'S':
442
          /* TODO */
449
          /* TODO */
443
          outputnl("/S NOT IMPLEMENTED YET");
450
          outputnl("/S NOT IMPLEMENTED YET");
444
          return(CMD_FAIL);
451
          return(CMD_FAIL);
445
          break;
452
          break;
446
        case 'w':
453
        case 'w':
447
        case 'W':
454
        case 'W':
448
          format = DIR_OUTPUT_WIDE;
455
          format = DIR_OUTPUT_WIDE;
449
          break;
456
          break;
450
        default:
457
        default:
451
          nls_outputnl_err(0, 2); /* invalid switch */
458
          nls_outputnl_err(0, 2); /* invalid switch */
452
          return(CMD_FAIL);
459
          return(CMD_FAIL);
453
      }
460
      }
454
    } else {  /* filespec */
461
    } else {  /* filespec */
455
      if (filespecptr != NULL) {
462
      if (filespecptr != NULL) {
456
        nls_outputnl_err(0, 4); /* too many parameters */
463
        nls_outputnl_err(0, 4); /* too many parameters */
457
        return(CMD_FAIL);
464
        return(CMD_FAIL);
458
      }
465
      }
459
      filespecptr = p->argv[i];
466
      filespecptr = p->argv[i];
460
    }
467
    }
461
  }
468
  }
462
 
469
 
463
  if (filespecptr == NULL) filespecptr = ".";
470
  if (filespecptr == NULL) filespecptr = ".";
464
 
471
 
465
  availrows = screen_getheight() - 2;
472
  availrows = screen_getheight() - 2;
466
 
473
 
467
  /* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */
474
  /* special case: "DIR drive:" (truename() fails on "C:" under MS-DOS 6.0) */
468
  if ((filespecptr[0] != 0) && (filespecptr[1] == ':') && (filespecptr[2] == 0)) {
475
  if ((filespecptr[0] != 0) && (filespecptr[1] == ':') && (filespecptr[2] == 0)) {
469
    if ((filespecptr[0] >= 'a') && (filespecptr[0] <= 'z')) {
476
    if ((filespecptr[0] >= 'a') && (filespecptr[0] <= 'z')) {
470
      buf->path[0] = filespecptr[0] - ('a' - 1);
477
      buf->path[0] = filespecptr[0] - ('a' - 1);
471
    } else {
478
    } else {
472
      buf->path[0] = filespecptr[0] - ('A' - 1);
479
      buf->path[0] = filespecptr[0] - ('A' - 1);
473
    }
480
    }
474
    i = curpathfordrv(buf->path, buf->path[0]);
481
    i = curpathfordrv(buf->path, buf->path[0]);
475
  } else {
482
  } else {
476
    i = file_truename(filespecptr, buf->path);
483
    i = file_truename(filespecptr, buf->path);
477
  }
484
  }
478
  if (i != 0) {
485
  if (i != 0) {
479
    nls_outputnl_doserr(i);
486
    nls_outputnl_doserr(i);
480
    return(CMD_FAIL);
487
    return(CMD_FAIL);
481
  }
488
  }
482
 
489
 
483
  if (format != DIR_OUTPUT_BARE) {
490
  if (format != DIR_OUTPUT_BARE) {
484
    drv = buf->path[0];
491
    drv = buf->path[0];
485
    if (drv >= 'a') {
492
    if (drv >= 'a') {
486
      drv -= 'a';
493
      drv -= 'a';
487
    } else {
494
    } else {
488
      drv -= 'A';
495
      drv -= 'A';
489
    }
496
    }
490
    cmd_vol_internal(drv, buf->buff64);
497
    cmd_vol_internal(drv, buf->buff64);
491
    sprintf(buf->buff64, svarlang_str(37,20)/*"Directory of %s"*/, buf->path);
498
    sprintf(buf->buff64, svarlang_str(37,20)/*"Directory of %s"*/, buf->path);
492
    /* trim at first '?', if any */
499
    /* trim at first '?', if any */
493
    for (i = 0; buf->buff64[i] != 0; i++) if (buf->buff64[i] == '?') buf->buff64[i] = 0;
500
    for (i = 0; buf->buff64[i] != 0; i++) if (buf->buff64[i] == '?') buf->buff64[i] = 0;
494
    outputnl(buf->buff64);
501
    outputnl(buf->buff64);
495
    outputnl("");
502
    outputnl("");
496
    availrows -= 3;
503
    availrows -= 3;
497
  }
504
  }
498
 
505
 
499
  /* if dir: append a backslash (also get its len) */
506
  /* if dir: append a backslash (also get its len) */
500
  i = path_appendbkslash_if_dir(buf->path);
507
  i = path_appendbkslash_if_dir(buf->path);
501
 
508
 
502
  /* if ends with a \ then append ????????.??? */
509
  /* if ends with a \ then append ????????.??? */
503
  if (buf->path[i - 1] == '\\') strcat(buf->path, "????????.???");
510
  if (buf->path[i - 1] == '\\') strcat(buf->path, "????????.???");
504
 
511
 
505
  /* ask DOS for list of files, but only with allowed attribs */
512
  /* ask DOS for list of files, but only with allowed attribs */
506
  i = findfirst(dta, buf->path, attrfilter_may);
513
  i = findfirst(dta, buf->path, attrfilter_may);
507
  if (i != 0) {
514
  if (i != 0) {
508
    nls_outputnl_doserr(i);
515
    nls_outputnl_doserr(i);
509
    return(CMD_FAIL);
516
    return(CMD_FAIL);
510
  }
517
  }
511
 
518
 
512
  /* if sorting is involved, then let's buffer all results (and sort them) */
519
  /* if sorting is involved, then let's buffer all results (and sort them) */
513
  if (flags & DIR_FLAG_SORT) {
520
  if (flags & DIR_FLAG_SORT) {
514
    /* allocate a memory buffer - try several sizes until one succeeds */
521
    /* allocate a memory buffer - try several sizes until one succeeds */
515
    const unsigned short memsz[] = {65500, 32000, 16000, 8000, 4000, 2000, 1000, 0};
522
    const unsigned short memsz[] = {65500, 32000, 16000, 8000, 4000, 2000, 1000, 0};
516
    unsigned short max_dta_bufcount = 0;
523
    unsigned short max_dta_bufcount = 0;
517
    for (i = 0; memsz[i] != 0; i++) {
524
    for (i = 0; memsz[i] != 0; i++) {
518
      dtabuf = _fmalloc(memsz[i]);
525
      dtabuf = _fmalloc(memsz[i]);
519
      if (dtabuf != NULL) break;
526
      if (dtabuf != NULL) break;
520
    }
527
    }
521
 
528
 
522
    if (dtabuf == NULL) {
529
    if (dtabuf == NULL) {
523
      nls_outputnl_doserr(8); /* out of memory */
530
      nls_outputnl_doserr(8); /* out of memory */
524
      return(CMD_FAIL);
531
      return(CMD_FAIL);
525
    }
532
    }
526
 
533
 
527
    /* remember the address so I can free it afterwards */
534
    /* remember the address so I can free it afterwards */
528
    glob_sortcmp_dat.dtabuf_root = dtabuf;
535
    glob_sortcmp_dat.dtabuf_root = dtabuf;
529
 
536
 
530
    /* compute the amount of DTAs I can buffer */
537
    /* compute the amount of DTAs I can buffer */
531
    max_dta_bufcount = memsz[i] / sizeof(struct TINYDTA);
538
    max_dta_bufcount = memsz[i] / sizeof(struct TINYDTA);
532
    /* printf("max_dta_bufcount = %u\n", max_dta_bufcount); */
539
    /* printf("max_dta_bufcount = %u\n", max_dta_bufcount); */
533
 
540
 
534
    do {
541
    do {
535
      /* filter out files with uninteresting attributes */
542
      /* filter out files with uninteresting attributes */
536
      if (filter_attribs(dta, attrfilter_must, attrfilter_may) == 0) continue;
543
      if (filter_attribs(dta, attrfilter_must, attrfilter_may) == 0) continue;
537
 
544
 
538
      /* normalize "size" of directories to zero because kernel returns garbage
545
      /* normalize "size" of directories to zero because kernel returns garbage
539
       * sizes for directories which might confuse the sorting routine later */
546
       * sizes for directories which might confuse the sorting routine later */
540
      if (dta->attr & DOS_ATTR_DIR) dta->size = 0;
547
      if (dta->attr & DOS_ATTR_DIR) dta->size = 0;
541
 
548
 
542
      _fmemcpy(&(dtabuf[dtabufcount]), ((char *)dta) + 22, sizeof(struct TINYDTA));
549
      _fmemcpy(&(dtabuf[dtabufcount]), ((char *)dta) + 22, sizeof(struct TINYDTA));
543
 
550
 
544
      /* save attribs in sec field, otherwise zero it (this field is not
551
      /* save attribs in sec field, otherwise zero it (this field is not
545
       * displayed and dropping the attr field saves 2 bytes per entry) */
552
       * displayed and dropping the attr field saves 2 bytes per entry) */
546
      dtabuf[dtabufcount++].time_sec2 = (dta->attr & 31);
553
      dtabuf[dtabufcount++].time_sec2 = (dta->attr & 31);
547
 
554
 
548
      /* do I have any space left? */
555
      /* do I have any space left? */
549
      if (dtabufcount == max_dta_bufcount) {
556
      if (dtabufcount == max_dta_bufcount) {
550
        //TODO some kind of user notification might be nice here
557
        //TODO some kind of user notification might be nice here
551
        //outputnl("TOO MANY ENTRIES FOR SORTING! LIST IS UNSORTED");
558
        //outputnl("TOO MANY ENTRIES FOR SORTING! LIST IS UNSORTED");
552
        break;
559
        break;
553
      }
560
      }
554
 
561
 
555
    } while (findnext(dta) == 0);
562
    } while (findnext(dta) == 0);
556
 
563
 
557
    /* sort the list - the tricky part is that my array is a far address while
564
    /* sort the list - the tricky part is that my array is a far address while
558
     * qsort works only with near pointers, so I have to use an ugly (and
565
     * qsort works only with near pointers, so I have to use an ugly (and
559
     * global) auxiliary table */
566
     * global) auxiliary table */
560
    for (i = 0; i < dtabufcount; i++) buf->orderidx[i] = i;
567
    for (i = 0; i < dtabufcount; i++) buf->orderidx[i] = i;
561
    qsort(buf->orderidx, dtabufcount, 2, &sortcmp);
568
    qsort(buf->orderidx, dtabufcount, 2, &sortcmp);
562
 
569
 
563
    /* preload first entry (last from orderidx, since entries are sorted in reverse) */
570
    /* preload first entry (last from orderidx, since entries are sorted in reverse) */
564
    dtabufcount--;
571
    dtabufcount--;
565
    _fmemcpy(((unsigned char *)dta) + 22, &(dtabuf[buf->orderidx[dtabufcount]]), sizeof(struct TINYDTA));
572
    _fmemcpy(((unsigned char *)dta) + 22, &(dtabuf[buf->orderidx[dtabufcount]]), sizeof(struct TINYDTA));
566
    dta->attr = dtabuf[buf->orderidx[dtabufcount]].time_sec2; /* restore attr from the abused time_sec2 field */
573
    dta->attr = dtabuf[buf->orderidx[dtabufcount]].time_sec2; /* restore attr from the abused time_sec2 field */
567
  }
574
  }
568
 
575
 
569
  wcolcount = 0; /* may be used for columns counting with wide mode */
576
  wcolcount = 0; /* may be used for columns counting with wide mode */
570
 
577
 
571
  for (;;) {
578
  for (;;) {
572
 
579
 
573
    /* filter out attributes (skip if entry comes from buffer, then it was already veted) */
580
    /* filter out attributes (skip if entry comes from buffer, then it was already veted) */
574
    if (filter_attribs(dta, attrfilter_must, attrfilter_may) == 0) continue;
581
    if (filter_attribs(dta, attrfilter_must, attrfilter_may) == 0) continue;
575
 
582
 
576
    /* turn string lcase (/L) */
583
    /* turn string lcase (/L) */
577
    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... */
584
    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... */
578
 
585
 
579
    summary_fcount++;
586
    summary_fcount++;
580
    if ((dta->attr & DOS_ATTR_DIR) == 0) summary_totsz += dta->size;
587
    if ((dta->attr & DOS_ATTR_DIR) == 0) summary_totsz += dta->size;
581
 
588
 
582
    switch (format) {
589
    switch (format) {
583
      case DIR_OUTPUT_NORM:
590
      case DIR_OUTPUT_NORM:
584
        /* print fname-space-extension (unless it's "." or "..", then print as-is) */
591
        /* print fname-space-extension (unless it's "." or "..", then print as-is) */
585
        if (dta->fname[0] == '.') {
592
        if (dta->fname[0] == '.') {
586
          output(dta->fname);
593
          output(dta->fname);
587
          i = strlen(dta->fname);
594
          i = strlen(dta->fname);
588
          while (i++ < 12) output(" ");
595
          while (i++ < 12) output(" ");
589
        } else {
596
        } else {
590
          file_fname2fcb(buf->buff64, dta->fname);
597
          file_fname2fcb(buf->buff64, dta->fname);
591
          memmove(buf->buff64 + 9, buf->buff64 + 8, 4);
598
          memmove(buf->buff64 + 9, buf->buff64 + 8, 4);
592
          buf->buff64[8] = ' ';
599
          buf->buff64[8] = ' ';
593
          output(buf->buff64);
600
          output(buf->buff64);
594
        }
601
        }
595
        output(" ");
602
        output(" ");
596
        /* either <DIR> or right aligned 10-chars byte size */
603
        /* either <DIR> or right aligned 10-chars byte size */
597
        memset(buf->buff64, ' ', 10);
604
        memset(buf->buff64, ' ', 10);
598
        if (dta->attr & DOS_ATTR_DIR) {
605
        if (dta->attr & DOS_ATTR_DIR) {
599
          strcpy(buf->buff64 + 10, svarlang_str(37,21));
606
          strcpy(buf->buff64 + 10, svarlang_str(37,21));
600
        } else {
607
        } else {
601
          nls_format_number(buf->buff64 + 10, dta->size, &(buf->nls));
608
          nls_format_number(buf->buff64 + 10, dta->size, &(buf->nls));
602
        }
609
        }
603
        output(buf->buff64 + strlen(buf->buff64) - 10);
610
        output(buf->buff64 + strlen(buf->buff64) - 10);
604
        /* two spaces and NLS DATE */
611
        /* two spaces and NLS DATE */
605
        buf->buff64[0] = ' ';
612
        buf->buff64[0] = ' ';
606
        buf->buff64[1] = ' ';
613
        buf->buff64[1] = ' ';
607
        if (screenw >= 80) {
614
        if (screenw >= 80) {
608
          nls_format_date(buf->buff64 + 2, dta->date_yr + 1980, dta->date_mo, dta->date_dy, &(buf->nls));
615
          nls_format_date(buf->buff64 + 2, dta->date_yr + 1980, dta->date_mo, dta->date_dy, &(buf->nls));
609
        } else {
616
        } else {
610
          nls_format_date(buf->buff64 + 2, (dta->date_yr + 80) % 100, dta->date_mo, dta->date_dy, &(buf->nls));
617
          nls_format_date(buf->buff64 + 2, (dta->date_yr + 80) % 100, dta->date_mo, dta->date_dy, &(buf->nls));
611
        }
618
        }
612
        output(buf->buff64);
619
        output(buf->buff64);
613
 
620
 
614
        /* one space and NLS TIME */
621
        /* one space and NLS TIME */
615
        nls_format_time(buf->buff64 + 1, dta->time_hour, dta->time_min, 0xff, &(buf->nls));
622
        nls_format_time(buf->buff64 + 1, dta->time_hour, dta->time_min, 0xff, &(buf->nls));
616
        outputnl(buf->buff64);
623
        outputnl(buf->buff64);
617
        break;
624
        break;
618
 
625
 
619
      case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */
626
      case DIR_OUTPUT_WIDE: /* display in columns of 12 chars per item */
620
        i = strlen(dta->fname);
627
        i = strlen(dta->fname);
621
        if (dta->attr & DOS_ATTR_DIR) {
628
        if (dta->attr & DOS_ATTR_DIR) {
622
          i += 2;
629
          i += 2;
623
          output("[");
630
          output("[");
624
          output(dta->fname);
631
          output(dta->fname);
625
          output("]");
632
          output("]");
626
        } else {
633
        } else {
627
          output(dta->fname);
634
          output(dta->fname);
628
        }
635
        }
629
        while (i++ < WCOLWIDTH) output(" ");
636
        while (i++ < WCOLWIDTH) output(" ");
630
        if (++wcolcount == wcols) {
637
        if (++wcolcount == wcols) {
631
          wcolcount = 0;
638
          wcolcount = 0;
632
          outputnl("");
639
          outputnl("");
633
        } else {
640
        } else {
634
          availrows++; /* wide mode is the only one that does not write one line per file */
641
          availrows++; /* wide mode is the only one that does not write one line per file */
635
        }
642
        }
636
        break;
643
        break;
637
 
644
 
638
      case DIR_OUTPUT_BARE:
645
      case DIR_OUTPUT_BARE:
639
        outputnl(dta->fname);
646
        outputnl(dta->fname);
640
        break;
647
        break;
641
    }
648
    }
642
 
649
 
643
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
650
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
644
 
651
 
645
    /* take next entry, either from buf or disk */
652
    /* take next entry, either from buf or disk */
646
    if (dtabufcount > 0) {
653
    if (dtabufcount > 0) {
647
      dtabufcount--;
654
      dtabufcount--;
648
      _fmemcpy(((unsigned char *)dta) + 22, &(dtabuf[buf->orderidx[dtabufcount]]), sizeof(struct TINYDTA));
655
      _fmemcpy(((unsigned char *)dta) + 22, &(dtabuf[buf->orderidx[dtabufcount]]), sizeof(struct TINYDTA));
649
      dta->attr = dtabuf[buf->orderidx[dtabufcount]].time_sec2; /* restore attr from the abused time_sec2 field */
656
      dta->attr = dtabuf[buf->orderidx[dtabufcount]].time_sec2; /* restore attr from the abused time_sec2 field */
650
    } else {
657
    } else {
651
      if (findnext(dta) != 0) break;
658
      if (findnext(dta) != 0) break;
652
    }
659
    }
653
 
660
 
654
  }
661
  }
655
 
662
 
656
  if (wcolcount != 0) {
663
  if (wcolcount != 0) {
657
    outputnl(""); /* in wide mode make sure to end on a clear row */
664
    outputnl(""); /* in wide mode make sure to end on a clear row */
658
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
665
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
659
  }
666
  }
660
 
667
 
661
  /* print out summary (unless bare output mode) */
668
  /* print out summary (unless bare output mode) */
662
  if (format != DIR_OUTPUT_BARE) {
669
  if (format != DIR_OUTPUT_BARE) {
663
    unsigned short alignpos;
670
    unsigned short alignpos;
664
    unsigned char uint32maxlen = 13; /* 13 is the max len of a 32 bit number with thousand separators (4'000'000'000) */
671
    unsigned char uint32maxlen = 13; /* 13 is the max len of a 32 bit number with thousand separators (4'000'000'000) */
665
    if (screenw < 80) uint32maxlen = 10;
672
    if (screenw < 80) uint32maxlen = 10;
666
    /* x file(s) */
673
    /* x file(s) */
667
    memset(buf->buff64, ' ', uint32maxlen);
674
    memset(buf->buff64, ' ', uint32maxlen);
668
    i = nls_format_number(buf->buff64 + uint32maxlen, summary_fcount, &(buf->nls));
675
    i = nls_format_number(buf->buff64 + uint32maxlen, summary_fcount, &(buf->nls));
669
    alignpos = sprintf(buf->buff64 + uint32maxlen + i, " %s ", svarlang_str(37,22)/*"file(s)"*/);
676
    alignpos = sprintf(buf->buff64 + uint32maxlen + i, " %s ", svarlang_str(37,22)/*"file(s)"*/);
670
    output(buf->buff64 + i);
677
    output(buf->buff64 + i);
671
    /* xxxx bytes */
678
    /* xxxx bytes */
672
    i = nls_format_number(buf->buff64 + uint32maxlen, summary_totsz, &(buf->nls));
679
    i = nls_format_number(buf->buff64 + uint32maxlen, summary_totsz, &(buf->nls));
673
    output(buf->buff64 + i + 1);
680
    output(buf->buff64 + i + 1);
674
    output(" ");
681
    output(" ");
675
    nls_outputnl(37,23); /* "bytes" */
682
    nls_outputnl(37,23); /* "bytes" */
676
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
683
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
677
    /* xxxx bytes free */
684
    /* xxxx bytes free */
678
    i = cmd_dir_df(&summary_totsz, drv);
685
    i = cmd_dir_df(&summary_totsz, drv);
679
    if (i != 0) nls_outputnl_doserr(i);
686
    if (i != 0) nls_outputnl_doserr(i);
680
    alignpos += uint32maxlen * 2;
687
    alignpos += uint32maxlen * 2;
681
    memset(buf->buff64, ' ', alignpos); /* align the freebytes value to same column as totbytes */
688
    memset(buf->buff64, ' ', alignpos); /* align the freebytes value to same column as totbytes */
682
    i = nls_format_number(buf->buff64 + alignpos, summary_totsz, &(buf->nls));
689
    i = nls_format_number(buf->buff64 + alignpos, summary_totsz, &(buf->nls));
683
    output(buf->buff64 + i + 1);
690
    output(buf->buff64 + i + 1);
684
    output(" ");
691
    output(" ");
685
    nls_outputnl(37,24); /* "bytes free" */
692
    nls_outputnl(37,24); /* "bytes free" */
686
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
693
    if (flags & DIR_FLAG_PAUSE) dir_pagination(&availrows);
687
  }
694
  }
688
 
695
 
689
  /* free the buffer memory (if used) */
696
  /* free the buffer memory (if used) */
690
  if (glob_sortcmp_dat.dtabuf_root != NULL) _ffree(glob_sortcmp_dat.dtabuf_root);
697
  if (glob_sortcmp_dat.dtabuf_root != NULL) _ffree(glob_sortcmp_dat.dtabuf_root);
691
 
698
 
692
  return(CMD_OK);
699
  return(CMD_OK);
693
}
700
}
694
 
701