Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

userspace: Fix getopt_long usage

Browse Source 
- Add missing null entry after the last long option
- Don't duplicate illegal option message, getopt already prints
  the message as I do not suppress it. Also handle missing arguments.
This commit is contained in:
Bananymous
2026-05-16 17:06:31 +03:00
parent d528314ae3
commit 68479bf07e
7 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
userspace/programs/rm/main.cpp
View File

@@ -102,6 +102,7 @@ int main(int argc, char** argv)
{ "interactive", no_argument, nullptr, 'i' },
{ "force", no_argument, nullptr, 'f' },
{ "help", no_argument, nullptr, 'h' },
{}
};
int ch = getopt_long(argc, argv, "rRifh", long_options, nullptr);
@@ -110,15 +111,6 @@ int main(int argc, char** argv)
switch (ch)
{
case 'h':
fprintf(stderr, "usage: %s [OPTIONS]... FILE...\n", argv[0]);
fprintf(stderr, " remove each FILE\n");
fprintf(stderr, "OPTIONS:\n");
fprintf(stderr, " -r, -R, --recursive remove directories and their contents recursively\n");
fprintf(stderr, " -i, --interactive prompt removal for all files\n");
fprintf(stderr, " -f, --force ignore nonexistent files and never prompt\n");
fprintf(stderr, " -h, --help show this message and exit\n");
return 0;
case 'r': case 'R':
recursive = true;
break;
@@ -130,8 +122,16 @@ int main(int argc, char** argv)
force = false;
interactive = true;
break;
case '?':
fprintf(stderr, "invalid option %c\n", optopt);
case 'h':
fprintf(stderr, "usage: %s [OPTIONS]... FILE...\n", argv[0]);
fprintf(stderr, " remove each FILE\n");
fprintf(stderr, "OPTIONS:\n");
fprintf(stderr, " -r, -R, --recursive remove directories and their contents recursively\n");
fprintf(stderr, " -i, --interactive prompt removal for all files\n");
fprintf(stderr, " -f, --force ignore nonexistent files and never prompt\n");
fprintf(stderr, " -h, --help show this message and exit\n");
return 0;
case ':': case '?':
fprintf(stderr, "see '%s --help' for usage\n", argv[0]);
return 1;
}
@@ -139,7 +139,8 @@ int main(int argc, char** argv)
if (optind >= argc && !force)
{
fprintf(stderr, "missing operand. use --help for more information\n");
fprintf(stderr, "%s: missing operand\n", argv[0]);
fprintf(stderr, "see '%s --help' for usage\n", argv[0]);
return 1;
}