summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/mkfifo.c4
-rw-r--r--coreutils/mknod.c53
-rw-r--r--coreutils/printf.c2
-rw-r--r--coreutils/sort.c4
-rw-r--r--coreutils/test.c8
-rw-r--r--coreutils/tr.c14
6 files changed, 57 insertions, 28 deletions
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index c74402d..b273df0 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -27,10 +27,10 @@
#include <errno.h>
static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n\n"
- "Create the named fifo\n\n"
+ "Creates a named pipe (identical to 'mknod name p')\n\n"
"Options:\n"
- "\t-m\tcreate the fifo with the specified mode; default = a=rw-umask\n";
+ "\t-m\tcreate the pipe using the specified mode (default a=rw)\n";
extern int mkfifo_main(int argc, char **argv)
{
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 40f508d..0c93df6 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -28,23 +28,47 @@
#include <fcntl.h>
#include <unistd.h>
-static const char mknod_usage[] = "mknod NAME TYPE MAJOR MINOR\n\n"
- "Make block or character special files.\n\n"
+static const char mknod_usage[] = "mknod [OPTIONS] NAME TYPE MAJOR MINOR\n\n"
+ "Create a special file (block, character, or pipe).\n\n"
+ "Options:\n"
+ "\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
"TYPEs include:\n"
"\tb:\tMake a block (buffered) device.\n"
-
"\tc or u:\tMake a character (un-buffered) device.\n"
- "\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n";
+ "\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n";
int mknod_main(int argc, char **argv)
{
+ char *thisarg;
mode_t mode = 0;
+ mode_t perm = 0666;
dev_t dev = 0;
- if (argc != 5 || **(argv + 1) == '-') {
+ argc--;
+ argv++;
+
+ /* Parse any options */
+ while (argc > 1) {
+ if (**argv != '-')
+ break;
+ thisarg = *argv;
+ thisarg++;
+ switch (*thisarg) {
+ case 'm':
+ argc--;
+ argv++;
+ parse_mode(*argv, &perm);
+ break;
+ default:
+ usage(mknod_usage);
+ }
+ argc--;
+ argv++;
+ }
+ if (argc != 4 && argc != 2) {
usage(mknod_usage);
}
- switch (argv[2][0]) {
+ switch (argv[1][0]) {
case 'c':
case 'u':
mode = S_IFCHR;
@@ -54,23 +78,22 @@ int mknod_main(int argc, char **argv)
break;
case 'p':
mode = S_IFIFO;
+ if (argc!=2) {
+ usage(mknod_usage);
+ }
break;
default:
usage(mknod_usage);
}
if (mode == S_IFCHR || mode == S_IFBLK) {
- dev = (atoi(argv[3]) << 8) | atoi(argv[4]);
- if (argc != 5) {
- usage(mknod_usage);
- }
+ dev = (atoi(argv[2]) << 8) | atoi(argv[1]);
}
- mode |= 0666;
+ mode |= perm;
- if (mknod(argv[1], mode, dev) != 0) {
- perror(argv[1]);
- exit (FALSE);
- }
+ if (mknod(argv[0], mode, dev) != 0)
+ fatalError("%s: %s\n", argv[0], strerror(errno));
exit (TRUE);
}
+
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 41ab2e4..bfe4081 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -139,7 +139,7 @@ static void verify __P((char *s, char *end));
/* The value to return to the calling program. */
static int exit_status;
-static const char printf_usage[] = "printf format [argument...]\n";
+static const char printf_usage[] = "printf format [argument...]\n\nFormats and prints the given data.\n";
int printf_main(int argc, char **argv)
{
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 6ee6f20..4301f43 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -33,7 +33,7 @@ static const char sort_usage[] = "sort [-n]"
#ifdef BB_FEATURE_SORT_REVERSE
" [-r]"
#endif
-" [FILE]...\n\n";
+" [FILE]...\n\nSorts lines of text in the specified files\n";
#ifdef BB_FEATURE_SORT_REVERSE
#define APPLY_REVERSE(x) (reverse ? -(x) : (x))
@@ -320,4 +320,4 @@ int sort_main(int argc, char **argv)
exit(0);
}
-/* $Id: sort.c,v 1.13 2000/04/13 01:18:56 erik Exp $ */
+/* $Id: sort.c,v 1.14 2000/04/15 16:34:54 erik Exp $ */
diff --git a/coreutils/test.c b/coreutils/test.c
index 85d06a8..0ed7771 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * echo implementation for busybox
+ * test implementation for busybox
*
* Copyright (c) by a whole pile of folks:
*
@@ -185,6 +185,12 @@ test_main(int argc, char** argv)
fatalError("missing ]");
argv[argc] = NULL;
}
+ if (strcmp(argv[1], "--help") == 0) {
+ usage("test EXPRESSION\n"
+ "or [ EXPRESSION ]\n\n"
+ "Checks file types and compares values returning an exit\n"
+ "code determined by the value of EXPRESSION.\n");
+ }
/* Implement special cases from POSIX.2, section 4.62.4 */
switch (argc) {
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 3bfa480..b631b00 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif
static const char rcsid[] =
- "$Id: tr.c,v 1.2 2000/03/21 22:32:57 erik Exp $";
+ "$Id: tr.c,v 1.3 2000/04/15 16:34:54 erik Exp $";
#endif /* not lint */
#endif /* #if 0 */
@@ -138,12 +138,12 @@ int cflag;
static void tr_usage()
{
- (void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
- "usage: tr [-csu] string1 string2",
- " tr [-cu] -d string1",
- " tr [-cu] -s string1",
- " tr [-cu] -ds string1 string2");
- exit(1);
+ usage( "\ttr [-csu] string1 string2\n"
+ "\ttr [-cu] -d string1\n"
+ "\ttr [-cu] -s string1\n"
+ "\ttr [-cu] -ds string1 string2\n\n"
+ "Translate, squeeze, and/or delete characters from standard\n"
+ "input, writing to standard output.\n");
}