enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

fix(userspace/coreutils): fix test command to correctly detect the bracket

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2 2025-03-16 00:15:51 +00:00
parent 5af9c9b0a2
commit 6e077acc66
No known key found for this signature in database
GPG Key ID: 2EE20AF089811A5A
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Userspace/coreutils/src/test.c
View File

@ -95,7 +95,10 @@ static int TestInteger(const char *n1, const char *op, const char *n2)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int isBracketForm = strcmp(argv[0], "[") == 0; char *base = strrchr(argv[0], '/');
base = base ? base + 1 : argv[0];
int isBracketForm = (strcmp(base, "[") == 0);
if (isBracketForm) if (isBracketForm)
{ {
if (argc < 2 || strcmp(argv[argc - 1], "]") != 0) if (argc < 2 || strcmp(argv[argc - 1], "]") != 0)
@ -108,21 +111,28 @@ int main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
return 1; return 1;
if (argc == 2) if (argc == 2)
return argv[1][0] ? 0 : 1; return argv[1][0] ? 0 : 1;
if (argc == 3) if (argc == 3)
{ {
if (!strcmp(argv[1], "!")) if (!strcmp(argv[1], "!"))
return argv[2][0] ? 1 : 0; return argv[2][0] ? 1 : 0;
return TestFile(argv[2], argv[1][1]); return TestFile(argv[2], argv[1][1]);
} }
if (argc == 4) if (argc == 4)
{ {
if (!strcmp(argv[1], "!")) if (!strcmp(argv[1], "!"))
return !main(3, &argv[1]); return !main(3, &argv[1]);
if (strchr("=!\"><", argv[2][0]))
if (strchr("=!<>", argv[2][0]))
return TestString(argv[1], argv[2], argv[3]); return TestString(argv[1], argv[2], argv[3]);
return TestInteger(argv[1], argv[2], argv[3]); return TestInteger(argv[1], argv[2], argv[3]);
} }
return 2; return 2;
} }