nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove --usage options from shell utilities in favor of --help.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-03-18 17:50:59 +01:00
parent 07fd50d5c6
commit c2f9c0bb12
20 changed files with 65 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/calc.cpp
View File

@ -288,11 +288,11 @@ void printAll(Stack<long> &stack) {
/* MODIFIES: standard output.
* EFFECTS: Prints usage information and returns 0.
*/
int printUsage(const char* argv0) {
printf("Usage: %s [--help] [--usage] COMMAND ...\n", argv0);
int printHelp(const char* argv0) {
printf("Usage: %s [--help] COMMAND ...\n", argv0);
printf("%s is a Reverse Polish Notation integer calculator.\n", argv0);
printf("\n");
printf(" --help, --usage Display this help and exit\n");
printf(" --help Display this help and exit\n");
printf("\n");
printf("%s supports the following commands:\n", argv0);
printf("Any integers supplied are pushed onto the stack and can be given in decimal\n");
@ -315,11 +315,10 @@ int printUsage(const char* argv0) {
}
int main(int argc, char *argv[]) {
//If no arguments, --usage, or --help.
//If no arguments, --help.
if (argc == 1 ||
(argc > 1 && (!strcmp(argv[1], "--usage") ||
!strcmp(argv[1], "--help"))))
return printUsage(argv[0]);
(argc > 1 && !strcmp(argv[1], "--help")))
return printHelp(argv[0]);
Stack<long> stack;
bool printedAnything = false;

14
utils/cat.cpp
View File

@ -103,24 +103,18 @@ static void compact_arguments(int* argc, char*** argv)
}
}
static void usage(FILE* fp, const char* argv0)
static void help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... [FILE]...\n", argv0);
fprintf(fp, "Concatenate FILE(s), or standard input, to standard output.\n");
fprintf(fp, "\n");
fprintf(fp, " -u (ignored)\n");
fprintf(fp, " --help display this help and exit\n");
fprintf(fp, " --usage display this help and exit\n");
fprintf(fp, " --version output version information and exit\n");
fprintf(fp, "\n");
fprintf(fp, "With no FILE, or when FILE is -, read standard input.\n");
}
static void help(FILE* fp, const char* argv0)
{
usage(fp, argv0);
}
static void version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -147,20 +141,18 @@ int main(int argc, char* argv[])
case 'u': /* Ignored, POSIX compatibility. */ break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") )
help(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--usage") )
usage(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--version") )
version(stdout, argv0), exit(0);
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}

14
utils/chroot.cpp
View File

@ -42,14 +42,9 @@ void CompactArguments(int* argc, char*** argv)
}
}
void Usage(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... ROOT [CMD] [ARGUMENT...]\n", argv0);
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
fprintf(fp, "Usage: %s [OPTION]... ROOT [CMD] [ARGUMENT...]\n", argv0);
}
void Version(FILE* fp, const char* argv0)
@ -77,17 +72,16 @@ int main(int argc, char* argv[])
{
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}
@ -97,7 +91,7 @@ int main(int argc, char* argv[])
if ( argc < 2 )
{
error(0, 0, "missing operand, expected new root directory");
Usage(stdout, argv0);
Help(stdout, argv0);
exit(0);
}

15
utils/chvideomode.cpp
View File

@ -310,13 +310,13 @@ void FilterModes(struct dispmsg_crtc_mode* modes, size_t* nummodesptr, Filter* f
*nummodesptr = outnum;
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION ...] [PROGRAM-TO-RUN [ARG ...]]\n", argv0);
fprintf(fp, "Changes the video mode and optionally runs a program\n");
fprintf(fp, "\n");
fprintf(fp, "Options supported by %s:\n", argv0);
fprintf(fp, " --help, --usage Display this help and exit\n");
fprintf(fp, " --help Display this help and exit\n");
fprintf(fp, " --version Output version information and exit\n");
fprintf(fp, "\n");
fprintf(fp, "Options for filtering modes:\n");
@ -327,12 +327,6 @@ void Usage(FILE* fp, const char* argv0)
fprintf(fp, " --bpp BPP, --min-bpp BPP, --max-bpp BPP\n");
fprintf(fp, " --width NUM, --min-width NUM, --max-width NUM\n");
fprintf(fp, " --height NUM, --min-height NUM, --max-height NUM\n");
fprintf(fp, "\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
@ -400,12 +394,11 @@ int main(int argc, char* argv[])
if ( arg[0] != '-' ) { break; }
if ( !strcmp(arg, "--") ) { break; }
if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
if ( i == argc-1 )
{
fprintf(stderr, "%s: missing parameter to %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
const char* p = argv[++i]; argv[i] = NULL;
@ -422,7 +415,7 @@ int main(int argc, char* argv[])
if ( !handled )
{
fprintf(stderr, "%s: no such option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

12
utils/column.cpp
View File

@ -125,14 +125,9 @@ bool doformat()
return true;
}
void usage(const char* argv0)
{
printf("usage: %s [--help | --version | --usage] [-c width] [<FILE> ...]\n", argv0);
}
void help(const char* argv0)
{
usage(argv0);
printf("usage: %s [--help | --version] [-c width] [<FILE> ...]\n", argv0);
}
void version(const char* argv0)
@ -168,17 +163,16 @@ int main(int argc, char* argv[])
if ( strcmp(arg, "-") == 0 ) { continue; }
argv[i] = NULL;
if ( strcmp(arg, "--") == 0 ) { break; }
if ( strcmp(arg, "--usage") == 0 ) { usage(argv0); exit(0); }
if ( strcmp(arg, "--help") == 0 ) { help(argv0); exit(0); }
if ( strcmp(arg, "--version") == 0 ) { version(argv0); exit(0); }
if ( strcmp(arg, "-c") == 0 )
{
if ( i+1 == argc ) { usage(argv0); exit(1); }
if ( i+1 == argc ) { help(argv0); exit(1); }
termwidth = atoi(argv[++i]); argv[i] = NULL;
continue;
}
error(0, 0, "unknown option %s", arg);
usage(argv0);
help(argv0);
return 1;
}

12
utils/cp.cpp
View File

@ -333,7 +333,7 @@ bool CopyAmbigious(int srcdirfd, const char* srcrel, const char* srcpath,
dstdirfd, dstrel, dstpath, flags);
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... [-T] SOURCE DEST\n", argv0);
fprintf(fp, " or: %s [OPTION]... SOURCE... DIRECTORY\n", argv0);
@ -345,11 +345,6 @@ void Usage(FILE* fp, const char* argv0)
#endif
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -387,12 +382,11 @@ int main(int argc, char* argv[])
continue;
#endif
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--recursive") )
flags |= FLAG_RECURSIVE;
@ -413,7 +407,7 @@ int main(int argc, char* argv[])
continue;
#endif
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

14
utils/du.cpp
View File

@ -268,7 +268,7 @@ bool disk_usage_file_at(int relfd,
return success;
}
static void usage(FILE* fp, const char* argv0)
static void help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... [FILE]...\n", argv0);
fprintf(fp, "Summarize disk usage of each FILE, recursively for directories.\n");
@ -297,7 +297,6 @@ static void usage(FILE* fp, const char* argv0)
fprintf(fp, " -s, --summarize display only a total for each argument\n");
fprintf(fp, " -x, --one-file-system skip directories on different file systems\n");
fprintf(fp, " --help display this help and exit\n");
fprintf(fp, " --usage display this help and exit\n");
fprintf(fp, " --version output version information and exit\n");
fprintf(fp, "\n");
fprintf(fp, "Display values are in units of the first available SIZE from --block-size,\n");
@ -308,11 +307,6 @@ static void usage(FILE* fp, const char* argv0)
fprintf(fp, "KB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n");
}
static void help(FILE* fp, const char* argv0)
{
usage(fp, argv0);
}
static void version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -422,14 +416,12 @@ int main(int argc, char* argv[])
case 'x': flags |= FLAG_SAME_DEVICE; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") )
help(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--usage") )
usage(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--version") )
version(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--all") )
@ -475,7 +467,7 @@ int main(int argc, char* argv[])
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}

10
utils/kernelinfo.cpp
View File

@ -31,7 +31,7 @@
#define VERSIONSTR "unknown version"
#endif
void usage(const char* argv0)
void help(const char* argv0)
{
printf("usage: %s <REQUEST> ...\n", argv0);
printf("Prints a kernel information string.\n");
@ -41,11 +41,6 @@ void usage(const char* argv0)
printf("example: %s buildtime\n", argv0);
}
void help(const char* argv0)
{
usage(argv0);
}
void version(const char* argv0)
{
FILE* fp = stdout;
@ -58,11 +53,10 @@ void version(const char* argv0)
int main(int argc, char* argv[])
{
const char* argv0 = argv[0];
if ( argc < 2 ) { usage(argv0); return 0; }
if ( argc < 2 ) { help(argv0); return 0; }
for ( int i = 1; i < argc; i++ )
{
if ( argv[i][0] != '-' ) { continue; }
if ( strcmp(argv[i], "--usage") == 0 ) { usage(argv0); return 0; }
if ( strcmp(argv[i], "--help") == 0 ) { help(argv0); return 0; }
if ( strcmp(argv[i], "--version") == 0 ) { version(argv0); return 0; }
fprintf(stderr, "%s: unknown option: %s\n", argv0, argv[i]);

6
utils/kill.cpp
View File

@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
int usage()
int help()
{
printf("usage: kill [-n] pid ...\n");
return 0;
@ -36,14 +36,14 @@ int usage()
int main(int argc, char* argv[])
{
if ( argc < 2 ) { return usage(); }
if ( argc < 2 ) { return help(); }
int first = 1;
int signum = SIGTERM;
if ( argv[1][0] == '-' )
{
signum = atoi(argv[first++]);
if ( argc < 3 ) { return usage(); }
if ( argc < 3 ) { return help(); }
}
int result = 0;

14
utils/ln.cpp
View File

@ -32,17 +32,12 @@
#define VERSIONSTR "unknown version"
#endif
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... TARGET LINK_NAME\n", argv0);
fprintf(fp, "Create a hard or symbolic link.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -74,7 +69,7 @@ int main(int argc, char* argv[])
case 'v': verbose = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--force") )
@ -84,12 +79,11 @@ int main(int argc, char* argv[])
else if ( !strcmp(arg, "--verbose") )
verbose = true;
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}
@ -106,7 +100,7 @@ int main(int argc, char* argv[])
{
const char* what = argc < 3 ? "missing" : "extra";
fprintf(stderr, "%s: %s operand\n", argv0, what);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}

15
utils/ls.cpp
View File

@ -309,11 +309,6 @@ cleanup_done:
return ret;
}
void usage(FILE* fp, const char* argv0)
{
fprintf(fp, "usage: %s [-l] [-a | -A] [<DIR> ...]\n", argv0);
}
void version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -324,7 +319,7 @@ void version(FILE* fp, const char* argv0)
void help(FILE* fp, const char* argv0)
{
return usage(fp, argv0);
fprintf(fp, "usage: %s [-l] [-a | -A] [<DIR> ...]\n", argv0);
}
int main(int argc, char** argv)
@ -365,7 +360,7 @@ int main(int argc, char** argv)
break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
usage(stderr, argv0);
help(stderr, argv0);
exit(2);
}
}
@ -374,10 +369,6 @@ int main(int argc, char** argv)
{
version(stdout, argv0); exit(0);
}
else if ( !strcmp(arg, "--usage") )
{
usage(stdout, argv0); exit(0);
}
else if ( !strcmp(arg, "--help") )
{
help(stdout, argv0); exit(0);
@ -385,7 +376,7 @@ int main(int argc, char** argv)
else
{
fprintf(stderr, "%s: unrecognized option: %s\n", argv0, arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(2);
}
}

12
utils/mkdir.cpp
View File

@ -66,17 +66,12 @@ void CreateDirectory(const char* path, bool parents, bool verbose)
fprintf(stderr, "%s: created directory `%s'\n", program_invocation_name, path);
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... DIRECTORY...\n", argv0);
fprintf(fp, "Create directories if they don't already exist.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -106,7 +101,7 @@ int main(int argc, char* argv[])
case 'v': verbose = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--parents") )
@ -114,12 +109,11 @@ int main(int argc, char* argv[])
else if ( !strcmp(arg, "--verbose") )
verbose = true;
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

14
utils/pwd.cpp
View File

@ -59,7 +59,7 @@ static bool is_path_absolute(const char* path)
return true;
}
static void usage(FILE* fp, const char* argv0)
static void help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]...\n", argv0);
fprintf(fp, "Print the full filename of the current working directory.\n");
@ -67,15 +67,9 @@ static void usage(FILE* fp, const char* argv0)
fprintf(fp, " -L, --logical use PWD from environment, even if it contains symlinks\n");
fprintf(fp, " -P, --physical avoid all symlinks\n");
fprintf(fp, " --help display this help and exit\n");
fprintf(fp, " --usage display this help and exit\n");
fprintf(fp, " --version output version information and exit\n");
}
static void help(FILE* fp, const char* argv0)
{
usage(fp, argv0);
}
static void version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -104,14 +98,12 @@ int main(int argc, char* argv[])
case 'P': physical = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") )
help(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--usage") )
usage(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--version") )
version(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--logical") )
@ -121,7 +113,7 @@ int main(int argc, char* argv[])
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}

12
utils/rm.cpp
View File

@ -124,17 +124,12 @@ bool RemoveRecursively(int dirfd, const char* full, const char* rel,
return ret;
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... FILE...\n", argv0);
fprintf(fp, "Remove files by unlinking their directory entries.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -167,7 +162,7 @@ int main(int argc, char* argv[])
case 'v': verbose = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--force") )
@ -177,12 +172,11 @@ int main(int argc, char* argv[])
else if ( !strcmp(arg, "--verbose") )
verbose = true;
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

12
utils/rmdir.cpp
View File

@ -34,17 +34,12 @@
#define VERSIONSTR "unknown version"
#endif
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]... DIRECTORY...\n", argv0);
fprintf(fp, "Remove directories if they are empty.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -75,7 +70,7 @@ int main(int argc, char* argv[])
case 'v': verbose = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--ignore-fail-on-non-empty") )
@ -85,12 +80,11 @@ int main(int argc, char* argv[])
else if ( !strcmp(arg, "--verbose") )
verbose = true;
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

10
utils/tail.cpp
View File

@ -109,22 +109,17 @@ bool processfp(const char* inputname, FILE* fp)
return true;
}
void usage(const char* argv0)
void help(const char* argv0)
{
printf("usage: %s [-n <numlines>] [-q | -v] [<FILE> ...]\n", argv0);
}
void errusage(const char* argv0)
{
usage(argv0);
help(argv0);
exit(1);
}
void help(const char* argv0)
{
usage(argv0);
}
void version(const char* argv0)
{
FILE* fp = stdout;
@ -145,7 +140,6 @@ int main(int argc, char* argv[])
argv[i] = NULL;
if ( strcmp(arg, "--") == 0 ) { break; }
const char* nlinesstr = NULL;
if ( strcmp(arg, "--usage") == 0 ) { usage(argv0); return 0; }
if ( strcmp(arg, "--help") == 0 ) { help(argv0); return 0; }
if ( strcmp(arg, "--version") == 0 ) { version(argv0); return 0; }
if ( strcmp(arg, "-q") == 0 ||

12
utils/type.cpp
View File

@ -33,15 +33,10 @@
#define VERSIONSTR "unknown version"
#endif
void usage(FILE* fp, const char* argv0)
{
fprintf(fp, "usage: %s [--usage | --help | --version]\n", argv0);
fprintf(fp, "Lets you type freely onto the tty.\n");
}
void help(FILE* fp, const char* argv0)
{
return usage(fp, argv0);
fprintf(fp, "usage: %s [--help | --version]\n", argv0);
fprintf(fp, "Lets you type freely onto the tty.\n");
}
void version(FILE* fp, const char* argv0)
@ -63,10 +58,9 @@ int main(int argc, char* argv[])
argv[i] = NULL;
if ( !strcmp(arg, "--") ) { break; }
if ( !strcmp(arg, "--help") ) { help(stdout, argv0); exit(0); }
if ( !strcmp(arg, "--usage") ) { usage(stdout, argv0); exit(0); }
if ( !strcmp(arg, "--version") ) { version(stdout, argv0); exit(0); }
error(0, 0, "unrecognized option: %s", arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}

14
utils/uname.cpp
View File

@ -53,17 +53,12 @@ void DoPrint(const char* msg)
has_printed = true;
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]...\n", argv0);
fprintf(fp, "Print certain system information.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -82,7 +77,7 @@ int main(int argc, char* argv[])
if ( arg[0] != '-' )
{
fprintf(stderr, "%s: extra operand: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
if ( arg[1] != '-' )
@ -100,7 +95,7 @@ int main(int argc, char* argv[])
case 'o': flags |= PRINT_OPSYS; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--kernel-name") )
@ -120,12 +115,11 @@ int main(int argc, char* argv[])
else if ( !strcmp(arg, "--operating-system") )
flags |= PRINT_OPSYS;
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}

14
utils/wc.cpp
View File

@ -133,7 +133,7 @@ void print_stats(struct word_count stats, FILE* fp, int flags, const char* path)
fprintf(fp, "\n");
}
static void usage(FILE* fp, const char* argv0)
static void help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [OPTION]...\n", argv0);
fprintf(fp, "Print newline, word, and byte counts for each FILE, and a total line if\n");
@ -148,15 +148,9 @@ static void usage(FILE* fp, const char* argv0)
fprintf(fp, " -l, --lines print the newline counts\n");
fprintf(fp, " -w, --words print the word counts\n");
fprintf(fp, " --help display this help and exit\n");
fprintf(fp, " --usage display this help and exit\n");
fprintf(fp, " --version output version information and exit\n");
}
static void help(FILE* fp, const char* argv0)
{
usage(fp, argv0);
}
static void version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -273,14 +267,12 @@ int main(int argc, char* argv[])
case 'w': flags |= FLAG_PRINT_NUM_WORDS; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}
else if ( !strcmp(arg, "--help") )
help(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--usage") )
usage(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--version") )
version(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--bytes") )
@ -294,7 +286,7 @@ int main(int argc, char* argv[])
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
usage(stderr, argv0);
help(stderr, argv0);
exit(1);
}
}

12
utils/which.cpp
View File

@ -86,17 +86,12 @@ bool Which(const char* cmd, const char* path, bool all)
return found;
}
void Usage(FILE* fp, const char* argv0)
void Help(FILE* fp, const char* argv0)
{
fprintf(fp, "Usage: %s [-a] FILENAME...\n", argv0);
fprintf(fp, "Locate a program in the PATH.\n");
}
void Help(FILE* fp, const char* argv0)
{
Usage(fp, argv0);
}
void Version(FILE* fp, const char* argv0)
{
fprintf(fp, "%s (Sortix) %s\n", argv0, VERSIONSTR);
@ -124,16 +119,15 @@ int main(int argc, char* argv[])
case 'a': all = true; break;
default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
else
{
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
Usage(stderr, argv0);
Help(stderr, argv0);
exit(1);
}
}