aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fbset.c9
-rw-r--r--util-linux/fdflush.c4
-rw-r--r--util-linux/freeramdisk.c8
-rw-r--r--util-linux/mount.c2
4 files changed, 10 insertions, 13 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 1f471dada..4e5609e41 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -104,9 +104,9 @@ struct cmdoptions_t {
104 "-hsync", 1, CMD_HSYNC}, { 104 "-hsync", 1, CMD_HSYNC}, {
105 "-vsync", 1, CMD_VSYNC}, { 105 "-vsync", 1, CMD_VSYNC}, {
106 "-laced", 1, CMD_LACED}, { 106 "-laced", 1, CMD_LACED}, {
107 "-double", 1, CMD_DOUBLE}, 107 "-double", 1, CMD_DOUBLE}, {
108 "--help", 0, CMD_HELP}, {
108#ifdef BB_FEATURE_FBSET_FANCY 109#ifdef BB_FEATURE_FBSET_FANCY
109 {
110 "--help", 0, CMD_HELP}, { 110 "--help", 0, CMD_HELP}, {
111 "-all", 0, CMD_ALL}, { 111 "-all", 0, CMD_ALL}, {
112 "-xres", 1, CMD_XRES}, { 112 "-xres", 1, CMD_XRES}, {
@@ -130,9 +130,8 @@ struct cmdoptions_t {
130 "-bcast", 1, CMD_BCAST}, { 130 "-bcast", 1, CMD_BCAST}, {
131 "-rgba", 1, CMD_RGBA}, { 131 "-rgba", 1, CMD_RGBA}, {
132 "-step", 1, CMD_STEP}, { 132 "-step", 1, CMD_STEP}, {
133 "-move", 1, CMD_MOVE}, 133 "-move", 1, CMD_MOVE}, {
134#endif 134#endif
135 {
136 0, 0, 0} 135 0, 0, 0}
137}; 136};
138 137
@@ -217,7 +216,7 @@ static void showmode(struct fb_var_screeninfo *v)
217 printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length, 216 printf("\trgba %u/%u,%u/%u,%u/%u,%u/%u\n", v->red.length,
218 v->red.offset, v->green.length, v->green.offset, v->blue.length, 217 v->red.offset, v->green.length, v->green.offset, v->blue.length,
219 v->blue.offset, v->transp.length, v->transp.offset); 218 v->blue.offset, v->transp.length, v->transp.offset);
220 printf("endmode\n"); 219 printf("endmode\n\n");
221} 220}
222 221
223static void fbset_usage(void) 222static void fbset_usage(void)
diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c
index 201cea898..56ea2244d 100644
--- a/util-linux/fdflush.c
+++ b/util-linux/fdflush.c
@@ -33,8 +33,8 @@ extern int fdflush_main(int argc, char **argv)
33 int value; 33 int value;
34 int fd; 34 int fd;
35 35
36 if (argc <= 1 || **(argv++) == '-') { 36 if (argc <= 1 || **(++argv) == '-') {
37 usage("fdflush device\n"); 37 usage("fdflush device\n\nForce floppy disk drive to detect disk change\n");
38 } 38 }
39 39
40 fd = open(*argv, 0); 40 fd = open(*argv, 0);
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 06937a70f..9636dbdcf 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -34,7 +34,7 @@
34 34
35static const char freeramdisk_usage[] = 35static const char freeramdisk_usage[] =
36 "freeramdisk DEVICE\n\n" 36 "freeramdisk DEVICE\n\n"
37 "Frees all memory used by the specified ramdisk.\n"; 37 "Free all memory used by the specified ramdisk.\n";
38 38
39extern int 39extern int
40freeramdisk_main(int argc, char **argv) 40freeramdisk_main(int argc, char **argv)
@@ -42,7 +42,7 @@ freeramdisk_main(int argc, char **argv)
42 char rname[256] = "/dev/ram"; 42 char rname[256] = "/dev/ram";
43 int f; 43 int f;
44 44
45 if (argc > 2 || ( argv[1] && *argv[1] == '-')) { 45 if (argc < 2 || ( argv[1] && *argv[1] == '-')) {
46 usage(freeramdisk_usage); 46 usage(freeramdisk_usage);
47 } 47 }
48 48
@@ -50,10 +50,10 @@ freeramdisk_main(int argc, char **argv)
50 strcpy(rname, argv[1]); 50 strcpy(rname, argv[1]);
51 51
52 if ((f = open(rname, O_RDWR)) == -1) { 52 if ((f = open(rname, O_RDWR)) == -1) {
53 fatalError( "freeramdisk: cannot open %s: %s", rname, strerror(errno)); 53 fatalError( "freeramdisk: cannot open %s: %s\n", rname, strerror(errno));
54 } 54 }
55 if (ioctl(f, BLKFLSBUF) < 0) { 55 if (ioctl(f, BLKFLSBUF) < 0) {
56 fatalError( "freeramdisk: failed ioctl on %s: %s", rname, strerror(errno)); 56 fatalError( "freeramdisk: failed ioctl on %s: %s\n", rname, strerror(errno));
57 } 57 }
58 /* Don't bother closing. Exit does 58 /* Don't bother closing. Exit does
59 * that, so we can save a few bytes */ 59 * that, so we can save a few bytes */
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 329c07780..972e5066c 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -83,8 +83,6 @@ static const char mount_usage[] = "\tmount [flags]\n"
83 "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n" 83 "\tsuid / nosuid:\tAllow set-user-id-root programs / disallow them.\n"
84 "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n" 84 "\tremount: Re-mount a currently-mounted filesystem, changing its flags.\n"
85 "\tro / rw: Mount for read-only / read-write.\n" 85 "\tro / rw: Mount for read-only / read-write.\n"
86 "\t"
87
88 "There are EVEN MORE flags that are specific to each filesystem.\n" 86 "There are EVEN MORE flags that are specific to each filesystem.\n"
89 "You'll have to see the written documentation for those.\n"; 87 "You'll have to see the written documentation for those.\n";
90 88