ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd.exe: Add DIR /X support.

This commit is contained in:
Jason Edmeades 2007-03-13 01:09:05 +00:00 committed by Alexandre Julliard
parent 577b8ef233
commit ae964c68eb
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
programs/cmd/directory.c
View File

@ -47,6 +47,7 @@ typedef enum _DISPLAYTIME
} DISPLAYTIME; } DISPLAYTIME;
static int file_total, dir_total, recurse, wide, bare, max_width, lower; static int file_total, dir_total, recurse, wide, bare, max_width, lower;
static int shortname;
static ULONGLONG byte_total; static ULONGLONG byte_total;
static DISPLAYTIME dirTime; static DISPLAYTIME dirTime;
@ -71,10 +72,11 @@ void WCMD_directory (void) {
/* Handle args */ /* Handle args */
paged_mode = (strstr(quals, "/P") != NULL); paged_mode = (strstr(quals, "/P") != NULL);
recurse = (strstr(quals, "/S") != NULL); recurse = (strstr(quals, "/S") != NULL);
wide = (strstr(quals, "/W") != NULL); wide = (strstr(quals, "/W") != NULL);
bare = (strstr(quals, "/B") != NULL); bare = (strstr(quals, "/B") != NULL);
lower = (strstr(quals, "/L") != NULL); lower = (strstr(quals, "/L") != NULL);
shortname = (strstr(quals, "/X") != NULL);
if ((p = strstr(quals, "/T")) != NULL) { if ((p = strstr(quals, "/T")) != NULL) {
p = p + 2; p = p + 2;
@ -94,7 +96,8 @@ void WCMD_directory (void) {
} }
/* Handle conflicting args and initialization */ /* Handle conflicting args and initialization */
if (bare) wide = FALSE; if (bare || shortname) wide = FALSE;
if (bare) shortname = FALSE;
if (wide) { if (wide) {
if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo)) if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo))
@ -280,8 +283,13 @@ void WCMD_list_directory (char *search_path, int level) {
dir_count++; dir_count++;
if (!bare) { if (!bare) {
WCMD_output ("%10s %8s <DIR> %s\n", if (shortname) {
datestring, timestring, (fd+i)->cFileName); WCMD_output ("%10s %8s <DIR> %-13s%s\n",
datestring, timestring, (fd+i)->cAlternateFileName, (fd+i)->cFileName);
} else {
WCMD_output ("%10s %8s <DIR> %s\n",
datestring, timestring, (fd+i)->cFileName);
}
} else { } else {
if (!((strcmp((fd+i)->cFileName, ".") == 0) || if (!((strcmp((fd+i)->cFileName, ".") == 0) ||
(strcmp((fd+i)->cFileName, "..") == 0))) { (strcmp((fd+i)->cFileName, "..") == 0))) {
@ -294,10 +302,16 @@ void WCMD_list_directory (char *search_path, int level) {
file_size.u.LowPart = (fd+i)->nFileSizeLow; file_size.u.LowPart = (fd+i)->nFileSizeLow;
file_size.u.HighPart = (fd+i)->nFileSizeHigh; file_size.u.HighPart = (fd+i)->nFileSizeHigh;
byte_count.QuadPart += file_size.QuadPart; byte_count.QuadPart += file_size.QuadPart;
if (!bare) { if (!bare) {
WCMD_output ("%10s %8s %10s %s\n", if (shortname) {
datestring, timestring, WCMD_output ("%10s %8s %10s %-13s%s\n",
WCMD_filesize64(file_size.QuadPart), (fd+i)->cFileName); datestring, timestring,
WCMD_filesize64(file_size.QuadPart), (fd+i)->cAlternateFileName, (fd+i)->cFileName);
} else {
WCMD_output ("%10s %8s %10s %s\n",
datestring, timestring,
WCMD_filesize64(file_size.QuadPart), (fd+i)->cFileName);
}
} else { } else {
WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName); WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName);
} }