zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-24 11:42:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- rewrote dir CCMD using ScanDirectory and avoiding I_ChDir entirely.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-20 20:44:11 +02:00
parent 5f3d25ef44
commit 771fa2b51c
1 changed files with 24 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/common/console/c_enginecmds.cpp
View file

@ -176,81 +176,47 @@ UNSAFE_CCMD (crashout)
#endif
// commented out because it's very poorly implemented (it should not abuse I_ChDir like this!)
#if 0
UNSAFE_CCMD (dir)
{
FString dir, path;
const char *match;
findstate_t c_file;
void *file;
FString curdir = I_GetCWD();
if (curdir.IsEmpty())
{
Printf ("Current path too long\n");
return;
}
FString path;
if (argv.argc() > 1)
{
path = NicePath(argv[1]);
if (!I_ChDir(path))
{
match = path;
dir = ExtractFilePath(path);
if (dir[0] != '\0')
{
match += dir.Len();
}
else
{
dir = "./";
}
if (match[0] == '\0')
{
match = "*";
}
if (!I_ChDir(dir))
{
Printf ("%s not found\n", dir.GetChars());
return;
}
}
else
{
match = "*";
dir = path;
}
}
else
{
match = "*";
dir = curdir;
path = I_GetCWD();;
}
if (dir[dir.Len()-1] != '/')
auto base = ExtractFileBase(path, true);
FString bpath;
if (base.IndexOfAny("*?") >= 0)
{
dir += '/';
bpath = ExtractFilePath(path);
}
if ( (file = I_FindFirst (match, &c_file)) == ((void *)(-1)))
Printf ("Nothing matching %s%s\n", dir.GetChars(), match);
else
{
Printf ("Listing of %s%s:\n", dir.GetChars(), match);
do
{
if (I_FindAttr (&c_file) & FA_DIREC)
Printf (PRINT_BOLD, "%s <dir>\n", I_FindName (&c_file));
else
Printf ("%s\n", I_FindName (&c_file));
} while (I_FindNext (file, &c_file) == 0);
I_FindClose (file);
base = "*";
bpath = path;
}
I_ChDir(curdir);
FileList list;
if (!ScanDirectory(list, bpath, base, true))
{
Printf ("Nothing matching %s\n", path.GetChars());
}
else
{
Printf ("Listing of %s:\n", path.GetChars());
for(auto& entry : list)
{
if (entry.isDirectory)
Printf (PRINT_BOLD, "%s <dir>\n", entry.FileName.c_str());
else
Printf ("%s\n", entry.FileName.c_str());
}
}
}
#endif
//==========================================================================
//