diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-17 16:28:10 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-17 16:28:10 +0000 |
commit | 9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e (patch) | |
tree | 94c3c0678d1349497abe2db6004e9331e50f6d37 | |
parent | a6127aacef047ed7661722705b052811fbe7f467 (diff) | |
download | busybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.tar.gz busybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.tar.bz2 busybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.zip |
whitespace cleanup
92 files changed, 218 insertions, 218 deletions
@@ -113,7 +113,7 @@ Manuel Novoa III <mjn3@codepoet.org> | |||
113 | 113 | ||
114 | Vladimir Oleynik <dzo@simtreas.ru> | 114 | Vladimir Oleynik <dzo@simtreas.ru> |
115 | cmdedit; bb_mkdep, xargs(current), httpd(current); | 115 | cmdedit; bb_mkdep, xargs(current), httpd(current); |
116 | ports: ash, crond, fdisk (initial, unmaintained now), inetd, stty, traceroute, | 116 | ports: ash, crond, fdisk (initial, unmaintained now), inetd, stty, traceroute, |
117 | top; | 117 | top; |
118 | locale, various fixes | 118 | locale, various fixes |
119 | and irreconcilable critic of everything not perfect. | 119 | and irreconcilable critic of everything not perfect. |
@@ -33,7 +33,7 @@ Rob Landley <rob@landley.net>: | |||
33 | depmod | 33 | depmod |
34 | busybox lacks a way to update module deps when running from firmware without the | 34 | busybox lacks a way to update module deps when running from firmware without the |
35 | use of the depmod.pl (perl is to bloated for most embedded setups) and or orig | 35 | use of the depmod.pl (perl is to bloated for most embedded setups) and or orig |
36 | modutils. The orig depmod is rather pointless to have to add to a firmware image | 36 | modutils. The orig depmod is rather pointless to have to add to a firmware image |
37 | in when we already have a insmod/rmmod and friends. | 37 | in when we already have a insmod/rmmod and friends. |
38 | Unify base64 handling. | 38 | Unify base64 handling. |
39 | There's base64 encoding and decoding going on in: | 39 | There's base64 encoding and decoding going on in: |
diff --git a/applets/Makefile.in b/applets/Makefile.in index a4890c2fb..05580b9b4 100644 --- a/applets/Makefile.in +++ b/applets/Makefile.in | |||
@@ -21,6 +21,6 @@ libraries-y+=$(APPLETS_DIR)$(APPLETS_AR) | |||
21 | $(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) | 21 | $(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) |
22 | $(do_ar) | 22 | $(do_ar) |
23 | 23 | ||
24 | $(APPLET_OBJ): $(top_builddir)/.config | 24 | $(APPLET_OBJ): $(top_builddir)/.config |
25 | $(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c | 25 | $(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c |
26 | $(compile.c) | 26 | $(compile.c) |
diff --git a/applets/individual.c b/applets/individual.c index c6d263b47..bc5f528d7 100644 --- a/applets/individual.c +++ b/applets/individual.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* Minimal wrapper to build an individual busybox applet. | 1 | /* Minimal wrapper to build an individual busybox applet. |
2 | * | 2 | * |
3 | * Copyright 2005 Rob Landley <rob@landley.net | 3 | * Copyright 2005 Rob Landley <rob@landley.net |
4 | * | 4 | * |
5 | * Licensed under GPLv2 or later, see file License in this tarball for details | 5 | * Licensed under GPLv2 or later, see file License in this tarball for details |
6 | */ | 6 | */ |
7 | 7 | ||
diff --git a/archival/dpkg.c b/archival/dpkg.c index 163d91f19..2180d1868 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
@@ -1316,8 +1316,8 @@ static void list_packages(void) | |||
1316 | /* go through status hash, dereference package hash and finally strings */ | 1316 | /* go through status hash, dereference package hash and finally strings */ |
1317 | for (i=0; i<STATUS_HASH_PRIME+1; i++) { | 1317 | for (i=0; i<STATUS_HASH_PRIME+1; i++) { |
1318 | 1318 | ||
1319 | if (status_hashtable[i]) { | 1319 | if (status_hashtable[i]) { |
1320 | const char *stat_str; /* status string */ | 1320 | const char *stat_str; /* status string */ |
1321 | const char *name_str; /* package name */ | 1321 | const char *name_str; /* package name */ |
1322 | const char *vers_str; /* version */ | 1322 | const char *vers_str; /* version */ |
1323 | char s1, s2; /* status abbreviations */ | 1323 | char s1, s2; /* status abbreviations */ |
@@ -1333,7 +1333,7 @@ static void list_packages(void) | |||
1333 | 1333 | ||
1334 | /* get abbreviation for status field 2 */ | 1334 | /* get abbreviation for status field 2 */ |
1335 | for (j=0, spccnt=0; stat_str[j] && spccnt<2; j++) { | 1335 | for (j=0, spccnt=0; stat_str[j] && spccnt<2; j++) { |
1336 | if (stat_str[j] == ' ') spccnt++; | 1336 | if (stat_str[j] == ' ') spccnt++; |
1337 | } | 1337 | } |
1338 | s2 = stat_str[j]; | 1338 | s2 = stat_str[j]; |
1339 | 1339 | ||
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index c0203cc4a..74de9af44 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * Ken Turkowski, Dave Mack and Peter Jannesen. | 29 | * Ken Turkowski, Dave Mack and Peter Jannesen. |
30 | * | 30 | * |
31 | * See the file algorithm.doc for the compression algorithms and file formats. | 31 | * See the file algorithm.doc for the compression algorithms and file formats. |
32 | * | 32 | * |
33 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 33 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
34 | */ | 34 | */ |
35 | 35 | ||
@@ -853,7 +853,7 @@ int inflate_unzip(int in, int out) | |||
853 | /* Create the crc table */ | 853 | /* Create the crc table */ |
854 | gunzip_crc_table = crc32_filltable(0); | 854 | gunzip_crc_table = crc32_filltable(0); |
855 | gunzip_crc = ~0; | 855 | gunzip_crc = ~0; |
856 | 856 | ||
857 | /* Allocate space for buffer */ | 857 | /* Allocate space for buffer */ |
858 | bytebuffer = xmalloc(bytebuffer_max); | 858 | bytebuffer = xmalloc(bytebuffer_max); |
859 | 859 | ||
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c index 9d1ef5492..90f24ce9c 100644 --- a/console-tools/setlogcons.c +++ b/console-tools/setlogcons.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * setlogcons: Send kernel messages to the current console or to console N | 3 | * setlogcons: Send kernel messages to the current console or to console N |
4 | * | 4 | * |
5 | * Copyright (C) 2006 by Jan Kiszka <jan.kiszka@web.de> | 5 | * Copyright (C) 2006 by Jan Kiszka <jan.kiszka@web.de> |
6 | * | 6 | * |
diff --git a/coreutils/Config.in b/coreutils/Config.in index 07005b81a..20b5955d4 100644 --- a/coreutils/Config.in +++ b/coreutils/Config.in | |||
@@ -120,11 +120,11 @@ config CONFIG_FEATURE_DD_SIGNAL_HANDLING | |||
120 | default y | 120 | default y |
121 | depends on CONFIG_DD | 121 | depends on CONFIG_DD |
122 | help | 122 | help |
123 | sending a SIGUSR1 signal to a running `dd' process makes it | 123 | sending a SIGUSR1 signal to a running `dd' process makes it |
124 | print to standard error the number of records read and written | 124 | print to standard error the number of records read and written |
125 | so far, then to resume copying. | 125 | so far, then to resume copying. |
126 | 126 | ||
127 | $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid | 127 | $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid |
128 | 10899206+0 records in 10899206+0 records out | 128 | 10899206+0 records in 10899206+0 records out |
129 | 129 | ||
130 | config CONFIG_FEATURE_DD_IBS_OBS | 130 | config CONFIG_FEATURE_DD_IBS_OBS |
@@ -744,9 +744,9 @@ config CONFIG_FEATURE_AUTOWIDTH | |||
744 | depends on CONFIG_LS || CONFIG_MORE || CONFIG_TELNET | 744 | depends on CONFIG_LS || CONFIG_MORE || CONFIG_TELNET |
745 | help | 745 | help |
746 | This option allows utilities such as 'ls', 'more' and 'telnet' | 746 | This option allows utilities such as 'ls', 'more' and 'telnet' |
747 | to determine the width of the screen, which can allow them to | 747 | to determine the width of the screen, which can allow them to |
748 | display additional text or avoid wrapping text onto the next line. | 748 | display additional text or avoid wrapping text onto the next line. |
749 | If you leave this disabled, your utilities will be especially | 749 | If you leave this disabled, your utilities will be especially |
750 | primitive and will be unable to determine the current screen width. | 750 | primitive and will be unable to determine the current screen width. |
751 | 751 | ||
752 | comment "Common options for df, du, ls" | 752 | comment "Common options for df, du, ls" |
diff --git a/coreutils/cal.c b/coreutils/cal.c index 9628459fe..8996aa8c7 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c | |||
@@ -33,7 +33,7 @@ static const char days_in_month[] = { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | static const char sep1752[] = { | 35 | static const char sep1752[] = { |
36 | 1, 2, 14, 15, 16, | 36 | 1, 2, 14, 15, 16, |
37 | 17, 18, 19, 20, 21, 22, 23, | 37 | 17, 18, 19, 20, 21, 22, 23, |
38 | 24, 25, 26, 27, 28, 29, 30 | 38 | 24, 25, 26, 27, 28, 29, 30 |
39 | }; | 39 | }; |
@@ -207,7 +207,7 @@ static void day_array(int month, int year, int *days) | |||
207 | 207 | ||
208 | if ((month == 9) && (year == 1752)) { | 208 | if ((month == 9) && (year == 1752)) { |
209 | size_t oday = 0; | 209 | size_t oday = 0; |
210 | 210 | ||
211 | j_offset = julian * 244; | 211 | j_offset = julian * 244; |
212 | do { | 212 | do { |
213 | days[oday+2] = sep1752[oday] + j_offset; | 213 | days[oday+2] = sep1752[oday] + j_offset; |
diff --git a/coreutils/cksum.c b/coreutils/cksum.c index 9a45fd656..9bec3bff4 100644 --- a/coreutils/cksum.c +++ b/coreutils/cksum.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | int cksum_main(int argc, char **argv) | 11 | int cksum_main(int argc, char **argv) |
12 | { | 12 | { |
13 | 13 | ||
14 | uint32_t *crc32_table = crc32_filltable(1); | 14 | uint32_t *crc32_table = crc32_filltable(1); |
15 | 15 | ||
16 | FILE *fp; | 16 | FILE *fp; |
diff --git a/coreutils/cp.c b/coreutils/cp.c index f5baa0d62..85086aab5 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
@@ -77,7 +77,7 @@ int cp_main(int argc, char **argv) | |||
77 | /* If there are only two arguments and... */ | 77 | /* If there are only two arguments and... */ |
78 | if (optind + 2 == argc) { | 78 | if (optind + 2 == argc) { |
79 | s_flags = cp_mv_stat2(*argv, &source_stat, | 79 | s_flags = cp_mv_stat2(*argv, &source_stat, |
80 | (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); | 80 | (flags & FILEUTILS_DEREFERENCE) ? stat : lstat); |
81 | if ((s_flags < 0) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) { | 81 | if ((s_flags < 0) || ((d_flags = cp_mv_stat(last, &dest_stat)) < 0)) { |
82 | exit(EXIT_FAILURE); | 82 | exit(EXIT_FAILURE); |
83 | } | 83 | } |
diff --git a/coreutils/dd.c b/coreutils/dd.c index a9536a584..8d859ef5c 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -200,7 +200,7 @@ int dd_main(int argc, char **argv) | |||
200 | out_part++; | 200 | out_part++; |
201 | } | 201 | } |
202 | } | 202 | } |
203 | 203 | ||
204 | if (ENABLE_FEATURE_DD_IBS_OBS && oc) { | 204 | if (ENABLE_FEATURE_DD_IBS_OBS && oc) { |
205 | xwrite(ofd, obuf, oc); | 205 | xwrite(ofd, obuf, oc); |
206 | out_part++; | 206 | out_part++; |
diff --git a/coreutils/diff.c b/coreutils/diff.c index 22c157412..3c409b2cf 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c | |||
@@ -820,8 +820,8 @@ static void output(char *file1, FILE * f1, char *file2, FILE * f2) | |||
820 | } | 820 | } |
821 | 821 | ||
822 | /* | 822 | /* |
823 | * The following code uses an algorithm due to Harold Stone, | 823 | * The following code uses an algorithm due to Harold Stone, |
824 | * which finds a pair of longest identical subsequences in | 824 | * which finds a pair of longest identical subsequences in |
825 | * the two files. | 825 | * the two files. |
826 | * | 826 | * |
827 | * The major goal is to generate the match vector J. | 827 | * The major goal is to generate the match vector J. |
diff --git a/coreutils/head.c b/coreutils/head.c index e961ca6b6..8dc6ee0b4 100644 --- a/coreutils/head.c +++ b/coreutils/head.c | |||
@@ -28,7 +28,7 @@ static const struct suffix_mult head_suffixes[] = { | |||
28 | { NULL, 0 } | 28 | { NULL, 0 } |
29 | }; | 29 | }; |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | static const char header_fmt_str[] = "\n==> %s <==\n"; | 32 | static const char header_fmt_str[] = "\n==> %s <==\n"; |
33 | 33 | ||
34 | int head_main(int argc, char **argv) | 34 | int head_main(int argc, char **argv) |
@@ -83,8 +83,8 @@ int head_main(int argc, char **argv) | |||
83 | #if !ENABLE_FEATURE_FANCY_HEAD | 83 | #if !ENABLE_FEATURE_FANCY_HEAD |
84 | count = bb_xgetularg10(p); | 84 | count = bb_xgetularg10(p); |
85 | #else | 85 | #else |
86 | count = bb_xgetularg_bnd_sfx(p, 10, | 86 | count = bb_xgetularg_bnd_sfx(p, 10, |
87 | 0, ULONG_MAX, | 87 | 0, ULONG_MAX, |
88 | head_suffixes); | 88 | head_suffixes); |
89 | #endif | 89 | #endif |
90 | break; | 90 | break; |
diff --git a/coreutils/ls.c b/coreutils/ls.c index 828127a4a..0099f18fe 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -196,7 +196,7 @@ static struct dnode *my_stat(char *fullname, char *name) | |||
196 | #endif | 196 | #endif |
197 | { | 197 | { |
198 | #ifdef CONFIG_SELINUX | 198 | #ifdef CONFIG_SELINUX |
199 | if (is_selinux_enabled()) { | 199 | if (is_selinux_enabled()) { |
200 | lgetfilecon(fullname,&sid); | 200 | lgetfilecon(fullname,&sid); |
201 | } | 201 | } |
202 | #endif | 202 | #endif |
diff --git a/coreutils/nohup.c b/coreutils/nohup.c index 5dd90adcc..9e9150d33 100644 --- a/coreutils/nohup.c +++ b/coreutils/nohup.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* nohup - invoke a utility immune to hangups. | 2 | /* nohup - invoke a utility immune to hangups. |
3 | * | 3 | * |
4 | * Busybox version based on nohup specification at | 4 | * Busybox version based on nohup specification at |
5 | * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html | 5 | * http://www.opengroup.org/onlinepubs/007904975/utilities/nohup.html |
6 | * | 6 | * |
7 | * Copyright 2006 Rob Landley <rob@landley.net> | 7 | * Copyright 2006 Rob Landley <rob@landley.net> |
8 | * | 8 | * |
9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
10 | */ | 10 | */ |
11 | 11 | ||
diff --git a/coreutils/seq.c b/coreutils/seq.c index 0df094001..79fafbc8b 100644 --- a/coreutils/seq.c +++ b/coreutils/seq.c | |||
@@ -14,7 +14,7 @@ | |||
14 | int seq_main(int argc, char **argv) | 14 | int seq_main(int argc, char **argv) |
15 | { | 15 | { |
16 | double last, first, increment, i; | 16 | double last, first, increment, i; |
17 | 17 | ||
18 | first = increment = 1; | 18 | first = increment = 1; |
19 | switch (argc) { | 19 | switch (argc) { |
20 | case 4: | 20 | case 4: |
diff --git a/coreutils/sort.c b/coreutils/sort.c index ea7752d2a..d86f8dcde 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 2004 by Rob Landley <rob@landley.net> | 5 | * Copyright (C) 2004 by Rob Landley <rob@landley.net> |
6 | * | 6 | * |
7 | * MAINTAINER: Rob Landley <rob@landley.net> | 7 | * MAINTAINER: Rob Landley <rob@landley.net> |
8 | * | 8 | * |
9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
10 | * | 10 | * |
11 | * See SuS3 sort standard at: | 11 | * See SuS3 sort standard at: |
diff --git a/coreutils/who.c b/coreutils/who.c index 95ad21953..7566bfddc 100644 --- a/coreutils/who.c +++ b/coreutils/who.c | |||
@@ -24,7 +24,7 @@ | |||
24 | static const char * idle_string (time_t t) | 24 | static const char * idle_string (time_t t) |
25 | { | 25 | { |
26 | static char str[6]; | 26 | static char str[6]; |
27 | 27 | ||
28 | time_t s = time(NULL) - t; | 28 | time_t s = time(NULL) - t; |
29 | 29 | ||
30 | if (s < 60) | 30 | if (s < 60) |
@@ -43,11 +43,11 @@ int who_main(int argc, char **argv) | |||
43 | struct utmp *ut; | 43 | struct utmp *ut; |
44 | struct stat st; | 44 | struct stat st; |
45 | char *name; | 45 | char *name; |
46 | 46 | ||
47 | if (argc > 1) { | 47 | if (argc > 1) { |
48 | bb_show_usage(); | 48 | bb_show_usage(); |
49 | } | 49 | } |
50 | 50 | ||
51 | setutent(); | 51 | setutent(); |
52 | printf("USER TTY IDLE TIME HOST\n"); | 52 | printf("USER TTY IDLE TIME HOST\n"); |
53 | while ((ut = getutent()) != NULL) { | 53 | while ((ut = getutent()) != NULL) { |
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index e0c8f2d9b..dcff1dd86 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
@@ -45,7 +45,7 @@ static int pid_is_exec(pid_t pid, const char *name) | |||
45 | sprintf(buf, "/proc/%d/exe", pid); | 45 | sprintf(buf, "/proc/%d/exe", pid); |
46 | execbuf = xstrdup(name); | 46 | execbuf = xstrdup(name); |
47 | readlink(buf, execbuf, strlen(name)+1); | 47 | readlink(buf, execbuf, strlen(name)+1); |
48 | 48 | ||
49 | equal = ! strcmp(execbuf, name); | 49 | equal = ! strcmp(execbuf, name); |
50 | if (ENABLE_FEATURE_CLEAN_UP) | 50 | if (ENABLE_FEATURE_CLEAN_UP) |
51 | free(execbuf); | 51 | free(execbuf); |
diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html index 43af60bce..5def5a35c 100644 --- a/docs/busybox.net/news.html +++ b/docs/busybox.net/news.html | |||
@@ -62,7 +62,7 @@ | |||
62 | will be released before then if more bug fixes crop up. (The new plan is | 62 | will be released before then if more bug fixes crop up. (The new plan is |
63 | to have a 1.x.0 new development release every 3 months, with 1.x.y stable | 63 | to have a 1.x.0 new development release every 3 months, with 1.x.y stable |
64 | bugfix only releases based on that as appropriate.)</p> | 64 | bugfix only releases based on that as appropriate.)</p> |
65 | 65 | ||
66 | <li><b>27 March 2006 -- Software Freedom Law Center representing BusyBox and uClibc</b> | 66 | <li><b>27 March 2006 -- Software Freedom Law Center representing BusyBox and uClibc</b> |
67 | <p>One issue Erik Andersen wanted to resolve when handing off BusyBox | 67 | <p>One issue Erik Andersen wanted to resolve when handing off BusyBox |
68 | maintainership to Rob Landley was license enforcement. BusyBox and | 68 | maintainership to Rob Landley was license enforcement. BusyBox and |
diff --git a/docs/busybox.net/oldnews.html b/docs/busybox.net/oldnews.html index 3ab629e79..1017b6975 100644 --- a/docs/busybox.net/oldnews.html +++ b/docs/busybox.net/oldnews.html | |||
@@ -4,7 +4,7 @@ | |||
4 | <ul> | 4 | <ul> |
5 | <li><b>31 October 2005 -- 1.1.0-pre1</b> | 5 | <li><b>31 October 2005 -- 1.1.0-pre1</b> |
6 | <p>The development branch of busybox is stable enough for wider testing, so | 6 | <p>The development branch of busybox is stable enough for wider testing, so |
7 | you can now | 7 | you can now |
8 | <a href="http://www.busybox.net/downloads/busybox-1.1.0-pre1.tar.bz2">download</a>, | 8 | <a href="http://www.busybox.net/downloads/busybox-1.1.0-pre1.tar.bz2">download</a>, |
9 | the first prerelease of 1.1.0. This prerelease includes a lot of | 9 | the first prerelease of 1.1.0. This prerelease includes a lot of |
10 | <a href="http://www.busybox.net/downloads/BusyBox.html">new | 10 | <a href="http://www.busybox.net/downloads/BusyBox.html">new |
@@ -27,7 +27,7 @@ | |||
27 | developers of BusyBox are busy people, and have only so much they can keep | 27 | developers of BusyBox are busy people, and have only so much they can keep |
28 | in their brains at a time. In my case, I'm lucky if I can remember my own | 28 | in their brains at a time. In my case, I'm lucky if I can remember my own |
29 | name, much less a bug report posted last week... To prevent your bug report | 29 | name, much less a bug report posted last week... To prevent your bug report |
30 | from getting lost, if you find a bug in BusyBox, please use the | 30 | from getting lost, if you find a bug in BusyBox, please use the |
31 | <a href="http://bugs.busybox.net/">shiny new Bug and Patch Tracking System</a> | 31 | <a href="http://bugs.busybox.net/">shiny new Bug and Patch Tracking System</a> |
32 | to post all the gory details. | 32 | to post all the gory details. |
33 | 33 | ||
@@ -856,7 +856,7 @@ image</a>. Here's how you use it: | |||
856 | 856 | ||
857 | <pre> | 857 | <pre> |
858 | mount ./busybox.floppy.img /mnt -o loop -t msdos | 858 | mount ./busybox.floppy.img /mnt -o loop -t msdos |
859 | cp /mnt/initrd.gz /tmp | 859 | cp /mnt/initrd.gz /tmp |
860 | umount /mnt | 860 | umount /mnt |
861 | gunzip /tmp/initrd.gz | 861 | gunzip /tmp/initrd.gz |
862 | mount /tmp/initrd /mnt -o loop -t minix | 862 | mount /tmp/initrd /mnt -o loop -t minix |
diff --git a/docs/busybox.net/products.html b/docs/busybox.net/products.html index 75ff6b929..daf8add20 100644 --- a/docs/busybox.net/products.html +++ b/docs/busybox.net/products.html | |||
@@ -159,7 +159,7 @@ Hat Linux</a> | |||
159 | with source <a href="http://now-portal.c-lab.de/projects/gigaset/">here, I think...</a> | 159 | with source <a href="http://now-portal.c-lab.de/projects/gigaset/">here, I think...</a> |
160 | with some details <a href="http://heinz.hippenstiel.org/familie/hp/hobby/gigaset_se515dsl.html">here.</a> | 160 | with some details <a href="http://heinz.hippenstiel.org/familie/hp/hobby/gigaset_se515dsl.html">here.</a> |
161 | </li><li><a href="http://frwt.stim.ru/">Free Remote Windows Terminal</a> | 161 | </li><li><a href="http://frwt.stim.ru/">Free Remote Windows Terminal</a> |
162 | 162 | ||
163 | </li><li><a href="http://www.zyxel.com/">ZyXEL Routers</a> | 163 | </li><li><a href="http://www.zyxel.com/">ZyXEL Routers</a> |
164 | 164 | ||
165 | </li> | 165 | </li> |
diff --git a/docs/busybox.net/shame.html b/docs/busybox.net/shame.html index 3f3edafb1..d9da44b69 100644 --- a/docs/busybox.net/shame.html +++ b/docs/busybox.net/shame.html | |||
@@ -71,7 +71,7 @@ the busybox license by releasing the source code with your product. | |||
71 | </li><li><a href="http://www.recospa.it/mdpro1/index.php">United *DVX4066 mpeg4 capable DVD players</a> | 71 | </li><li><a href="http://www.recospa.it/mdpro1/index.php">United *DVX4066 mpeg4 capable DVD players</a> |
72 | </li><li><a href="http://www.a-link.com/RR64AP.html">Avaks alink Roadrunner 64</a> | 72 | </li><li><a href="http://www.a-link.com/RR64AP.html">Avaks alink Roadrunner 64</a> |
73 | <br> Partial source available, based on source distributed under NDA from <a href="http://www.lsilogic.com/products/dsl_platform_solutions/hb_linuxr2_2.html"> LSILogic</a>. Why the NDA LSILogic, what are you hiding ? | 73 | <br> Partial source available, based on source distributed under NDA from <a href="http://www.lsilogic.com/products/dsl_platform_solutions/hb_linuxr2_2.html"> LSILogic</a>. Why the NDA LSILogic, what are you hiding ? |
74 | <br>To verify the Avaks infrigment see my slashdot <a href="http://slashdot.org/~bug1/journal/">journal</a>. | 74 | <br>To verify the Avaks infrigment see my slashdot <a href="http://slashdot.org/~bug1/journal/">journal</a>. |
75 | <br>The ZipIt wireless IM device appears to be using Busybox-1.00-pre1 in the ramdisk, however no source has been made available. | 75 | <br>The ZipIt wireless IM device appears to be using Busybox-1.00-pre1 in the ramdisk, however no source has been made available. |
76 | </li><li>Undoubtedly there are others... Please report them so we can shame them (or if necessary sue them) into compliance. | 76 | </li><li>Undoubtedly there are others... Please report them so we can shame them (or if necessary sue them) into compliance. |
77 | 77 | ||
diff --git a/docs/busybox.net/tinyutils.html b/docs/busybox.net/tinyutils.html index 47e032197..9122d6e35 100644 --- a/docs/busybox.net/tinyutils.html +++ b/docs/busybox.net/tinyutils.html | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | <h3>External Tiny Utilities</h3> | 4 | <h3>External Tiny Utilities</h3> |
5 | 5 | ||
6 | This is a list of tiny utilities whose functionality is not provided by | 6 | This is a list of tiny utilities whose functionality is not provided by |
7 | busybox. If you have additional suggestions, please send an e-mail to our | 7 | busybox. If you have additional suggestions, please send an e-mail to our |
8 | dev mailing list. | 8 | dev mailing list. |
9 | 9 | ||
10 | <br><br> | 10 | <br><br> |
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h index 54721b221..4fa9f6fdf 100644 --- a/e2fsprogs/blkid/blkid.h +++ b/e2fsprogs/blkid/blkid.h | |||
@@ -56,7 +56,7 @@ extern int blkid_get_cache(blkid_cache *cache, const char *filename); | |||
56 | extern const char *blkid_dev_devname(blkid_dev dev); | 56 | extern const char *blkid_dev_devname(blkid_dev dev); |
57 | 57 | ||
58 | extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); | 58 | extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); |
59 | extern int blkid_dev_set_search(blkid_dev_iterate iter, | 59 | extern int blkid_dev_set_search(blkid_dev_iterate iter, |
60 | char *search_type, char *search_value); | 60 | char *search_type, char *search_value); |
61 | extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); | 61 | extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); |
62 | extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); | 62 | extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); |
@@ -90,7 +90,7 @@ extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev); | |||
90 | extern int blkid_tag_next(blkid_tag_iterate iterate, | 90 | extern int blkid_tag_next(blkid_tag_iterate iterate, |
91 | const char **type, const char **value); | 91 | const char **type, const char **value); |
92 | extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); | 92 | extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); |
93 | extern int blkid_dev_has_tag(blkid_dev dev, const char *type, | 93 | extern int blkid_dev_has_tag(blkid_dev dev, const char *type, |
94 | const char *value); | 94 | const char *value); |
95 | extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, | 95 | extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, |
96 | const char *type, | 96 | const char *type, |
diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c index 6d99504af..c2b756c81 100644 --- a/e2fsprogs/blkid/dev.c +++ b/e2fsprogs/blkid/dev.c | |||
@@ -76,8 +76,8 @@ void blkid_debug_dump_dev(blkid_dev dev) | |||
76 | 76 | ||
77 | list_for_each(p, &dev->bid_tags) { | 77 | list_for_each(p, &dev->bid_tags) { |
78 | blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); | 78 | blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); |
79 | if (tag) | 79 | if (tag) |
80 | printf(" tag: %s=\"%s\"\n", tag->bit_name, | 80 | printf(" tag: %s=\"%s\"\n", tag->bit_name, |
81 | tag->bit_val); | 81 | tag->bit_val); |
82 | else | 82 | else |
83 | printf(" tag: NULL\n"); | 83 | printf(" tag: NULL\n"); |
@@ -177,7 +177,7 @@ int main(int argc, char **argv) | |||
177 | case 'm': | 177 | case 'm': |
178 | blkid_debug_mask = strtoul (optarg, &tmp, 0); | 178 | blkid_debug_mask = strtoul (optarg, &tmp, 0); |
179 | if (*tmp) { | 179 | if (*tmp) { |
180 | fprintf(stderr, "Invalid debug mask: %d\n", | 180 | fprintf(stderr, "Invalid debug mask: %d\n", |
181 | optarg); | 181 | optarg); |
182 | exit(1); | 182 | exit(1); |
183 | } | 183 | } |
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c index 211569779..a2165efee 100644 --- a/e2fsprogs/blkid/probe.c +++ b/e2fsprogs/blkid/probe.c | |||
@@ -99,7 +99,7 @@ static void get_ext2_info(blkid_dev dev, unsigned char *buf) | |||
99 | static int probe_ext3(int fd __BLKID_ATTR((unused)), | 99 | static int probe_ext3(int fd __BLKID_ATTR((unused)), |
100 | blkid_cache cache __BLKID_ATTR((unused)), | 100 | blkid_cache cache __BLKID_ATTR((unused)), |
101 | blkid_dev dev, | 101 | blkid_dev dev, |
102 | const struct blkid_magic *id __BLKID_ATTR((unused)), | 102 | const struct blkid_magic *id __BLKID_ATTR((unused)), |
103 | unsigned char *buf) | 103 | unsigned char *buf) |
104 | { | 104 | { |
105 | struct ext2_super_block *es; | 105 | struct ext2_super_block *es; |
@@ -126,7 +126,7 @@ static int probe_ext3(int fd __BLKID_ATTR((unused)), | |||
126 | static int probe_ext2(int fd __BLKID_ATTR((unused)), | 126 | static int probe_ext2(int fd __BLKID_ATTR((unused)), |
127 | blkid_cache cache __BLKID_ATTR((unused)), | 127 | blkid_cache cache __BLKID_ATTR((unused)), |
128 | blkid_dev dev, | 128 | blkid_dev dev, |
129 | const struct blkid_magic *id __BLKID_ATTR((unused)), | 129 | const struct blkid_magic *id __BLKID_ATTR((unused)), |
130 | unsigned char *buf) | 130 | unsigned char *buf) |
131 | { | 131 | { |
132 | struct ext2_super_block *es; | 132 | struct ext2_super_block *es; |
@@ -305,10 +305,10 @@ static int probe_romfs(int fd __BLKID_ATTR((unused)), | |||
305 | return 0; | 305 | return 0; |
306 | } | 306 | } |
307 | 307 | ||
308 | static int probe_cramfs(int fd __BLKID_ATTR((unused)), | 308 | static int probe_cramfs(int fd __BLKID_ATTR((unused)), |
309 | blkid_cache cache __BLKID_ATTR((unused)), | 309 | blkid_cache cache __BLKID_ATTR((unused)), |
310 | blkid_dev dev, | 310 | blkid_dev dev, |
311 | const struct blkid_magic *id __BLKID_ATTR((unused)), | 311 | const struct blkid_magic *id __BLKID_ATTR((unused)), |
312 | unsigned char *buf) | 312 | unsigned char *buf) |
313 | { | 313 | { |
314 | struct cramfs_super_block *csb; | 314 | struct cramfs_super_block *csb; |
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c index e954c6d94..624c907f3 100644 --- a/e2fsprogs/blkid/read.c +++ b/e2fsprogs/blkid/read.c | |||
@@ -432,7 +432,7 @@ static void debug_dump_dev(blkid_dev dev) | |||
432 | list_for_each(p, &dev->bid_tags) { | 432 | list_for_each(p, &dev->bid_tags) { |
433 | blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); | 433 | blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); |
434 | if (tag) | 434 | if (tag) |
435 | printf(" tag: %s=\"%s\"\n", tag->bit_name, | 435 | printf(" tag: %s=\"%s\"\n", tag->bit_name, |
436 | tag->bit_val); | 436 | tag->bit_val); |
437 | else | 437 | else |
438 | printf(" tag: NULL\n"); | 438 | printf(" tag: NULL\n"); |
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c index ff10b28e2..09712bab7 100644 --- a/e2fsprogs/blkid/tag.c +++ b/e2fsprogs/blkid/tag.c | |||
@@ -355,7 +355,7 @@ extern int optind; | |||
355 | void usage(char *prog) | 355 | void usage(char *prog) |
356 | { | 356 | { |
357 | fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " | 357 | fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " |
358 | "[type value]\n", | 358 | "[type value]\n", |
359 | prog); | 359 | prog); |
360 | fprintf(stderr, "\tList all tags for a device and exit\n", prog); | 360 | fprintf(stderr, "\tList all tags for a device and exit\n", prog); |
361 | exit(1); | 361 | exit(1); |
@@ -383,7 +383,7 @@ int main(int argc, char **argv) | |||
383 | case 'm': | 383 | case 'm': |
384 | blkid_debug_mask = strtoul (optarg, &tmp, 0); | 384 | blkid_debug_mask = strtoul (optarg, &tmp, 0); |
385 | if (*tmp) { | 385 | if (*tmp) { |
386 | fprintf(stderr, "Invalid debug mask: %d\n", | 386 | fprintf(stderr, "Invalid debug mask: %d\n", |
387 | optarg); | 387 | optarg); |
388 | exit(1); | 388 | exit(1); |
389 | } | 389 | } |
@@ -414,7 +414,7 @@ int main(int argc, char **argv) | |||
414 | if (search_type) { | 414 | if (search_type) { |
415 | found = blkid_dev_has_tag(dev, search_type, search_value); | 415 | found = blkid_dev_has_tag(dev, search_type, search_value); |
416 | printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev), | 416 | printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev), |
417 | search_type, search_value ? search_value : "NULL", | 417 | search_type, search_value ? search_value : "NULL", |
418 | found ? "FOUND" : "NOT FOUND"); | 418 | found ? "FOUND" : "NOT FOUND"); |
419 | return(!found); | 419 | return(!found); |
420 | } | 420 | } |
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index 985f9fd5c..7ffc0d230 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c | |||
@@ -3661,7 +3661,7 @@ static void e2fsck_pass1(e2fsck_t ctx) | |||
3661 | e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode, | 3661 | e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode, |
3662 | "recreate inode"); | 3662 | "recreate inode"); |
3663 | inode->i_mtime = time(0); | 3663 | inode->i_mtime = time(0); |
3664 | e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode, | 3664 | e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode, |
3665 | "recreate inode"); | 3665 | "recreate inode"); |
3666 | fs->block_map = save_bmap; | 3666 | fs->block_map = save_bmap; |
3667 | ctx->flags &= ~E2F_FLAG_RESIZE_INODE; | 3667 | ctx->flags &= ~E2F_FLAG_RESIZE_INODE; |
diff --git a/e2fsprogs/e2p/ls.c b/e2fsprogs/e2p/ls.c index e2a1ccb3d..9d29db6af 100644 --- a/e2fsprogs/e2p/ls.c +++ b/e2fsprogs/e2p/ls.c | |||
@@ -26,14 +26,14 @@ static void print_user(unsigned short uid, FILE *f) | |||
26 | { | 26 | { |
27 | struct passwd *pw = getpwuid(uid); | 27 | struct passwd *pw = getpwuid(uid); |
28 | fprintf(f, "%u (user %s)\n", uid, | 28 | fprintf(f, "%u (user %s)\n", uid, |
29 | (pw == NULL ? "unknown" : pw->pw_name)); | 29 | (pw == NULL ? "unknown" : pw->pw_name)); |
30 | } | 30 | } |
31 | 31 | ||
32 | static void print_group(unsigned short gid, FILE *f) | 32 | static void print_group(unsigned short gid, FILE *f) |
33 | { | 33 | { |
34 | struct group *gr = getgrgid(gid); | 34 | struct group *gr = getgrgid(gid); |
35 | fprintf(f, "%u (group %s)\n", gid, | 35 | fprintf(f, "%u (group %s)\n", gid, |
36 | (gr == NULL ? "unknown" : gr->gr_name)); | 36 | (gr == NULL ? "unknown" : gr->gr_name)); |
37 | } | 37 | } |
38 | 38 | ||
39 | #define MONTH_INT (86400 * 30) | 39 | #define MONTH_INT (86400 * 30) |
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c index 687f18567..72ce57458 100644 --- a/e2fsprogs/mke2fs.c +++ b/e2fsprogs/mke2fs.c | |||
@@ -737,7 +737,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param, | |||
737 | } | 737 | } |
738 | if (resize <= sb_param->s_blocks_count) { | 738 | if (resize <= sb_param->s_blocks_count) { |
739 | bb_error_msg("The resize maximum must be greater " | 739 | bb_error_msg("The resize maximum must be greater " |
740 | "than the filesystem size"); | 740 | "than the filesystem size"); |
741 | r_usage++; | 741 | r_usage++; |
742 | continue; | 742 | continue; |
743 | } | 743 | } |
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c index 113ef9c8f..efb128f59 100644 --- a/e2fsprogs/util.c +++ b/e2fsprogs/util.c | |||
@@ -99,7 +99,7 @@ force_check: | |||
99 | bb_error_msg_and_die("it's not safe to run badblocks!"); | 99 | bb_error_msg_and_die("it's not safe to run badblocks!"); |
100 | } | 100 | } |
101 | 101 | ||
102 | if (mount_flags & EXT2_MF_BUSY) { | 102 | if (mount_flags & EXT2_MF_BUSY) { |
103 | bb_error_msg("%s is apparently in use by the system", device); | 103 | bb_error_msg("%s is apparently in use by the system", device); |
104 | goto force_check; | 104 | goto force_check; |
105 | } | 105 | } |
diff --git a/editors/sed.c b/editors/sed.c index 9f3af33ed..f8e3720b5 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
@@ -103,7 +103,7 @@ struct sed_globals | |||
103 | 103 | ||
104 | regmatch_t regmatch[10]; | 104 | regmatch_t regmatch[10]; |
105 | regex_t *previous_regex_ptr; | 105 | regex_t *previous_regex_ptr; |
106 | 106 | ||
107 | /* linked list of sed commands */ | 107 | /* linked list of sed commands */ |
108 | sed_cmd_t sed_cmd_head, *sed_cmd_tail; | 108 | sed_cmd_t sed_cmd_head, *sed_cmd_tail; |
109 | 109 | ||
@@ -780,7 +780,7 @@ restart: | |||
780 | || (sed_cmd->beg_line > 0 && (sed_cmd->beg_line == linenum)) | 780 | || (sed_cmd->beg_line > 0 && (sed_cmd->beg_line == linenum)) |
781 | 781 | ||
782 | /* Or does this line match our begin address regex? */ | 782 | /* Or does this line match our begin address regex? */ |
783 | || (sed_cmd->beg_match && | 783 | || (sed_cmd->beg_match && |
784 | !regexec(sed_cmd->beg_match, pattern_space, 0, NULL, 0)) | 784 | !regexec(sed_cmd->beg_match, pattern_space, 0, NULL, 0)) |
785 | 785 | ||
786 | /* Or did we match last line of input? */ | 786 | /* Or did we match last line of input? */ |
diff --git a/editors/vi.c b/editors/vi.c index 3cbf6937d..8ff118ffb 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -3923,4 +3923,4 @@ static void crash_test() | |||
3923 | } | 3923 | } |
3924 | return; | 3924 | return; |
3925 | } | 3925 | } |
3926 | #endif /* CONFIG_FEATURE_VI_CRASHME */ | 3926 | #endif /* CONFIG_FEATURE_VI_CRASHME */ |
diff --git a/examples/depmod.pl b/examples/depmod.pl index 93c0b3dab..b2bf54713 100755 --- a/examples/depmod.pl +++ b/examples/depmod.pl | |||
@@ -34,7 +34,7 @@ my $dep = {}; | |||
34 | my $mod = {}; | 34 | my $mod = {}; |
35 | 35 | ||
36 | my $usage = <<TXT; | 36 | my $usage = <<TXT; |
37 | $0 -b basedir { -k <vmlinux> | -F <System.map> } [options]... | 37 | $0 -b basedir { -k <vmlinux> | -F <System.map> } [options]... |
38 | Where: | 38 | Where: |
39 | -h --help : Show this help screen | 39 | -h --help : Show this help screen |
40 | -b --basedir : Modules base directory (e.g /lib/modules/<2.x.y>) | 40 | -b --basedir : Modules base directory (e.g /lib/modules/<2.x.y>) |
@@ -211,7 +211,7 @@ __END__ | |||
211 | 211 | ||
212 | depmod.pl - a cross platform script to generate kernel module | 212 | depmod.pl - a cross platform script to generate kernel module |
213 | dependency lists (modules.conf) which can then be used by modprobe | 213 | dependency lists (modules.conf) which can then be used by modprobe |
214 | on the target platform. | 214 | on the target platform. |
215 | 215 | ||
216 | It supports Linux 2.4 and 2.6 styles of modules.conf (auto-detected) | 216 | It supports Linux 2.4 and 2.6 styles of modules.conf (auto-detected) |
217 | 217 | ||
@@ -245,7 +245,7 @@ This displays the help message. | |||
245 | =item B<-b --basedir> | 245 | =item B<-b --basedir> |
246 | 246 | ||
247 | The base directory uner which the target's modules will be found. This | 247 | The base directory uner which the target's modules will be found. This |
248 | defaults to the /lib/modules directory. | 248 | defaults to the /lib/modules directory. |
249 | 249 | ||
250 | If you don't specify the kernel version, this script will search for | 250 | If you don't specify the kernel version, this script will search for |
251 | one under the specified based directory and use the first thing that | 251 | one under the specified based directory and use the first thing that |
diff --git a/include/platform.h b/include/platform.h index fdaf50920..91f43f30b 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #undef __GNUC_PREREQ | 11 | #undef __GNUC_PREREQ |
12 | #if defined __GNUC__ && defined __GNUC_MINOR__ | 12 | #if defined __GNUC__ && defined __GNUC_MINOR__ |
13 | # define __GNUC_PREREQ(maj, min) \ | 13 | # define __GNUC_PREREQ(maj, min) \ |
14 | ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) | 14 | ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) |
15 | #else | 15 | #else |
16 | # define __GNUC_PREREQ(maj, min) 0 | 16 | # define __GNUC_PREREQ(maj, min) 0 |
17 | #endif | 17 | #endif |
@@ -264,7 +264,7 @@ typedef unsigned long long int uintmax_t; | |||
264 | #define MS_SHARED (1<<20) | 264 | #define MS_SHARED (1<<20) |
265 | #endif | 265 | #endif |
266 | 266 | ||
267 | 267 | ||
268 | #if !defined(BLKSSZGET) | 268 | #if !defined(BLKSSZGET) |
269 | #define BLKSSZGET _IO(0x12, 104) | 269 | #define BLKSSZGET _IO(0x12, 104) |
270 | #endif | 270 | #endif |
diff --git a/include/usage.h b/include/usage.h index a2b8c0ec7..9da1bbd94 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -499,9 +499,9 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
499 | "\t-s SIZE\t\tUse a buffer of size SIZE" | 499 | "\t-s SIZE\t\tUse a buffer of size SIZE" |
500 | 500 | ||
501 | #define dnsd_trivial_usage \ | 501 | #define dnsd_trivial_usage \ |
502 | "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]" | 502 | "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]" |
503 | #define dnsd_full_usage \ | 503 | #define dnsd_full_usage \ |
504 | "Small and static DNS server daemon\n\n" \ | 504 | "Small and static DNS server daemon\n\n" \ |
505 | "Options:\n" \ | 505 | "Options:\n" \ |
506 | "\t-c\t\tconfig filename\n" \ | 506 | "\t-c\t\tconfig filename\n" \ |
507 | "\t-t\t\tTTL in seconds\n" \ | 507 | "\t-t\t\tTTL in seconds\n" \ |
@@ -2058,7 +2058,7 @@ USE_FEATURE_MDEV_CONFIG( \ | |||
2058 | "$ mount /tmp/diskimage /opt -t ext2 -o loop\n" \ | 2058 | "$ mount /tmp/diskimage /opt -t ext2 -o loop\n" \ |
2059 | "$ mount cd_image.iso mydir\n" | 2059 | "$ mount cd_image.iso mydir\n" |
2060 | #define mount_notes_usage \ | 2060 | #define mount_notes_usage \ |
2061 | "Returns 0 for success, number of failed mounts for -a, or errno for one mount." | 2061 | "Returns 0 for success, number of failed mounts for -a, or errno for one mount." |
2062 | 2062 | ||
2063 | #define mountpoint_trivial_usage \ | 2063 | #define mountpoint_trivial_usage \ |
2064 | "[-q] <[-d] DIR | -x DEVICE>" | 2064 | "[-q] <[-d] DIR | -x DEVICE>" |
diff --git a/include/xregex.h b/include/xregex.h index 188e90ff6..4185818a8 100644 --- a/include/xregex.h +++ b/include/xregex.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Based in part on code from sash, Copyright (c) 1999 by David I. Bell | 6 | * Based in part on code from sash, Copyright (c) 1999 by David I. Bell |
7 | * Permission has been granted to redistribute this code under the GPL. | 7 | * Permission has been granted to redistribute this code under the GPL. |
8 | * | 8 | * |
9 | * Licensed under GPLv2 or later, see file License in this tarball for details. | 9 | * Licensed under GPLv2 or later, see file License in this tarball for details. |
10 | */ | 10 | */ |
11 | #ifndef __BB_REGEX__ | 11 | #ifndef __BB_REGEX__ |
diff --git a/libbb/crc32.c b/libbb/crc32.c index 538a13622..1e4a57e8a 100644 --- a/libbb/crc32.c +++ b/libbb/crc32.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * very well-known) | 6 | * very well-known) |
7 | * | 7 | * |
8 | * The following function creates a CRC32 table depending on whether | 8 | * The following function creates a CRC32 table depending on whether |
9 | * a big-endian (0x04c11db7) or little-endian (0xedb88320) CRC32 is | 9 | * a big-endian (0x04c11db7) or little-endian (0xedb88320) CRC32 is |
10 | * required. Admittedly, there are other CRC32 polynomials floating | 10 | * required. Admittedly, there are other CRC32 polynomials floating |
11 | * around, but Busybox doesn't use them. | 11 | * around, but Busybox doesn't use them. |
12 | * | 12 | * |
@@ -18,12 +18,12 @@ | |||
18 | 18 | ||
19 | uint32_t *crc32_filltable(int endian) | 19 | uint32_t *crc32_filltable(int endian) |
20 | { | 20 | { |
21 | 21 | ||
22 | uint32_t *crc_table = xmalloc(256 * sizeof(uint32_t)); | 22 | uint32_t *crc_table = xmalloc(256 * sizeof(uint32_t)); |
23 | uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320; | 23 | uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320; |
24 | uint32_t c; | 24 | uint32_t c; |
25 | int i, j; | 25 | int i, j; |
26 | 26 | ||
27 | for (i = 0; i < 256; i++) { | 27 | for (i = 0; i < 256; i++) { |
28 | c = endian ? (i << 24) : i; | 28 | c = endian ? (i << 24) : i; |
29 | for (j = 8; j; j--) { | 29 | for (j = 8; j; j--) { |
diff --git a/libbb/login.c b/libbb/login.c index a7f8de41f..646995b0b 100644 --- a/libbb/login.c +++ b/libbb/login.c | |||
@@ -72,7 +72,7 @@ void print_login_issue(const char *issue_file, const char *tty) | |||
72 | case 'D': | 72 | case 'D': |
73 | case 'o': | 73 | case 'o': |
74 | c = getdomainname(buf, sizeof(buf) - 1); | 74 | c = getdomainname(buf, sizeof(buf) - 1); |
75 | buf[c >= 0 ? c : 0] = '\0'; | 75 | buf[c >= 0 ? c : 0] = '\0'; |
76 | break; | 76 | break; |
77 | 77 | ||
78 | case 'd': | 78 | case 'd': |
diff --git a/libbb/loop.c b/libbb/loop.c index da41d1e76..d22b39800 100644 --- a/libbb/loop.c +++ b/libbb/loop.c | |||
@@ -83,7 +83,7 @@ int set_loop(char **device, const char *file, int offset) | |||
83 | bb_loop_info loopinfo; | 83 | bb_loop_info loopinfo; |
84 | struct stat statbuf; | 84 | struct stat statbuf; |
85 | int i, dfd, ffd, mode, rc=-1; | 85 | int i, dfd, ffd, mode, rc=-1; |
86 | 86 | ||
87 | /* Open the file. Barf if this doesn't work. */ | 87 | /* Open the file. Barf if this doesn't work. */ |
88 | if((ffd = open(file, mode=O_RDWR))<0 && (ffd = open(file,mode=O_RDONLY))<0) | 88 | if((ffd = open(file, mode=O_RDWR))<0 && (ffd = open(file,mode=O_RDONLY))<0) |
89 | return -errno; | 89 | return -errno; |
diff --git a/libbb/md5.c b/libbb/md5.c index cfdffe835..132efdf93 100644 --- a/libbb/md5.c +++ b/libbb/md5.c | |||
@@ -440,7 +440,7 @@ void *md5_end(void *resbuf, md5_ctx_t *ctx) | |||
440 | /* Process last bytes. */ | 440 | /* Process last bytes. */ |
441 | if (buf != ctx->buffer) md5_hash_block(ctx->buffer, ctx); | 441 | if (buf != ctx->buffer) md5_hash_block(ctx->buffer, ctx); |
442 | md5_hash_block(buf, ctx); | 442 | md5_hash_block(buf, ctx); |
443 | 443 | ||
444 | /* Put result from CTX in first 16 bytes following RESBUF. The result is | 444 | /* Put result from CTX in first 16 bytes following RESBUF. The result is |
445 | * always in little endian byte order, so that a byte-wise output yields | 445 | * always in little endian byte order, so that a byte-wise output yields |
446 | * to the wanted ASCII representation of the message digest. | 446 | * to the wanted ASCII representation of the message digest. |
diff --git a/libbb/sha1.c b/libbb/sha1.c index ea4da2474..a86218b25 100644 --- a/libbb/sha1.c +++ b/libbb/sha1.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyright (C) 2002 Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK. | 6 | * Copyright (C) 2002 Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK. |
7 | * Copyright (C) 2003 Glenn L. McGrath | 7 | * Copyright (C) 2003 Glenn L. McGrath |
8 | * Copyright (C) 2003 Erik Andersen | 8 | * Copyright (C) 2003 Erik Andersen |
9 | * | 9 | * |
10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
11 | * | 11 | * |
12 | * --------------------------------------------------------------------------- | 12 | * --------------------------------------------------------------------------- |
@@ -172,7 +172,7 @@ void *sha1_end(void *resbuf, sha1_ctx_t *ctx) | |||
172 | 172 | ||
173 | for (i = 0; i < SHA1_DIGEST_SIZE; ++i) | 173 | for (i = 0; i < SHA1_DIGEST_SIZE; ++i) |
174 | hval[i] = (unsigned char) (ctx->hash[i >> 2] >> 8 * (~i & 3)); | 174 | hval[i] = (unsigned char) (ctx->hash[i >> 2] >> 8 * (~i & 3)); |
175 | 175 | ||
176 | return resbuf; | 176 | return resbuf; |
177 | } | 177 | } |
178 | 178 | ||
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c index 62fab810d..b9afc6ff1 100644 --- a/libbb/u_signal_names.c +++ b/libbb/u_signal_names.c | |||
@@ -16,12 +16,12 @@ static struct signal_name { | |||
16 | // SUSv3 says kill must support these, and specifies the numerical values, | 16 | // SUSv3 says kill must support these, and specifies the numerical values, |
17 | // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html | 17 | // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html |
18 | {"0", 0}, {"HUP", 1}, {"INT", 2}, {"QUIT", 3}, {"ABRT", 6}, {"KILL", 9}, | 18 | {"0", 0}, {"HUP", 1}, {"INT", 2}, {"QUIT", 3}, {"ABRT", 6}, {"KILL", 9}, |
19 | {"ALRM", 14}, {"TERM", 15}, | 19 | {"ALRM", 14}, {"TERM", 15}, |
20 | // And Posix adds the following: | 20 | // And Posix adds the following: |
21 | {"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"FPE", SIGFPE}, {"USR1", SIGUSR1}, | 21 | {"ILL", SIGILL}, {"TRAP", SIGTRAP}, {"FPE", SIGFPE}, {"USR1", SIGUSR1}, |
22 | {"SEGV", SIGSEGV}, {"USR2", SIGUSR2}, {"PIPE", SIGPIPE}, {"CHLD", SIGCHLD}, | 22 | {"SEGV", SIGSEGV}, {"USR2", SIGUSR2}, {"PIPE", SIGPIPE}, {"CHLD", SIGCHLD}, |
23 | {"CONT", SIGCONT}, {"STOP", SIGSTOP}, {"TSTP", SIGTSTP}, {"TTIN", SIGTTIN}, | 23 | {"CONT", SIGCONT}, {"STOP", SIGSTOP}, {"TSTP", SIGTSTP}, {"TTIN", SIGTTIN}, |
24 | {"TTOU", SIGTTOU} | 24 | {"TTOU", SIGTTOU} |
25 | }; | 25 | }; |
26 | 26 | ||
27 | // Convert signal name to number. | 27 | // Convert signal name to number. |
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 3baf7b251..d77bf3839 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -489,8 +489,8 @@ void xlisten(int s, int backlog) | |||
489 | // xstat() - a stat() which dies on failure with meaningful error message | 489 | // xstat() - a stat() which dies on failure with meaningful error message |
490 | void xstat(char *name, struct stat *stat_buf) | 490 | void xstat(char *name, struct stat *stat_buf) |
491 | { | 491 | { |
492 | if (stat(name, stat_buf)) | 492 | if (stat(name, stat_buf)) |
493 | bb_perror_msg_and_die("Can't stat '%s'", name); | 493 | bb_perror_msg_and_die("Can't stat '%s'", name); |
494 | } | 494 | } |
495 | #endif | 495 | #endif |
496 | 496 | ||
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index f5a99b796..13f29bfa3 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c | |||
@@ -88,7 +88,7 @@ int addgroup_main(int argc, char **argv) | |||
88 | { | 88 | { |
89 | char *group; | 89 | char *group; |
90 | gid_t gid = 0; | 90 | gid_t gid = 0; |
91 | 91 | ||
92 | /* check for min, max and missing args and exit on error */ | 92 | /* check for min, max and missing args and exit on error */ |
93 | bb_opt_complementally = "-1:?2:?"; | 93 | bb_opt_complementally = "-1:?2:?"; |
94 | 94 | ||
diff --git a/loginutils/adduser.c b/loginutils/adduser.c index 0133d8288..936e48e0a 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c | |||
@@ -137,8 +137,8 @@ static int adduser(struct passwd *p, unsigned long flags) | |||
137 | if (mkdir(p->pw_dir, 0755) | 137 | if (mkdir(p->pw_dir, 0755) |
138 | || chown(p->pw_dir, p->pw_uid, p->pw_gid) | 138 | || chown(p->pw_dir, p->pw_uid, p->pw_gid) |
139 | || chmod(p->pw_dir, 02755)) { | 139 | || chmod(p->pw_dir, 02755)) { |
140 | bb_perror_msg("%s", p->pw_dir); | 140 | bb_perror_msg("%s", p->pw_dir); |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | if (!(flags & DONT_SET_PASS)) { | 144 | if (!(flags & DONT_SET_PASS)) { |
@@ -175,7 +175,7 @@ int adduser_main(int argc, char **argv) | |||
175 | /* got root? */ | 175 | /* got root? */ |
176 | if(geteuid()) { | 176 | if(geteuid()) { |
177 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 177 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); |
178 | } | 178 | } |
179 | 179 | ||
180 | /* create string for $HOME if not specified already */ | 180 | /* create string for $HOME if not specified already */ |
181 | if (!pw.pw_dir) { | 181 | if (!pw.pw_dir) { |
diff --git a/loginutils/getty.c b/loginutils/getty.c index 71f6b2458..b456e076d 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c | |||
@@ -337,7 +337,7 @@ static void open_tty(char *tty, struct termio *tp, int local) | |||
337 | if(fd) { | 337 | if(fd) { |
338 | xdup2(fd, 0, tty); | 338 | xdup2(fd, 0, tty); |
339 | close(fd); | 339 | close(fd); |
340 | } | 340 | } |
341 | } else { | 341 | } else { |
342 | /* | 342 | /* |
343 | * Standard input should already be connected to an open port. Make | 343 | * Standard input should already be connected to an open port. Make |
@@ -812,11 +812,11 @@ int getty_main(int argc, char **argv) | |||
812 | setsid(); | 812 | setsid(); |
813 | #endif | 813 | #endif |
814 | /* We want special flavor of error_msg_and_die */ | 814 | /* We want special flavor of error_msg_and_die */ |
815 | die_sleep = 10; | 815 | die_sleep = 10; |
816 | msg_eol = "\r\n"; | 816 | msg_eol = "\r\n"; |
817 | /* Was "/dev/console". Why should we spam *system console* | 817 | /* Was "/dev/console". Why should we spam *system console* |
818 | * if there is a problem with getty on /dev/ttyS15?... */ | 818 | * if there is a problem with getty on /dev/ttyS15?... */ |
819 | nullfd = xopen(bb_dev_null, O_RDWR); | 819 | nullfd = xopen(bb_dev_null, O_RDWR); |
820 | dup2(nullfd, 0); | 820 | dup2(nullfd, 0); |
821 | dup2(nullfd, 1); | 821 | dup2(nullfd, 1); |
822 | dup2(nullfd, 2); | 822 | dup2(nullfd, 2); |
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index a2238d49d..8cfb64e9a 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c | |||
@@ -73,7 +73,7 @@ int sulogin_main(int argc, char **argv) | |||
73 | 73 | ||
74 | if (!(pwd = getpwuid(0))) { | 74 | if (!(pwd = getpwuid(0))) { |
75 | goto auth_error; | 75 | goto auth_error; |
76 | } | 76 | } |
77 | 77 | ||
78 | if (ENABLE_FEATURE_SHADOWPASSWDS) { | 78 | if (ENABLE_FEATURE_SHADOWPASSWDS) { |
79 | if (!(spwd = getspnam(pwd->pw_name))) { | 79 | if (!(spwd = getspnam(pwd->pw_name))) { |
@@ -108,6 +108,6 @@ int sulogin_main(int argc, char **argv) | |||
108 | run_shell(pwd->pw_shell, 1, 0, 0); | 108 | run_shell(pwd->pw_shell, 1, 0, 0); |
109 | /* never returns */ | 109 | /* never returns */ |
110 | 110 | ||
111 | auth_error: | 111 | auth_error: |
112 | bb_error_msg_and_die("no password entry for `root'"); | 112 | bb_error_msg_and_die("no password entry for `root'"); |
113 | } | 113 | } |
diff --git a/miscutils/Config.in b/miscutils/Config.in index dc3da6f9a..50ed4df99 100644 --- a/miscutils/Config.in +++ b/miscutils/Config.in | |||
@@ -292,7 +292,7 @@ config CONFIG_READAHEAD | |||
292 | significantly speed up system startup. | 292 | significantly speed up system startup. |
293 | 293 | ||
294 | As readahead(2) blocks until each file has been read, it is best to | 294 | As readahead(2) blocks until each file has been read, it is best to |
295 | run this applet as a background job. | 295 | run this applet as a background job. |
296 | 296 | ||
297 | config CONFIG_RUNLEVEL | 297 | config CONFIG_RUNLEVEL |
298 | bool "runlevel" | 298 | bool "runlevel" |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 1febcef2c..97f1b5752 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -755,7 +755,7 @@ static void identify(uint16_t *id_supplied) | |||
755 | strng = "<=10ms with INTRQ"; | 755 | strng = "<=10ms with INTRQ"; |
756 | else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) == DRQ_50US_VAL) | 756 | else if ((val[GEN_CONFIG] & DRQ_RESPONSE_TIME) == DRQ_50US_VAL) |
757 | strng ="50us"; | 757 | strng ="50us"; |
758 | else | 758 | else |
759 | strng = "Unknown"; | 759 | strng = "Unknown"; |
760 | printf("\tDRQ response: %s\n\tPacket size: ", strng); /* Data Request (DRQ) */ | 760 | printf("\tDRQ response: %s\n\tPacket size: ", strng); /* Data Request (DRQ) */ |
761 | 761 | ||
@@ -817,7 +817,7 @@ static void identify(uint16_t *id_supplied) | |||
817 | 817 | ||
818 | if (bbbig > 1000) | 818 | if (bbbig > 1000) |
819 | printf("(%"PRIu64" GB)\n", bbbig/1000); | 819 | printf("(%"PRIu64" GB)\n", bbbig/1000); |
820 | else | 820 | else |
821 | printf("\n"); | 821 | printf("\n"); |
822 | } | 822 | } |
823 | 823 | ||
@@ -833,8 +833,8 @@ static void identify(uint16_t *id_supplied) | |||
833 | 833 | ||
834 | if (like_std != 1) | 834 | if (like_std != 1) |
835 | { | 835 | { |
836 | printf("IORDY%s(can%s be disabled)\n", | 836 | printf("IORDY%s(can%s be disabled)\n", |
837 | !(val[CAPAB_0] & IORDY_SUP) ? "(may be)" : "", | 837 | !(val[CAPAB_0] & IORDY_SUP) ? "(may be)" : "", |
838 | (val[CAPAB_0] & IORDY_OFF) ? "" :"not"); | 838 | (val[CAPAB_0] & IORDY_OFF) ? "" :"not"); |
839 | } | 839 | } |
840 | else | 840 | else |
@@ -843,7 +843,7 @@ static void identify(uint16_t *id_supplied) | |||
843 | if ((like_std == 1) && val[BUF_TYPE]) | 843 | if ((like_std == 1) && val[BUF_TYPE]) |
844 | { | 844 | { |
845 | printf("\tBuffer type: %04x: %s%s\n", val[BUF_TYPE], | 845 | printf("\tBuffer type: %04x: %s%s\n", val[BUF_TYPE], |
846 | (val[BUF_TYPE] < 2) ? "single port, single-sector" : "dual port, multi-sector", | 846 | (val[BUF_TYPE] < 2) ? "single port, single-sector" : "dual port, multi-sector", |
847 | (val[BUF_TYPE] > 2) ? " with read caching ability" : ""); | 847 | (val[BUF_TYPE] > 2) ? " with read caching ability" : ""); |
848 | } | 848 | } |
849 | 849 | ||
@@ -1063,9 +1063,9 @@ static void identify(uint16_t *id_supplied) | |||
1063 | strng = " determined by the jumper"; | 1063 | strng = " determined by the jumper"; |
1064 | else if ((jj & DEV_DET) == CSEL_VAL) | 1064 | else if ((jj & DEV_DET) == CSEL_VAL) |
1065 | strng = " determined by CSEL"; | 1065 | strng = " determined by CSEL"; |
1066 | else | 1066 | else |
1067 | strng = ""; | 1067 | strng = ""; |
1068 | printf("HW reset results:\n\tCBLID- %s Vih\n\tDevice num = %i%s\n", | 1068 | printf("HW reset results:\n\tCBLID- %s Vih\n\tDevice num = %i%s\n", |
1069 | (val[HWRST_RSLT] & CBLID) ? "above" : "below", !(oo), strng); | 1069 | (val[HWRST_RSLT] & CBLID) ? "above" : "below", !(oo), strng); |
1070 | } | 1070 | } |
1071 | 1071 | ||
@@ -1200,8 +1200,8 @@ static void dump_identity(const struct hd_driveid *id) | |||
1200 | printf(" (maybe):"); | 1200 | printf(" (maybe):"); |
1201 | 1201 | ||
1202 | printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads, | 1202 | printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads, |
1203 | id->cur_sectors, | 1203 | id->cur_sectors, |
1204 | (BB_BIG_ENDIAN) ? | 1204 | (BB_BIG_ENDIAN) ? |
1205 | (long unsigned int)(id->cur_capacity0 << 16) | id->cur_capacity1 : | 1205 | (long unsigned int)(id->cur_capacity0 << 16) | id->cur_capacity1 : |
1206 | (long unsigned int)(id->cur_capacity1 << 16) | id->cur_capacity0, | 1206 | (long unsigned int)(id->cur_capacity1 << 16) | id->cur_capacity0, |
1207 | ((id->capability&2) == 0) ? "no" : "yes"); | 1207 | ((id->capability&2) == 0) ? "no" : "yes"); |
@@ -1213,7 +1213,7 @@ static void dump_identity(const struct hd_driveid *id) | |||
1213 | 1213 | ||
1214 | if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&2) | 1214 | if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&2) |
1215 | printf(", tPIO={min:%u,w/IORDY:%u}", id->eide_pio, id->eide_pio_iordy); | 1215 | printf(", tPIO={min:%u,w/IORDY:%u}", id->eide_pio, id->eide_pio_iordy); |
1216 | 1216 | ||
1217 | if ((id->capability&1) && (id->field_valid&2)) | 1217 | if ((id->capability&1) && (id->field_valid&2)) |
1218 | printf(", tDMA={min:%u,rec:%u}", id->eide_dma_min, id->eide_dma_time); | 1218 | printf(", tDMA={min:%u,rec:%u}", id->eide_dma_min, id->eide_dma_time); |
1219 | 1219 | ||
@@ -1254,7 +1254,7 @@ static void dump_identity(const struct hd_driveid *id) | |||
1254 | } | 1254 | } |
1255 | } | 1255 | } |
1256 | if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&4) | 1256 | if (((id->capability&8) || (id->field_valid&2)) && id->field_valid&4) |
1257 | { | 1257 | { |
1258 | printf("\n UDMA modes: "); | 1258 | printf("\n UDMA modes: "); |
1259 | if (id->dma_ultra & 0x100) printf("*"); | 1259 | if (id->dma_ultra & 0x100) printf("*"); |
1260 | if (id->dma_ultra & 0x001) printf("udma0 "); | 1260 | if (id->dma_ultra & 0x001) printf("udma0 "); |
@@ -1399,7 +1399,7 @@ static void do_time(int flag, int fd) | |||
1399 | if (read_big_block (fd, buf)) return; | 1399 | if (read_big_block (fd, buf)) return; |
1400 | printf(" Timing cached reads: "); | 1400 | printf(" Timing cached reads: "); |
1401 | fflush(stdout); | 1401 | fflush(stdout); |
1402 | 1402 | ||
1403 | /* Now do the timing */ | 1403 | /* Now do the timing */ |
1404 | iterations = 0; | 1404 | iterations = 0; |
1405 | getitimer(ITIMER_REAL, &e1); | 1405 | getitimer(ITIMER_REAL, &e1); |
@@ -1422,9 +1422,9 @@ static void do_time(int flag, int fd) | |||
1422 | elapsed2 = (e1.it_value.tv_sec - e2.it_value.tv_sec) | 1422 | elapsed2 = (e1.it_value.tv_sec - e2.it_value.tv_sec) |
1423 | + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); | 1423 | + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); |
1424 | } while (--iterations); | 1424 | } while (--iterations); |
1425 | 1425 | ||
1426 | elapsed -= elapsed2; | 1426 | elapsed -= elapsed2; |
1427 | print_timing(BUFCACHE_FACTOR * total_MB, elapsed); | 1427 | print_timing(BUFCACHE_FACTOR * total_MB, elapsed); |
1428 | flush_buffer_cache(fd); | 1428 | flush_buffer_cache(fd); |
1429 | sleep(1); | 1429 | sleep(1); |
1430 | } | 1430 | } |
@@ -1447,7 +1447,7 @@ static void do_time(int flag, int fd) | |||
1447 | elapsed = (e1.it_value.tv_sec - e2.it_value.tv_sec) | 1447 | elapsed = (e1.it_value.tv_sec - e2.it_value.tv_sec) |
1448 | + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); | 1448 | + ((e1.it_value.tv_usec - e2.it_value.tv_usec) / 1000000.0); |
1449 | } while (elapsed < 3.0 && iterations < max_iterations); | 1449 | } while (elapsed < 3.0 && iterations < max_iterations); |
1450 | 1450 | ||
1451 | total_MB = iterations * TIMING_BUF_MB; | 1451 | total_MB = iterations * TIMING_BUF_MB; |
1452 | print_timing(total_MB, elapsed); | 1452 | print_timing(total_MB, elapsed); |
1453 | } | 1453 | } |
@@ -2124,7 +2124,7 @@ int hdparm_main(int argc, char **argv) | |||
2124 | do_flush |= do_timings |= (c == 't'); | 2124 | do_flush |= do_timings |= (c == 't'); |
2125 | do_flush |= do_ctimings |= (c == 'T'); | 2125 | do_flush |= do_ctimings |= (c == 'T'); |
2126 | #ifdef HDIO_DRIVE_CMD | 2126 | #ifdef HDIO_DRIVE_CMD |
2127 | if (c == 'S') parse_opts(&get_standby, &set_standby, &standby_requested, 0, INT_MAX); | 2127 | if (c == 'S') parse_opts(&get_standby, &set_standby, &standby_requested, 0, INT_MAX); |
2128 | if (c == 'D') parse_opts(&get_defects, &set_defects, &defects, 0, INT_MAX); | 2128 | if (c == 'D') parse_opts(&get_defects, &set_defects, &defects, 0, INT_MAX); |
2129 | if (c == 'P') parse_opts(&get_prefetch, &set_prefetch, &prefetch, 0, INT_MAX); | 2129 | if (c == 'P') parse_opts(&get_prefetch, &set_prefetch, &prefetch, 0, INT_MAX); |
2130 | parse_xfermode((c == 'X'), &get_xfermode, &set_xfermode, &xfermode_requested); | 2130 | parse_xfermode((c == 'X'), &get_xfermode, &set_xfermode, &xfermode_requested); |
@@ -2138,22 +2138,22 @@ int hdparm_main(int argc, char **argv) | |||
2138 | reread_partn |= (c == 'z'); | 2138 | reread_partn |= (c == 'z'); |
2139 | get_seagate = set_seagate |= (c == 'Z'); | 2139 | get_seagate = set_seagate |= (c == 'Z'); |
2140 | #endif | 2140 | #endif |
2141 | USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(if (c == 'U') parse_opts(NULL, &unregister_hwif, &hwif, 0, INT_MAX)); | 2141 | USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF(if (c == 'U') parse_opts(NULL, &unregister_hwif, &hwif, 0, INT_MAX)); |
2142 | #ifdef HDIO_GET_QDMA | 2142 | #ifdef HDIO_GET_QDMA |
2143 | if (c == 'Q') { | 2143 | if (c == 'Q') { |
2144 | #ifdef HDIO_SET_QDMA | 2144 | #ifdef HDIO_SET_QDMA |
2145 | parse_opts(&get_dma_q, &set_dma_q, &dma_q, 0, INT_MAX); | 2145 | parse_opts(&get_dma_q, &set_dma_q, &dma_q, 0, INT_MAX); |
2146 | #else | 2146 | #else |
2147 | parse_opts(&get_dma_q, NULL, NULL, 0, 0); | 2147 | parse_opts(&get_dma_q, NULL, NULL, 0, 0); |
2148 | #endif | 2148 | #endif |
2149 | } | 2149 | } |
2150 | #endif | 2150 | #endif |
2151 | USE_FEATURE_HDPARM_HDIO_DRIVE_RESET(perform_reset = (c == 'r')); | 2151 | USE_FEATURE_HDPARM_HDIO_DRIVE_RESET(perform_reset = (c == 'r')); |
2152 | USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'x') parse_opts(NULL, &perform_tristate, &tristate, 0, 1)); | 2152 | USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'x') parse_opts(NULL, &perform_tristate, &tristate, 0, 1)); |
2153 | USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'b') parse_opts(&get_busstate, &set_busstate, &busstate, 0, 2)); | 2153 | USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF(if (c == 'b') parse_opts(&get_busstate, &set_busstate, &busstate, 0, 2)); |
2154 | #if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF | 2154 | #if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF |
2155 | if (c == 'R') { | 2155 | if (c == 'R') { |
2156 | parse_opts(NULL, &scan_hwif, &hwif_data, 0, INT_MAX); | 2156 | parse_opts(NULL, &scan_hwif, &hwif_data, 0, INT_MAX); |
2157 | hwif_ctrl = bb_xgetlarg((argv[optind]) ? argv[optind] : "", 10, 0, INT_MAX); | 2157 | hwif_ctrl = bb_xgetlarg((argv[optind]) ? argv[optind] : "", 10, 0, INT_MAX); |
2158 | hwif_irq = bb_xgetlarg((argv[optind+1]) ? argv[optind+1] : "", 10, 0, INT_MAX); | 2158 | hwif_irq = bb_xgetlarg((argv[optind+1]) ? argv[optind+1] : "", 10, 0, INT_MAX); |
2159 | /* Move past the 2 additional arguments */ | 2159 | /* Move past the 2 additional arguments */ |
diff --git a/miscutils/less.c b/miscutils/less.c index c13d7b8a2..bde2a4527 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -610,26 +610,26 @@ static char *process_regex_on_line(char *line, regex_t *pattern, int action) | |||
610 | 610 | ||
611 | match_found = 0; | 611 | match_found = 0; |
612 | match_status = regexec(pattern, line2, 1, &match_structs, 0); | 612 | match_status = regexec(pattern, line2, 1, &match_structs, 0); |
613 | 613 | ||
614 | while (match_status == 0) { | 614 | while (match_status == 0) { |
615 | if (match_found == 0) | 615 | if (match_found == 0) |
616 | match_found = 1; | 616 | match_found = 1; |
617 | 617 | ||
618 | if (action) { | 618 | if (action) { |
619 | growline = xasprintf("%s%.*s%s%.*s%s", growline, match_structs.rm_so, line2, HIGHLIGHT, match_structs.rm_eo - match_structs.rm_so, line2 + match_structs.rm_so, NORMAL); | 619 | growline = xasprintf("%s%.*s%s%.*s%s", growline, match_structs.rm_so, line2, HIGHLIGHT, match_structs.rm_eo - match_structs.rm_so, line2 + match_structs.rm_so, NORMAL); |
620 | } | 620 | } |
621 | else { | 621 | else { |
622 | growline = xasprintf("%s%.*s%.*s", growline, match_structs.rm_so - 4, line2, match_structs.rm_eo - match_structs.rm_so, line2 + match_structs.rm_so); | 622 | growline = xasprintf("%s%.*s%.*s", growline, match_structs.rm_so - 4, line2, match_structs.rm_eo - match_structs.rm_so, line2 + match_structs.rm_so); |
623 | } | 623 | } |
624 | 624 | ||
625 | line2 += match_structs.rm_eo; | 625 | line2 += match_structs.rm_eo; |
626 | match_status = regexec(pattern, line2, 1, &match_structs, REG_NOTBOL); | 626 | match_status = regexec(pattern, line2, 1, &match_structs, REG_NOTBOL); |
627 | } | 627 | } |
628 | 628 | ||
629 | growline = xasprintf("%s%s", growline, line2); | 629 | growline = xasprintf("%s%s", growline, line2); |
630 | 630 | ||
631 | return (match_found ? growline : line); | 631 | return (match_found ? growline : line); |
632 | 632 | ||
633 | free(growline); | 633 | free(growline); |
634 | free(line2); | 634 | free(line2); |
635 | } | 635 | } |
@@ -656,7 +656,7 @@ static void regex_process(void) | |||
656 | putchar((match_backwards) ? '?' : '/'); | 656 | putchar((match_backwards) ? '?' : '/'); |
657 | uncomp_regex[0] = 0; | 657 | uncomp_regex[0] = 0; |
658 | fgets(uncomp_regex, sizeof(uncomp_regex), inp); | 658 | fgets(uncomp_regex, sizeof(uncomp_regex), inp); |
659 | 659 | ||
660 | if (strlen(uncomp_regex) == 1) { | 660 | if (strlen(uncomp_regex) == 1) { |
661 | if (num_matches) | 661 | if (num_matches) |
662 | goto_match(match_backwards ? match_pos - 1 : match_pos + 1); | 662 | goto_match(match_backwards ? match_pos - 1 : match_pos + 1); |
@@ -665,7 +665,7 @@ static void regex_process(void) | |||
665 | return; | 665 | return; |
666 | } | 666 | } |
667 | uncomp_regex[strlen(uncomp_regex) - 1] = '\0'; | 667 | uncomp_regex[strlen(uncomp_regex) - 1] = '\0'; |
668 | 668 | ||
669 | /* Compile the regex and check for errors */ | 669 | /* Compile the regex and check for errors */ |
670 | xregcomp(&pattern, uncomp_regex, 0); | 670 | xregcomp(&pattern, uncomp_regex, 0); |
671 | 671 | ||
@@ -677,7 +677,7 @@ static void regex_process(void) | |||
677 | } | 677 | } |
678 | } | 678 | } |
679 | old_pattern = pattern; | 679 | old_pattern = pattern; |
680 | 680 | ||
681 | /* Reset variables */ | 681 | /* Reset variables */ |
682 | match_lines = xrealloc(match_lines, sizeof(int)); | 682 | match_lines = xrealloc(match_lines, sizeof(int)); |
683 | match_lines[0] = -1; | 683 | match_lines[0] = -1; |
@@ -694,7 +694,7 @@ static void regex_process(void) | |||
694 | j++; | 694 | j++; |
695 | } | 695 | } |
696 | } | 696 | } |
697 | 697 | ||
698 | num_matches = j; | 698 | num_matches = j; |
699 | if ((match_lines[0] != -1) && (num_flines > height - 2)) { | 699 | if ((match_lines[0] != -1) && (num_flines > height - 2)) { |
700 | if (match_backwards) { | 700 | if (match_backwards) { |
diff --git a/miscutils/readahead.c b/miscutils/readahead.c index 8221bb4be..49cd7fd09 100644 --- a/miscutils/readahead.c +++ b/miscutils/readahead.c | |||
@@ -22,7 +22,7 @@ int readahead_main(int argc, char **argv) | |||
22 | while (*++argv) { | 22 | while (*++argv) { |
23 | if ((f = bb_wfopen(*argv, "r")) != NULL) { | 23 | if ((f = bb_wfopen(*argv, "r")) != NULL) { |
24 | int r, fd=fileno(f); | 24 | int r, fd=fileno(f); |
25 | 25 | ||
26 | r = readahead(fd, 0, fdlength(fd)); | 26 | r = readahead(fd, 0, fdlength(fd)); |
27 | fclose(f); | 27 | fclose(f); |
28 | if (r >= 0) continue; | 28 | if (r >= 0) continue; |
diff --git a/miscutils/strings.c b/miscutils/strings.c index 9a76c8534..e9f335ebd 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * strings implementation for busybox | 3 | * strings implementation for busybox |
4 | * | 4 | * |
5 | * Copyright Tito Ragusa <farmatito@tiscali.it> | 5 | * Copyright Tito Ragusa <farmatito@tiscali.it> |
6 | * | 6 | * |
7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 7 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
8 | */ | 8 | */ |
9 | 9 | ||
diff --git a/modutils/insmod.c b/modutils/insmod.c index 249563435..2b2e3637d 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -981,7 +981,7 @@ arch_apply_relocation(struct obj_file *f, | |||
981 | /* dot is the address of the current instruction. | 981 | /* dot is the address of the current instruction. |
982 | * v is the target symbol address. | 982 | * v is the target symbol address. |
983 | * So we need to extract the offset in the code, | 983 | * So we need to extract the offset in the code, |
984 | * adding v, then subtrating the current address | 984 | * adding v, then subtrating the current address |
985 | * of this instruction. | 985 | * of this instruction. |
986 | * Ex: "IMM 0xFFFE bralid 0x0000" = "bralid 0xFFFE0000" | 986 | * Ex: "IMM 0xFFFE bralid 0x0000" = "bralid 0xFFFE0000" |
987 | */ | 987 | */ |
@@ -990,7 +990,7 @@ arch_apply_relocation(struct obj_file *f, | |||
990 | unsigned int temp = (loc[0] & 0xFFFF) << 16 | | 990 | unsigned int temp = (loc[0] & 0xFFFF) << 16 | |
991 | (loc[1] & 0xFFFF); | 991 | (loc[1] & 0xFFFF); |
992 | 992 | ||
993 | /* Adjust relative offset. -4 adjustment required | 993 | /* Adjust relative offset. -4 adjustment required |
994 | * because dot points to the IMM insn, but branch | 994 | * because dot points to the IMM insn, but branch |
995 | * is computed relative to the branch instruction itself. | 995 | * is computed relative to the branch instruction itself. |
996 | */ | 996 | */ |
diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 2bc1ae6b1..69c8ab3c7 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c | |||
@@ -104,7 +104,7 @@ int lsmod_main(int argc, char **argv) | |||
104 | if (errno == ENOENT) { | 104 | if (errno == ENOENT) { |
105 | /* The module was removed out from underneath us. */ | 105 | /* The module was removed out from underneath us. */ |
106 | continue; | 106 | continue; |
107 | } else if (errno != ENOSPC) | 107 | } else if (errno != ENOSPC) |
108 | bb_perror_msg_and_die("module %s: QM_REFS", mn); | 108 | bb_perror_msg_and_die("module %s: QM_REFS", mn); |
109 | deps = xrealloc(deps, count); | 109 | deps = xrealloc(deps, count); |
110 | } | 110 | } |
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 8f210310d..f87fb5e24 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
@@ -36,7 +36,7 @@ void filename2modname(char *modname, const char *afterslash); | |||
36 | // There really should be a header file for this... | 36 | // There really should be a header file for this... |
37 | 37 | ||
38 | int query_module(const char *name, int which, void *buf, | 38 | int query_module(const char *name, int which, void *buf, |
39 | size_t bufsize, size_t *ret); | 39 | size_t bufsize, size_t *ret); |
40 | 40 | ||
41 | int rmmod_main(int argc, char **argv) | 41 | int rmmod_main(int argc, char **argv) |
42 | { | 42 | { |
diff --git a/networking/Config.in b/networking/Config.in index 2dff021a8..b78ae37e7 100644 --- a/networking/Config.in +++ b/networking/Config.in | |||
@@ -22,7 +22,7 @@ config CONFIG_DNSD | |||
22 | bool "dnsd" | 22 | bool "dnsd" |
23 | default n | 23 | default n |
24 | help | 24 | help |
25 | Small and static DNS server daemon. | 25 | Small and static DNS server daemon. |
26 | 26 | ||
27 | config CONFIG_ETHER_WAKE | 27 | config CONFIG_ETHER_WAKE |
28 | bool "ether-wake" | 28 | bool "ether-wake" |
@@ -132,9 +132,9 @@ config CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR | |||
132 | default n | 132 | default n |
133 | depends on CONFIG_FEATURE_HTTPD_CGI | 133 | depends on CONFIG_FEATURE_HTTPD_CGI |
134 | help | 134 | help |
135 | This option enables support for running scripts through an | 135 | This option enables support for running scripts through an |
136 | interpreter. Turn this on if you want PHP scripts to work | 136 | interpreter. Turn this on if you want PHP scripts to work |
137 | properly. You need to supply an addition line in your httpd | 137 | properly. You need to supply an addition line in your httpd |
138 | config file: | 138 | config file: |
139 | *.php:/path/to/your/php | 139 | *.php:/path/to/your/php |
140 | 140 | ||
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 6429c07e5..fa5bfe1e9 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -708,7 +708,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename) | |||
708 | llist_t *iface_list; | 708 | llist_t *iface_list; |
709 | for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) { | 709 | for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) { |
710 | struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data; | 710 | struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data; |
711 | if ((strcmp(tmp->iface, currif->iface) == 0) && | 711 | if ((strcmp(tmp->iface, currif->iface) == 0) && |
712 | (tmp->address_family == currif->address_family)) { | 712 | (tmp->address_family == currif->address_family)) { |
713 | bb_error_msg("duplicate interface \"%s\"", tmp->iface); | 713 | bb_error_msg("duplicate interface \"%s\"", tmp->iface); |
714 | return NULL; | 714 | return NULL; |
diff --git a/networking/nc.c b/networking/nc.c index 3f4149e14..f8b3fb2dd 100644 --- a/networking/nc.c +++ b/networking/nc.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* nc: mini-netcat - built from the ground up for LRP | 2 | /* nc: mini-netcat - built from the ground up for LRP |
3 | * | 3 | * |
4 | * Copyright (C) 1998, 1999 Charles P. Wright | 4 | * Copyright (C) 1998, 1999 Charles P. Wright |
5 | * Copyright (C) 1998 Dave Cinege | 5 | * Copyright (C) 1998 Dave Cinege |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | */ | 8 | */ |
9 | 9 | ||
@@ -25,7 +25,7 @@ int nc_main(int argc, char **argv) | |||
25 | 25 | ||
26 | memset(&address, 0, sizeof(address)); | 26 | memset(&address, 0, sizeof(address)); |
27 | 27 | ||
28 | if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) { | 28 | if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) { |
29 | while ((opt = getopt(argc, argv, "lp:" USE_NC_EXTRA("i:ew:f:"))) > 0) { | 29 | while ((opt = getopt(argc, argv, "lp:" USE_NC_EXTRA("i:ew:f:"))) > 0) { |
30 | if (ENABLE_NC_SERVER && opt=='l') do_listen++; | 30 | if (ENABLE_NC_SERVER && opt=='l') do_listen++; |
31 | else if (ENABLE_NC_SERVER && opt=='p') | 31 | else if (ENABLE_NC_SERVER && opt=='p') |
@@ -40,7 +40,7 @@ int nc_main(int argc, char **argv) | |||
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | 43 | ||
44 | // For listen or file we need zero arguments, dialout is 2. | 44 | // For listen or file we need zero arguments, dialout is 2. |
45 | // For exec we need at least one more argument at the end, more ok | 45 | // For exec we need at least one more argument at the end, more ok |
46 | 46 | ||
@@ -53,7 +53,7 @@ int nc_main(int argc, char **argv) | |||
53 | signal(SIGALRM, timeout); | 53 | signal(SIGALRM, timeout); |
54 | alarm(wsecs); | 54 | alarm(wsecs); |
55 | } | 55 | } |
56 | 56 | ||
57 | if (infile) cfd = xopen(infile, O_RDWR); | 57 | if (infile) cfd = xopen(infile, O_RDWR); |
58 | else { | 58 | else { |
59 | opt = 1; | 59 | opt = 1; |
@@ -132,7 +132,7 @@ repeatyness: | |||
132 | } | 132 | } |
133 | 133 | ||
134 | // Select loop copying stdin to cfd, and cfd to stdout. | 134 | // Select loop copying stdin to cfd, and cfd to stdout. |
135 | 135 | ||
136 | FD_ZERO(&readfds); | 136 | FD_ZERO(&readfds); |
137 | FD_SET(cfd, &readfds); | 137 | FD_SET(cfd, &readfds); |
138 | FD_SET(STDIN_FILENO, &readfds); | 138 | FD_SET(STDIN_FILENO, &readfds); |
diff --git a/networking/ping6.c b/networking/ping6.c index 990328a51..6079c40d9 100644 --- a/networking/ping6.c +++ b/networking/ping6.c | |||
@@ -370,7 +370,7 @@ static void ping(const char *host) | |||
370 | pingaddr.sin6_scope_id = if_index; | 370 | pingaddr.sin6_scope_id = if_index; |
371 | 371 | ||
372 | printf("PING %s (%s): %d data bytes\n", | 372 | printf("PING %s (%s): %d data bytes\n", |
373 | hostent->h_name, | 373 | hostent->h_name, |
374 | inet_ntop(AF_INET6, &pingaddr.sin6_addr, | 374 | inet_ntop(AF_INET6, &pingaddr.sin6_addr, |
375 | buf, sizeof(buf)), | 375 | buf, sizeof(buf)), |
376 | datalen); | 376 | datalen); |
diff --git a/networking/telnet.c b/networking/telnet.c index 5324d7a20..344fc3270 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -185,9 +185,9 @@ static void handlenetoutput(int len) | |||
185 | * I don't agree. | 185 | * I don't agree. |
186 | * first - I cannot use programs like sz/rz | 186 | * first - I cannot use programs like sz/rz |
187 | * second - the 0x0D is sent as one character and if the next | 187 | * second - the 0x0D is sent as one character and if the next |
188 | * char is 0x0A then it's eaten by a server side. | 188 | * char is 0x0A then it's eaten by a server side. |
189 | * third - whay doy you have to make 'many write()s'? | 189 | * third - whay doy you have to make 'many write()s'? |
190 | * I don't understand. | 190 | * I don't understand. |
191 | * So I implemented it. It's realy useful for me. I hope that | 191 | * So I implemented it. It's realy useful for me. I hope that |
192 | * others people will find it interesting to. | 192 | * others people will find it interesting to. |
193 | */ | 193 | */ |
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h index 42af0a367..3dff11ab0 100644 --- a/networking/udhcp/dhcpc.h +++ b/networking/udhcp/dhcpc.h | |||
@@ -29,7 +29,7 @@ struct client_config_t { | |||
29 | uint8_t *hostname; /* Optional hostname to use */ | 29 | uint8_t *hostname; /* Optional hostname to use */ |
30 | uint8_t *fqdn; /* Optional fully qualified domain name to use */ | 30 | uint8_t *fqdn; /* Optional fully qualified domain name to use */ |
31 | int ifindex; /* Index number of the interface to use */ | 31 | int ifindex; /* Index number of the interface to use */ |
32 | int retries; /* Max number of request packets */ | 32 | int retries; /* Max number of request packets */ |
33 | int timeout; /* Number of seconds to try to get a lease */ | 33 | int timeout; /* Number of seconds to try to get a lease */ |
34 | uint8_t arp[6]; /* Our arp address */ | 34 | uint8_t arp[6]; /* Our arp address */ |
35 | }; | 35 | }; |
diff --git a/networking/wget.c b/networking/wget.c index 181ea9397..1a80972fc 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -483,7 +483,7 @@ read_response: | |||
483 | do { | 483 | do { |
484 | while (filesize > 0 || !got_clen) { | 484 | while (filesize > 0 || !got_clen) { |
485 | unsigned rdsz = sizeof(buf); | 485 | unsigned rdsz = sizeof(buf); |
486 | if (filesize < sizeof(buf) && (chunked || got_clen)) | 486 | if (filesize < sizeof(buf) && (chunked || got_clen)) |
487 | rdsz = filesize; | 487 | rdsz = filesize; |
488 | n = safe_fread(buf, 1, rdsz, dfp); | 488 | n = safe_fread(buf, 1, rdsz, dfp); |
489 | if (n <= 0) | 489 | if (n <= 0) |
diff --git a/networking/zcip.c b/networking/zcip.c index 5d2a5f786..c6b0d2d80 100644 --- a/networking/zcip.c +++ b/networking/zcip.c | |||
@@ -314,7 +314,7 @@ int zcip_main(int argc, char *argv[]) | |||
314 | tv1.tv_sec++; | 314 | tv1.tv_sec++; |
315 | } | 315 | } |
316 | tv1.tv_sec += timeout / 1000; | 316 | tv1.tv_sec += timeout / 1000; |
317 | 317 | ||
318 | VDBG("...wait %ld %s nprobes=%d, nclaims=%d\n", | 318 | VDBG("...wait %ld %s nprobes=%d, nclaims=%d\n", |
319 | timeout, intf, nprobes, nclaims); | 319 | timeout, intf, nprobes, nclaims); |
320 | switch (poll(fds, 1, timeout)) { | 320 | switch (poll(fds, 1, timeout)) { |
@@ -479,7 +479,7 @@ int zcip_main(int argc, char *argv[]) | |||
479 | target_ip_conflict = 1; | 479 | target_ip_conflict = 1; |
480 | } | 480 | } |
481 | 481 | ||
482 | VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n", | 482 | VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n", |
483 | state, source_ip_conflict, target_ip_conflict); | 483 | state, source_ip_conflict, target_ip_conflict); |
484 | switch (state) { | 484 | switch (state) { |
485 | case PROBE: | 485 | case PROBE: |
diff --git a/scripts/checkhelp.awk b/scripts/checkhelp.awk index 85d0661a7..608a46e58 100755 --- a/scripts/checkhelp.awk +++ b/scripts/checkhelp.awk | |||
@@ -2,7 +2,7 @@ | |||
2 | # AWK script to check for missing help entries for config options | 2 | # AWK script to check for missing help entries for config options |
3 | # | 3 | # |
4 | # Copyright (C) 2006 Bernhard Fischer | 4 | # Copyright (C) 2006 Bernhard Fischer |
5 | # | 5 | # |
6 | # This file is distributed under the terms and conditions of the | 6 | # This file is distributed under the terms and conditions of the |
7 | # MIT/X public licenses. See http://opensource.org/licenses/mit-license.html | 7 | # MIT/X public licenses. See http://opensource.org/licenses/mit-license.html |
8 | # and notice http://www.gnu.org/licenses/license-list.html#X11License | 8 | # and notice http://www.gnu.org/licenses/license-list.html#X11License |
diff --git a/scripts/config/lxdialog/BIG.FAT.WARNING b/scripts/config/lxdialog/BIG.FAT.WARNING index a8999d82b..7cb5a7ec9 100644 --- a/scripts/config/lxdialog/BIG.FAT.WARNING +++ b/scripts/config/lxdialog/BIG.FAT.WARNING | |||
@@ -1,4 +1,4 @@ | |||
1 | This is NOT the official version of dialog. This version has been | 1 | This is NOT the official version of dialog. This version has been |
2 | significantly modified from the original. It is for use by the Linux | 2 | significantly modified from the original. It is for use by the Linux |
3 | kernel configuration script. Please do not bother Savio Lam with | 3 | kernel configuration script. Please do not bother Savio Lam with |
4 | questions about this program. | 4 | questions about this program. |
diff --git a/scripts/config/lxdialog/menubox.c b/scripts/config/lxdialog/menubox.c index 23a38e0fb..bdaaa1040 100644 --- a/scripts/config/lxdialog/menubox.c +++ b/scripts/config/lxdialog/menubox.c | |||
@@ -305,7 +305,7 @@ dialog_menu (const char *title, const char *prompt, int height, int width, | |||
305 | 305 | ||
306 | if (key == KEY_UP || key == '-') { | 306 | if (key == KEY_UP || key == '-') { |
307 | if (choice < 2 && scroll) { | 307 | if (choice < 2 && scroll) { |
308 | /* Scroll menu down */ | 308 | /* Scroll menu down */ |
309 | scrollok (menu, TRUE); | 309 | scrollok (menu, TRUE); |
310 | wscrl (menu, -1); | 310 | wscrl (menu, -1); |
311 | scrollok (menu, FALSE); | 311 | scrollok (menu, FALSE); |
@@ -339,7 +339,7 @@ dialog_menu (const char *title, const char *prompt, int height, int width, | |||
339 | choice = MIN(choice+1, max_choice-1); | 339 | choice = MIN(choice+1, max_choice-1); |
340 | 340 | ||
341 | } else if (key == KEY_PPAGE) { | 341 | } else if (key == KEY_PPAGE) { |
342 | scrollok (menu, TRUE); | 342 | scrollok (menu, TRUE); |
343 | for (i=0; (i < max_choice); i++) { | 343 | for (i=0; (i < max_choice); i++) { |
344 | if (scroll > 0) { | 344 | if (scroll > 0) { |
345 | wscrl (menu, -1); | 345 | wscrl (menu, -1); |
@@ -361,8 +361,8 @@ dialog_menu (const char *title, const char *prompt, int height, int width, | |||
361 | scrollok (menu, FALSE); | 361 | scrollok (menu, FALSE); |
362 | scroll++; | 362 | scroll++; |
363 | print_item (menu, items[scroll + max_choice - 1]->name, | 363 | print_item (menu, items[scroll + max_choice - 1]->name, |
364 | max_choice-1, FALSE, | 364 | max_choice-1, FALSE, |
365 | (items[scroll + max_choice - 1]->tag[0] != ':')); | 365 | (items[scroll + max_choice - 1]->tag[0] != ':')); |
366 | } else { | 366 | } else { |
367 | if (choice+1 < max_choice) | 367 | if (choice+1 < max_choice) |
368 | choice++; | 368 | choice++; |
diff --git a/scripts/config/lxdialog/util.c b/scripts/config/lxdialog/util.c index bb43c836e..26dd376b9 100644 --- a/scripts/config/lxdialog/util.c +++ b/scripts/config/lxdialog/util.c | |||
@@ -224,7 +224,7 @@ print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x) | |||
224 | while (word && *word) { | 224 | while (word && *word) { |
225 | sp = strchr(word, ' '); | 225 | sp = strchr(word, ' '); |
226 | if (sp) | 226 | if (sp) |
227 | *sp++ = 0; | 227 | *sp++ = 0; |
228 | 228 | ||
229 | /* Wrap to next line if either the word does not fit, | 229 | /* Wrap to next line if either the word does not fit, |
230 | or it is the first word of a new sentence, and it is | 230 | or it is the first word of a new sentence, and it is |
@@ -242,11 +242,11 @@ print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x) | |||
242 | getyx (win, cur_y, cur_x); | 242 | getyx (win, cur_y, cur_x); |
243 | cur_x++; | 243 | cur_x++; |
244 | if (sp && *sp == ' ') { | 244 | if (sp && *sp == ' ') { |
245 | cur_x++; /* double space */ | 245 | cur_x++; /* double space */ |
246 | while (*++sp == ' '); | 246 | while (*++sp == ' '); |
247 | newl = 1; | 247 | newl = 1; |
248 | } else | 248 | } else |
249 | newl = 0; | 249 | newl = 0; |
250 | word = sp; | 250 | word = sp; |
251 | } | 251 | } |
252 | } | 252 | } |
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c index b2fb112f5..b8f27e69c 100644 --- a/scripts/config/mconf.c +++ b/scripts/config/mconf.c | |||
@@ -408,7 +408,7 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym) | |||
408 | struct property *prop; | 408 | struct property *prop; |
409 | 409 | ||
410 | str_printf(r, "Symbol: %s [=%s]\n", sym->name, | 410 | str_printf(r, "Symbol: %s [=%s]\n", sym->name, |
411 | sym_get_string_value(sym)); | 411 | sym_get_string_value(sym)); |
412 | for_all_prompts(sym, prop) | 412 | for_all_prompts(sym, prop) |
413 | get_prompt_str(r, prop); | 413 | get_prompt_str(r, prop); |
414 | hit = false; | 414 | hit = false; |
diff --git a/scripts/config/menu.c b/scripts/config/menu.c index 57292cf1d..7e97e8330 100644 --- a/scripts/config/menu.c +++ b/scripts/config/menu.c | |||
@@ -185,7 +185,7 @@ void sym_check_prop(struct symbol *sym) | |||
185 | case P_RANGE: | 185 | case P_RANGE: |
186 | if (sym->type != S_INT && sym->type != S_HEX) | 186 | if (sym->type != S_INT && sym->type != S_HEX) |
187 | prop_warn(prop, "range is only allowed " | 187 | prop_warn(prop, "range is only allowed " |
188 | "for int or hex symbols"); | 188 | "for int or hex symbols"); |
189 | if (!sym_string_valid(sym, prop->expr->left.sym->name) || | 189 | if (!sym_string_valid(sym, prop->expr->left.sym->name) || |
190 | !sym_string_valid(sym, prop->expr->right.sym->name)) | 190 | !sym_string_valid(sym, prop->expr->right.sym->name)) |
191 | prop_warn(prop, "range is invalid"); | 191 | prop_warn(prop, "range is invalid"); |
diff --git a/shell/bbsh.c b/shell/bbsh.c index 2194bdad6..05ae1637e 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* vi: set ts=4 : | 1 | /* vi: set ts=4 : |
2 | * | 2 | * |
3 | * bbsh - busybox shell | 3 | * bbsh - busybox shell |
4 | * | 4 | * |
5 | * Copyright 2006 Rob Landley <rob@landley.net> | 5 | * Copyright 2006 Rob Landley <rob@landley.net> |
@@ -51,7 +51,7 @@ | |||
51 | // What we know about a single process. | 51 | // What we know about a single process. |
52 | struct command { | 52 | struct command { |
53 | struct command *next; | 53 | struct command *next; |
54 | int flags; // exit, suspend, && || | 54 | int flags; // exit, suspend, && || |
55 | int pid; // pid (or exit code) | 55 | int pid; // pid (or exit code) |
56 | int argc; | 56 | int argc; |
57 | char *argv[0]; | 57 | char *argv[0]; |
@@ -125,9 +125,9 @@ static char *parse_pipeline(char *cmdline, struct pipeline *line) | |||
125 | return 0; | 125 | return 0; |
126 | } | 126 | } |
127 | 127 | ||
128 | // Allocate next command structure if necessary | 128 | // Allocate next command structure if necessary |
129 | if (!*cmd) *cmd = xzalloc(sizeof(struct command)+8*sizeof(char *)); | 129 | if (!*cmd) *cmd = xzalloc(sizeof(struct command)+8*sizeof(char *)); |
130 | 130 | ||
131 | // Parse next argument and add the results to argv[] | 131 | // Parse next argument and add the results to argv[] |
132 | end = parse_word(start, cmd); | 132 | end = parse_word(start, cmd); |
133 | 133 | ||
@@ -138,7 +138,7 @@ static char *parse_pipeline(char *cmdline, struct pipeline *line) | |||
138 | start++; | 138 | start++; |
139 | break; | 139 | break; |
140 | } | 140 | } |
141 | // handle | & < > >> << || && | 141 | // handle | & < > >> << || && |
142 | } | 142 | } |
143 | break; | 143 | break; |
144 | } | 144 | } |
@@ -160,7 +160,7 @@ static int run_pipeline(struct pipeline *line) | |||
160 | if (cmd->argc==2 && !strcmp(cmd->argv[0],"cd")) | 160 | if (cmd->argc==2 && !strcmp(cmd->argv[0],"cd")) |
161 | chdir(cmd->argv[1]); | 161 | chdir(cmd->argv[1]); |
162 | else if(!strcmp(cmd->argv[0],"exit")) | 162 | else if(!strcmp(cmd->argv[0],"exit")) |
163 | exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0); | 163 | exit(cmd->argc>1 ? atoi(cmd->argv[1]) : 0); |
164 | else { | 164 | else { |
165 | int status; | 165 | int status; |
166 | pid_t pid=fork(); | 166 | pid_t pid=fork(); |
@@ -217,6 +217,6 @@ int bbsh_main(int argc, char *argv[]) | |||
217 | } | 217 | } |
218 | if (ENABLE_FEATURE_CLEAN_UP) free(command); | 218 | if (ENABLE_FEATURE_CLEAN_UP) free(command); |
219 | } | 219 | } |
220 | 220 | ||
221 | return 1; | 221 | return 1; |
222 | } | 222 | } |
diff --git a/testsuite/cp/cp-dir-create-dir b/testsuite/cp/cp-dir-create-dir index 2c89af67e..a8d7b50a5 100644 --- a/testsuite/cp/cp-dir-create-dir +++ b/testsuite/cp/cp-dir-create-dir | |||
@@ -1,4 +1,4 @@ | |||
1 | mkdir bar | 1 | mkdir bar |
2 | touch bar/baz | 2 | touch bar/baz |
3 | busybox cp -R bar foo | 3 | busybox cp -R bar foo |
4 | test -f foo/baz | 4 | test -f foo/baz |
diff --git a/testsuite/cp/cp-dir-existing-dir b/testsuite/cp/cp-dir-existing-dir index 5ba3f8e33..4c788ba73 100644 --- a/testsuite/cp/cp-dir-existing-dir +++ b/testsuite/cp/cp-dir-existing-dir | |||
@@ -1,5 +1,5 @@ | |||
1 | mkdir bar | 1 | mkdir bar |
2 | touch bar/baz | 2 | touch bar/baz |
3 | mkdir foo | 3 | mkdir foo |
4 | busybox cp -R bar foo | 4 | busybox cp -R bar foo |
5 | test -f foo/bar/baz | 5 | test -f foo/bar/baz |
diff --git a/testsuite/grep.tests b/testsuite/grep.tests index 0654905d2..ef0de482b 100755 --- a/testsuite/grep.tests +++ b/testsuite/grep.tests | |||
@@ -4,7 +4,7 @@ | |||
4 | # Copyright 2005 by Rob Landley <rob@landley.net> | 4 | # Copyright 2005 by Rob Landley <rob@landley.net> |
5 | # Licensed under GPL v2, see file LICENSE for details. | 5 | # Licensed under GPL v2, see file LICENSE for details. |
6 | 6 | ||
7 | # AUDIT: | 7 | # AUDIT: |
8 | 8 | ||
9 | . testing.sh | 9 | . testing.sh |
10 | 10 | ||
diff --git a/testsuite/mount.testroot b/testsuite/mount.testroot index 4ab6b94bc..e18d0461d 100755 --- a/testsuite/mount.testroot +++ b/testsuite/mount.testroot | |||
@@ -86,7 +86,7 @@ testing "mount remount nonexistent directory" \ | |||
86 | 86 | ||
87 | # Fun with mount -a | 87 | # Fun with mount -a |
88 | 88 | ||
89 | testing "mount -a no fstab" "mount -a 2>/dev/null || echo yes" "yes\n" "" "" | 89 | testing "mount -a no fstab" "mount -a 2>/dev/null || echo yes" "yes\n" "" "" |
90 | 90 | ||
91 | umount /proc | 91 | umount /proc |
92 | 92 | ||
diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests index 831dd2483..bfde26e2c 100755 --- a/testsuite/pidof.tests +++ b/testsuite/pidof.tests | |||
@@ -4,7 +4,7 @@ | |||
4 | # Copyright 2005 by Bernhard Fischer | 4 | # Copyright 2005 by Bernhard Fischer |
5 | # Licensed under GPL v2, see file LICENSE for details. | 5 | # Licensed under GPL v2, see file LICENSE for details. |
6 | 6 | ||
7 | # AUDIT: | 7 | # AUDIT: |
8 | 8 | ||
9 | . testing.sh | 9 | . testing.sh |
10 | 10 | ||
@@ -24,6 +24,6 @@ testing "pidof -s" "pidof -s init" "1\n" "" "" | |||
24 | optional FEATURE_PIDOF_OMIT | 24 | optional FEATURE_PIDOF_OMIT |
25 | testing "pidof -o %PPID" "pidof -o %PPID pidof.tests | grep -o -w $$" "" "" "" | 25 | testing "pidof -o %PPID" "pidof -o %PPID pidof.tests | grep -o -w $$" "" "" "" |
26 | testing "pidof -o %PPID NOP" "pidof -o %PPID -s init" "1\n" "" "" | 26 | testing "pidof -o %PPID NOP" "pidof -o %PPID -s init" "1\n" "" "" |
27 | testing "pidof -o init" "pidof -o 1 init | grep -o -w 1" "" "" "" | 27 | testing "pidof -o init" "pidof -o 1 init | grep -o -w 1" "" "" "" |
28 | 28 | ||
29 | exit $FAILCOUNT | 29 | exit $FAILCOUNT |
diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests index fc04702d3..0faa6ed0c 100755 --- a/testsuite/readlink.tests +++ b/testsuite/readlink.tests | |||
@@ -28,5 +28,5 @@ testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$PWD/$ | |||
28 | 28 | ||
29 | 29 | ||
30 | # clean up | 30 | # clean up |
31 | rm -r "$TESTLINK" "$TESTDIR" | 31 | rm -r "$TESTLINK" "$TESTDIR" |
32 | 32 | ||
diff --git a/testsuite/sed.tests b/testsuite/sed.tests index 9d2be5570..2a0d4eacf 100755 --- a/testsuite/sed.tests +++ b/testsuite/sed.tests | |||
@@ -116,7 +116,7 @@ testing "sed leave off trailing newline" "sed -e 's/woo/bang/' input -" \ | |||
116 | testing "sed autoinsert newline" "sed -e 's/woo/bang/' input -" "bang\nbang" \ | 116 | testing "sed autoinsert newline" "sed -e 's/woo/bang/' input -" "bang\nbang" \ |
117 | "woo" "woo" | 117 | "woo" "woo" |
118 | testing "sed empty file plus cat" "sed -e 's/nohit//' input -" "one\ntwo" \ | 118 | testing "sed empty file plus cat" "sed -e 's/nohit//' input -" "one\ntwo" \ |
119 | "" "one\ntwo" | 119 | "" "one\ntwo" |
120 | testing "sed cat plus empty file" "sed -e 's/nohit//' input -" "one\ntwo" \ | 120 | testing "sed cat plus empty file" "sed -e 's/nohit//' input -" "one\ntwo" \ |
121 | "one\ntwo" "" | 121 | "one\ntwo" "" |
122 | testing "sed append autoinserts newline" "sed -e '/woot/a woo' -" \ | 122 | testing "sed append autoinserts newline" "sed -e '/woot/a woo' -" \ |
@@ -138,7 +138,7 @@ testing "sed selective matches noinsert newline" \ | |||
138 | "c no\nd no" | 138 | "c no\nd no" |
139 | testing "sed clusternewline" \ | 139 | testing "sed clusternewline" \ |
140 | "sed -e '/one/a 111' -e '/two/i 222' -e p input -" \ | 140 | "sed -e '/one/a 111' -e '/two/i 222' -e p input -" \ |
141 | "one\none\n111\n222\ntwo\ntwo" "one" "two" | 141 | "one\none\n111\n222\ntwo\ntwo" "one" "two" |
142 | 142 | ||
143 | # Test end-of-file matching behavior | 143 | # Test end-of-file matching behavior |
144 | 144 | ||
diff --git a/testsuite/sort.tests b/testsuite/sort.tests index cd2e291b2..5a4937b58 100755 --- a/testsuite/sort.tests +++ b/testsuite/sort.tests | |||
@@ -56,7 +56,7 @@ testing "sort key range with numeric option and global reverse" \ | |||
56 | 7 3 42 soup | 56 | 7 3 42 soup |
57 | " "$data" "" | 57 | " "$data" "" |
58 | 58 | ||
59 | # | 59 | # |
60 | 60 | ||
61 | testing "sort key range with multiple options" "sort -k2,3rn input" \ | 61 | testing "sort key range with multiple options" "sort -k2,3rn input" \ |
62 | "7 3 42 soup | 62 | "7 3 42 soup |
@@ -67,7 +67,7 @@ egg 1 2 papyrus | |||
67 | " "$data" "" | 67 | " "$data" "" |
68 | 68 | ||
69 | testing "sort key doesn't strip leading blanks, disables fallback global sort" \ | 69 | testing "sort key doesn't strip leading blanks, disables fallback global sort" \ |
70 | "sort -n -k2 -t ' '" " a \n 1 \n 2 \n" "" " 2 \n 1 \n a \n" | 70 | "sort -n -k2 -t ' '" " a \n 1 \n 2 \n" "" " 2 \n 1 \n a \n" |
71 | 71 | ||
72 | testing "sort key edge case with -t" "sort -n -k4 -t/" \ | 72 | testing "sort key edge case with -t" "sort -n -k4 -t/" \ |
73 | "/usr/lib/finish-install.d/1 | 73 | "/usr/lib/finish-install.d/1 |
diff --git a/testsuite/testing.sh b/testsuite/testing.sh index 8bd23d803..e253e1aa6 100755 --- a/testsuite/testing.sh +++ b/testsuite/testing.sh | |||
@@ -76,7 +76,7 @@ testing () | |||
76 | echo -ne "$5" | eval "$2" > actual | 76 | echo -ne "$5" | eval "$2" > actual |
77 | RETVAL=$? | 77 | RETVAL=$? |
78 | 78 | ||
79 | cmp expected actual > /dev/null | 79 | cmp expected actual > /dev/null |
80 | if [ $? -ne 0 ] | 80 | if [ $? -ne 0 ] |
81 | then | 81 | then |
82 | FAILCOUNT=$[$FAILCOUNT+1] | 82 | FAILCOUNT=$[$FAILCOUNT+1] |
diff --git a/testsuite/tr/tr-works b/testsuite/tr/tr-works index b7a6e8df7..9b2e90e42 100644 --- a/testsuite/tr/tr-works +++ b/testsuite/tr/tr-works | |||
@@ -7,7 +7,7 @@ run_tr () | |||
7 | tr_test () | 7 | tr_test () |
8 | { | 8 | { |
9 | run_tr "cbaab" abc zyx | 9 | run_tr "cbaab" abc zyx |
10 | run_tr "TESTING A B C" '[A-Z]' '[a-z]' | 10 | run_tr "TESTING A B C" '[A-Z]' '[a-z]' |
11 | run_tr "abc[]" "a[b" AXB | 11 | run_tr "abc[]" "a[b" AXB |
12 | run_tr abc '[:alpha:]' A-ZA-Z | 12 | run_tr abc '[:alpha:]' A-ZA-Z |
13 | run_tr abc56 '[:alnum:]' A-ZA-Zxxxxxxxxxx | 13 | run_tr abc56 '[:alnum:]' A-ZA-Zxxxxxxxxxx |
diff --git a/testsuite/uniq.tests b/testsuite/uniq.tests index a1b69c2e5..49d4bed9c 100755 --- a/testsuite/uniq.tests +++ b/testsuite/uniq.tests | |||
@@ -40,7 +40,7 @@ testing "uniq input - (specify stdout)" "uniq input -" \ | |||
40 | #-s skip chars | 40 | #-s skip chars |
41 | #-c occurrences | 41 | #-c occurrences |
42 | #-d dups only | 42 | #-d dups only |
43 | #-u | 43 | #-u |
44 | 44 | ||
45 | # Test various command line options | 45 | # Test various command line options |
46 | 46 | ||
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index 34519dfd1..c8b3aeeab 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * | 3 | * |
4 | * dmesg - display/control kernel ring buffer. | 4 | * dmesg - display/control kernel ring buffer. |
5 | * | 5 | * |
6 | * Copyright 2006 Rob Landley <rob@landley.net> | 6 | * Copyright 2006 Rob Landley <rob@landley.net> |
@@ -30,7 +30,7 @@ int dmesg_main(int argc, char *argv[]) | |||
30 | if (0 > (len = klogctl(3 + (flags & 1), buf, len))) | 30 | if (0 > (len = klogctl(3 + (flags & 1), buf, len))) |
31 | bb_perror_msg_and_die("klogctl"); | 31 | bb_perror_msg_and_die("klogctl"); |
32 | 32 | ||
33 | // Skip <#> at the start of lines, and make sure we end with a newline. | 33 | // Skip <#> at the start of lines, and make sure we end with a newline. |
34 | 34 | ||
35 | if (ENABLE_FEATURE_DMESG_PRETTY) { | 35 | if (ENABLE_FEATURE_DMESG_PRETTY) { |
36 | int last = '\n'; | 36 | int last = '\n'; |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 8c7225816..55f716657 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -1914,9 +1914,9 @@ sgi_set_swappartition(int i) | |||
1914 | static int | 1914 | static int |
1915 | sgi_check_bootfile(const char* aFile) | 1915 | sgi_check_bootfile(const char* aFile) |
1916 | { | 1916 | { |
1917 | if (strlen(aFile) < 3) /* "/a\n" is minimum */ { | 1917 | if (strlen(aFile) < 3) /* "/a\n" is minimum */ { |
1918 | printf(_("\nInvalid Bootfile!\n" | 1918 | printf(_("\nInvalid Bootfile!\n" |
1919 | "\tThe bootfile must be an absolute non-zero pathname,\n" | 1919 | "\tThe bootfile must be an absolute non-zero pathname,\n" |
1920 | "\te.g. \"/unix\" or \"/unix.save\".\n")); | 1920 | "\te.g. \"/unix\" or \"/unix.save\".\n")); |
1921 | return 0; | 1921 | return 0; |
1922 | } else { | 1922 | } else { |
@@ -1931,7 +1931,7 @@ sgi_check_bootfile(const char* aFile) | |||
1931 | return 0; | 1931 | return 0; |
1932 | } | 1932 | } |
1933 | } | 1933 | } |
1934 | } | 1934 | } |
1935 | if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) { | 1935 | if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) { |
1936 | printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t" | 1936 | printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t" |
1937 | "SGI's default is \"/unix\" and for backup \"/unix.save\".\n")); | 1937 | "SGI's default is \"/unix\" and for backup \"/unix.save\".\n")); |
@@ -2505,7 +2505,7 @@ static const struct systypes sun_sys_types[] = { | |||
2505 | { "\x83" "Linux native" }, /* LINUX_NATIVE */ | 2505 | { "\x83" "Linux native" }, /* LINUX_NATIVE */ |
2506 | { "\x8e" "Linux LVM" }, /* 0x8e */ | 2506 | { "\x8e" "Linux LVM" }, /* 0x8e */ |
2507 | /* New (2.2.x) raid partition with autodetect using persistent superblock */ | 2507 | /* New (2.2.x) raid partition with autodetect using persistent superblock */ |
2508 | { "\xfd" "Linux raid autodetect" }, /* 0xfd */ | 2508 | { "\xfd" "Linux raid autodetect" }, /* 0xfd */ |
2509 | { NULL } | 2509 | { NULL } |
2510 | }; | 2510 | }; |
2511 | 2511 | ||
@@ -3080,14 +3080,14 @@ sun_list_table(int xtra) | |||
3080 | uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; | 3080 | uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; |
3081 | uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors); | 3081 | uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors); |
3082 | printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n", | 3082 | printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n", |
3083 | partname(disk_device, i+1, w), /* device */ | 3083 | partname(disk_device, i+1, w), /* device */ |
3084 | (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */ | 3084 | (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */ |
3085 | (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ', | 3085 | (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ', |
3086 | (long) scround(start), /* start */ | 3086 | (long) scround(start), /* start */ |
3087 | (long) scround(start+len), /* end */ | 3087 | (long) scround(start+len), /* end */ |
3088 | (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */ | 3088 | (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */ |
3089 | sunlabel->infos[i].id, /* type id */ | 3089 | sunlabel->infos[i].id, /* type id */ |
3090 | partition_type(sunlabel->infos[i].id)); /* type name */ | 3090 | partition_type(sunlabel->infos[i].id)); /* type name */ |
3091 | } | 3091 | } |
3092 | } | 3092 | } |
3093 | } | 3093 | } |
@@ -4280,8 +4280,8 @@ get_partition(int warn, int max) | |||
4280 | if (warn) { | 4280 | if (warn) { |
4281 | if ( | 4281 | if ( |
4282 | ( | 4282 | ( |
4283 | label_sun != current_label_type && | 4283 | label_sun != current_label_type && |
4284 | label_sgi != current_label_type && | 4284 | label_sgi != current_label_type && |
4285 | !pe->part_table->sys_ind | 4285 | !pe->part_table->sys_ind |
4286 | ) | 4286 | ) |
4287 | #ifdef CONFIG_FEATURE_SUN_LABEL | 4287 | #ifdef CONFIG_FEATURE_SUN_LABEL |
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 136243122..c2d79da5b 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
@@ -66,9 +66,9 @@ int hexdump_main(int argc, char **argv) | |||
66 | bb_dump_add(add_first); | 66 | bb_dump_add(add_first); |
67 | bb_dump_add(add_strings[(int)(p - hexdump_opts)]); | 67 | bb_dump_add(add_strings[(int)(p - hexdump_opts)]); |
68 | } else if (ch == 'C') { | 68 | } else if (ch == 'C') { |
69 | bb_dump_add("\"%08.8_Ax\n\""); | 69 | bb_dump_add("\"%08.8_Ax\n\""); |
70 | bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); | 70 | bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); |
71 | bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); | 71 | bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); |
72 | } else { | 72 | } else { |
73 | /* Sae a little bit of space below by omitting the 'else's. */ | 73 | /* Sae a little bit of space below by omitting the 'else's. */ |
74 | if (ch == 'e') { | 74 | if (ch == 'e') { |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index b6ca00409..da4930f27 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -138,7 +138,7 @@ static void make_device(char *path, int delete) | |||
138 | // Command to run | 138 | // Command to run |
139 | char *s = "@$*", *s2; | 139 | char *s = "@$*", *s2; |
140 | if (!(s2 = strchr(s, *pos++))) { | 140 | if (!(s2 = strchr(s, *pos++))) { |
141 | // Force error | 141 | // Force error |
142 | field = 1; | 142 | field = 1; |
143 | break; | 143 | break; |
144 | } | 144 | } |
@@ -171,13 +171,13 @@ static void make_device(char *path, int delete) | |||
171 | 171 | ||
172 | if (major == bbg.root_major && minor == bbg.root_minor) | 172 | if (major == bbg.root_major && minor == bbg.root_minor) |
173 | symlink(device_name, "root"); | 173 | symlink(device_name, "root"); |
174 | 174 | ||
175 | if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid); | 175 | if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid); |
176 | } | 176 | } |
177 | if (command) { | 177 | if (command) { |
178 | int rc; | 178 | int rc; |
179 | char *s; | 179 | char *s; |
180 | 180 | ||
181 | s=xasprintf("MDEV=%s",device_name); | 181 | s=xasprintf("MDEV=%s",device_name); |
182 | putenv(s); | 182 | putenv(s); |
183 | rc = system(command); | 183 | rc = system(command); |
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index b109f5ce1..8c307ec43 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c | |||
@@ -19,7 +19,7 @@ int mkswap_main(int argc, char *argv[]) | |||
19 | if (argc!=2) bb_show_usage(); | 19 | if (argc!=2) bb_show_usage(); |
20 | 20 | ||
21 | // Figure out how big the device is and announce our intentions. | 21 | // Figure out how big the device is and announce our intentions. |
22 | 22 | ||
23 | fd = xopen(argv[1],O_RDWR); | 23 | fd = xopen(argv[1],O_RDWR); |
24 | len = fdlength(fd); | 24 | len = fdlength(fd); |
25 | pagesize = getpagesize(); | 25 | pagesize = getpagesize(); |
diff --git a/util-linux/mount.c b/util-linux/mount.c index ea96fb5b0..6176de3a1 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -673,7 +673,7 @@ get_mountport(struct sockaddr_in *server_addr, | |||
673 | p.pm_vers = version; | 673 | p.pm_vers = version; |
674 | p.pm_prot = proto; | 674 | p.pm_prot = proto; |
675 | p.pm_port = port; | 675 | p.pm_port = port; |
676 | 676 | ||
677 | while (pmap) { | 677 | while (pmap) { |
678 | if (pmap->pml_map.pm_prog != prog) | 678 | if (pmap->pml_map.pm_prog != prog) |
679 | goto next; | 679 | goto next; |
@@ -1315,7 +1315,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) | |||
1315 | s = strrchr(mp->mnt_fsname, '\\'); | 1315 | s = strrchr(mp->mnt_fsname, '\\'); |
1316 | if (s == mp->mnt_fsname+1) goto report_error; | 1316 | if (s == mp->mnt_fsname+1) goto report_error; |
1317 | *s = 0; | 1317 | *s = 0; |
1318 | he = gethostbyname(mp->mnt_fsname+2); | 1318 | he = gethostbyname(mp->mnt_fsname+2); |
1319 | *s = '\\'; | 1319 | *s = '\\'; |
1320 | if (!he) goto report_error; | 1320 | if (!he) goto report_error; |
1321 | 1321 | ||
@@ -1517,7 +1517,7 @@ int mount_main(int argc, char **argv) | |||
1517 | if (rc) bb_perror_msg_and_die("%s", argv[0]); | 1517 | if (rc) bb_perror_msg_and_die("%s", argv[0]); |
1518 | goto clean_up; | 1518 | goto clean_up; |
1519 | } | 1519 | } |
1520 | 1520 | ||
1521 | // Open either fstab or mtab | 1521 | // Open either fstab or mtab |
1522 | 1522 | ||
1523 | if (parse_mount_options(cmdopts,0) & MS_REMOUNT) | 1523 | if (parse_mount_options(cmdopts,0) & MS_REMOUNT) |
diff --git a/util-linux/umount.c b/util-linux/umount.c index 1a6b14ccc..f19586a0d 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c | |||
@@ -76,7 +76,7 @@ int umount_main(int argc, char **argv) | |||
76 | m = 0; | 76 | m = 0; |
77 | if (!argc) bb_show_usage(); | 77 | if (!argc) bb_show_usage(); |
78 | } | 78 | } |
79 | 79 | ||
80 | // Loop through everything we're supposed to umount, and do so. | 80 | // Loop through everything we're supposed to umount, and do so. |
81 | for (;;) { | 81 | for (;;) { |
82 | int curstat; | 82 | int curstat; |