aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapplets/usage_compressed2
-rw-r--r--console-tools/showkey.c6
-rw-r--r--docs/busybox.net/news.html2
-rw-r--r--e2fsprogs/fsck.c4
-rw-r--r--init/halt.c2
-rw-r--r--libbb/getopt32.c2
-rw-r--r--testsuite/makedevs.device_table.txt8
7 files changed, 13 insertions, 13 deletions
diff --git a/applets/usage_compressed b/applets/usage_compressed
index 05ceafd4a..c30bcfa29 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -17,7 +17,7 @@ echo 'static const char packed_usage[] ALIGN1 = {'
17## Breaks on big-endian systems! 17## Breaks on big-endian systems!
18## # Extra effort to avoid using "od -t x1": -t is not available 18## # Extra effort to avoid using "od -t x1": -t is not available
19## # in non-CONFIG_DESKTOPed busybox od 19## # in non-CONFIG_DESKTOPed busybox od
20## 20##
21## "$loc/usage" | bzip2 -1 | od -v -x \ 21## "$loc/usage" | bzip2 -1 | od -v -x \
22## | $SED -e 's/^[^ ]*//' \ 22## | $SED -e 's/^[^ ]*//' \
23## | $SED -e 's/ //g' \ 23## | $SED -e 's/ //g' \
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index e4603e2d3..ee9318084 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -72,9 +72,9 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
72 // get keyboard settings 72 // get keyboard settings
73 xioctl(STDIN_FILENO, KDGKBMODE, &kbmode); 73 xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
74 printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n", 74 printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
75 kbmode == K_RAW ? "RAW" : 75 kbmode == K_RAW ? "RAW" :
76 (kbmode == K_XLATE ? "XLATE" : 76 (kbmode == K_XLATE ? "XLATE" :
77 (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" : 77 (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
78 (kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?"))) 78 (kbmode == K_UNICODE ? "UNICODE" : "?UNKNOWN?")))
79 , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress" 79 , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress"
80 ); 80 );
diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html
index a1fa3750c..d2c5d44f5 100644
--- a/docs/busybox.net/news.html
+++ b/docs/busybox.net/news.html
@@ -3,7 +3,7 @@
3<ul> 3<ul>
4 4
5 <li> 5 <li>
6 <p>We want to thank the following companies which are providing support for the BusyBox project: 6 <p>We want to thank the following companies which are providing support for the BusyBox project:
7 <ul> 7 <ul>
8 <li>AOE media, a <a href="http://www.aoemedia.com/typo3-development.html"> 8 <li>AOE media, a <a href="http://www.aoemedia.com/typo3-development.html">
9 TYPO3 development agency</a> contributes financially.</li> 9 TYPO3 development agency</a> contributes financially.</li>
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 3c4dabc48..cb454560a 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -313,10 +313,10 @@ static void load_fs_info(const char *filename)
313 // Loop through entries 313 // Loop through entries
314 while (getmntent_r(fstab, &mte, bb_common_bufsiz1, COMMON_BUFSIZE)) { 314 while (getmntent_r(fstab, &mte, bb_common_bufsiz1, COMMON_BUFSIZE)) {
315 //bb_info_msg("CREATE[%s][%s][%s][%s][%d]", mte.mnt_fsname, mte.mnt_dir, 315 //bb_info_msg("CREATE[%s][%s][%s][%s][%d]", mte.mnt_fsname, mte.mnt_dir,
316 // mte.mnt_type, mte.mnt_opts, 316 // mte.mnt_type, mte.mnt_opts,
317 // mte.mnt_passno); 317 // mte.mnt_passno);
318 fs = create_fs_device(mte.mnt_fsname, mte.mnt_dir, 318 fs = create_fs_device(mte.mnt_fsname, mte.mnt_dir,
319 mte.mnt_type, mte.mnt_opts, 319 mte.mnt_type, mte.mnt_opts,
320 mte.mnt_passno); 320 mte.mnt_passno);
321 } 321 }
322 endmntent(fstab); 322 endmntent(fstab);
diff --git a/init/halt.c b/init/halt.c
index cbb325eb9..e852b870e 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -50,7 +50,7 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
50 static const int magic[] = { 50 static const int magic[] = {
51 RB_HALT_SYSTEM, 51 RB_HALT_SYSTEM,
52 RB_POWER_OFF, 52 RB_POWER_OFF,
53 RB_AUTOBOOT 53 RB_AUTOBOOT
54 }; 54 };
55 static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; 55 static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM };
56 56
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 8fb99b6cc..43fb6eb86 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -510,7 +510,7 @@ getopt32(char **argv, const char *applet_opts, ...)
510 *pargv = pp; 510 *pargv = pp;
511 } 511 }
512 if (!(spec_flgs & ALL_ARGV_IS_OPTS)) 512 if (!(spec_flgs & ALL_ARGV_IS_OPTS))
513 break; 513 break;
514 pargv++; 514 pargv++;
515 } 515 }
516 } 516 }
diff --git a/testsuite/makedevs.device_table.txt b/testsuite/makedevs.device_table.txt
index 8ca5a88c0..4400083f8 100644
--- a/testsuite/makedevs.device_table.txt
+++ b/testsuite/makedevs.device_table.txt
@@ -1,5 +1,5 @@
1# When building a target filesystem, it is desirable to not have to 1# When building a target filesystem, it is desirable to not have to
2# become root and then run 'mknod' a thousand times. Using a device 2# become root and then run 'mknod' a thousand times. Using a device
3# table you can create device nodes and directories "on the fly". 3# table you can create device nodes and directories "on the fly".
4# 4#
5# This is a sample device table file for use with genext2fs. You can 5# This is a sample device table file for use with genext2fs. You can
@@ -14,17 +14,17 @@
14# I could just use the following two table entries: 14# I could just use the following two table entries:
15# /dev/hda b 640 0 0 3 0 0 0 - 15# /dev/hda b 640 0 0 3 0 0 0 -
16# /dev/hda b 640 0 0 3 1 1 1 15 16# /dev/hda b 640 0 0 3 1 1 1 15
17# 17#
18# Device table entries take the form of: 18# Device table entries take the form of:
19# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count> 19# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
20# where name is the file name, type can be one of: 20# where name is the file name, type can be one of:
21# f A regular file 21# f A regular file
22# d Directory 22# d Directory
23# c Character special device file 23# c Character special device file
24# b Block special device file 24# b Block special device file
25# p Fifo (named pipe) 25# p Fifo (named pipe)
26# uid is the user id for the target file, gid is the group id for the 26# uid is the user id for the target file, gid is the group id for the
27# target file. The rest of the entries (major, minor, etc) apply only 27# target file. The rest of the entries (major, minor, etc) apply only
28# to device special files. 28# to device special files.
29 29
30# Have fun 30# Have fun