aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in2
-rwxr-xr-xapplets/usage_compressed6
-rw-r--r--editors/patch_toybox.c2
-rwxr-xr-xexamples/var_service/dhcp_if/convert2ipconf2
-rw-r--r--mailutils/mime.c2
-rw-r--r--networking/ftpd.c4
-rw-r--r--networking/traceroute.c2
-rw-r--r--networking/udhcp/leases.c2
-rw-r--r--networking/udhcp/script.c2
-rwxr-xr-xscripts/checkhelp.awk2
-rw-r--r--shell/hush.c2
-rwxr-xr-xshell/hush_test/hush-misc/func4.tests2
-rwxr-xr-xshell/msh_test/msh-execution/nested_break.tests18
-rw-r--r--util-linux/mkfs_ext2.c14
-rw-r--r--util-linux/mkfs_vfat.c2
15 files changed, 32 insertions, 32 deletions
diff --git a/Config.in b/Config.in
index 2ed88892a..8e751530c 100644
--- a/Config.in
+++ b/Config.in
@@ -521,7 +521,7 @@ config EFENCE
521endchoice 521endchoice
522 522
523### config PARSE 523### config PARSE
524### bool "Uniform config file parser debugging applet: parse" 524### bool "Uniform config file parser debugging applet: parse"
525 525
526endmenu 526endmenu
527 527
diff --git a/applets/usage_compressed b/applets/usage_compressed
index a299ecdf1..8d343529d 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -21,9 +21,9 @@ echo 'static const char packed_usage[] ALIGN1 = {'
21## 21##
22## "$loc/usage" | bzip2 -1 | od -v -x \ 22## "$loc/usage" | bzip2 -1 | od -v -x \
23## | $SED -e 's/^[^ ]*//' \ 23## | $SED -e 's/^[^ ]*//' \
24## -e 's/ //g' \ 24## -e 's/ //g' \
25## -e '/^$/d' \ 25## -e '/^$/d' \
26## -e 's/\(..\)\(..\)/0x\2,0x\1,/g' 26## -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
27 27
28"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \ 28"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \
29| $SED -e 's/^[^ ]*//' \ 29| $SED -e 's/^[^ ]*//' \
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index f1e0de6cd..0e5c070e2 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -491,7 +491,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
491 int oldsum, newsum, del = 0; 491 int oldsum, newsum, del = 0;
492 char *s, *name; 492 char *s, *name;
493 493
494 oldsum = oldline + oldlen; 494 oldsum = oldline + oldlen;
495 newsum = newline + newlen; 495 newsum = newline + newlen;
496 496
497 name = reverse ? oldname : newname; 497 name = reverse ? oldname : newname;
diff --git a/examples/var_service/dhcp_if/convert2ipconf b/examples/var_service/dhcp_if/convert2ipconf
index 114ab0555..62a288ebf 100755
--- a/examples/var_service/dhcp_if/convert2ipconf
+++ b/examples/var_service/dhcp_if/convert2ipconf
@@ -28,7 +28,7 @@ test "$ip" || exit 1
28 28
29{ 29{
30echo "let cfg=cfg+1" 30echo "let cfg=cfg+1"
31test "$interface" && echo "if[\$cfg]='$interface'" 31test "$interface" && echo "if[\$cfg]='$interface'"
32test "$ip" && echo "ip[\$cfg]='$ip'" 32test "$ip" && echo "ip[\$cfg]='$ip'"
33test "$ip" && test "$mask" \ 33test "$ip" && test "$mask" \
34 && echo "ipmask[\$cfg]='$ip/$mask'" 34 && echo "ipmask[\$cfg]='$ip/$mask'"
diff --git a/mailutils/mime.c b/mailutils/mime.c
index 17d0f9d80..125ca01dd 100644
--- a/mailutils/mime.c
+++ b/mailutils/mime.c
@@ -369,7 +369,7 @@ static int parse(const char *boundary, char **argv)
369 } 369 }
370 } 370 }
371 next: 371 next:
372 free(line); 372 free(line);
373 } 373 }
374 374
375//bb_info_msg("ENDPARSE[%s]", boundary); 375//bb_info_msg("ENDPARSE[%s]", boundary);
diff --git a/networking/ftpd.c b/networking/ftpd.c
index fdc6f5e45..b7d5b20b1 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -716,7 +716,7 @@ handle_dir_common(int opts)
716 /* STAT <filename> */ 716 /* STAT <filename> */
717 cmdio_write_raw(STR(FTP_STATFILE_OK)"-File status:\r\n"); 717 cmdio_write_raw(STR(FTP_STATFILE_OK)"-File status:\r\n");
718 while (1) { 718 while (1) {
719 line = xmalloc_fgetline(ls_fp); 719 line = xmalloc_fgetline(ls_fp);
720 if (!line) 720 if (!line)
721 break; 721 break;
722 /* Hack: 0 results in no status at all */ 722 /* Hack: 0 results in no status at all */
@@ -731,7 +731,7 @@ handle_dir_common(int opts)
731 int remote_fd = get_remote_transfer_fd(" Directory listing"); 731 int remote_fd = get_remote_transfer_fd(" Directory listing");
732 if (remote_fd >= 0) { 732 if (remote_fd >= 0) {
733 while (1) { 733 while (1) {
734 line = xmalloc_fgetline(ls_fp); 734 line = xmalloc_fgetline(ls_fp);
735 if (!line) 735 if (!line)
736 break; 736 break;
737 /* I've seen clients complaining when they 737 /* I've seen clients complaining when they
diff --git a/networking/traceroute.c b/networking/traceroute.c
index a30decf10..2d3e77011 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -364,7 +364,7 @@ wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to)
364 read_len = recv_from_to(rcvsock, 364 read_len = recv_from_to(rcvsock,
365 recv_pkt, sizeof(recv_pkt), 365 recv_pkt, sizeof(recv_pkt),
366 /*flags:*/ 0, 366 /*flags:*/ 0,
367 &from_lsa->u.sa, to, from_lsa->len); 367 &from_lsa->u.sa, to, from_lsa->len);
368 } 368 }
369 369
370 return read_len; 370 return read_len;
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index afd41bfd4..78b0d0ade 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -66,7 +66,7 @@ struct dyn_lease* FAST_FUNC add_lease(
66 char *p; 66 char *p;
67 if (hostname_len > sizeof(oldest->hostname)) 67 if (hostname_len > sizeof(oldest->hostname))
68 hostname_len = sizeof(oldest->hostname); 68 hostname_len = sizeof(oldest->hostname);
69 p = safe_strncpy(oldest->hostname, hostname, hostname_len); 69 p = safe_strncpy(oldest->hostname, hostname, hostname_len);
70 /* sanitization (s/non-ASCII/^/g) */ 70 /* sanitization (s/non-ASCII/^/g) */
71 while (*p) { 71 while (*p) {
72 if (*p < ' ' || *p > 126) 72 if (*p < ' ' || *p > 126)
diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index 065ea0cc7..574c74f45 100644
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -17,7 +17,7 @@
17static const uint8_t len_of_option_as_string[] = { 17static const uint8_t len_of_option_as_string[] = {
18 [OPTION_IP] = sizeof("255.255.255.255 "), 18 [OPTION_IP] = sizeof("255.255.255.255 "),
19 [OPTION_IP_PAIR] = sizeof("255.255.255.255 ") * 2, 19 [OPTION_IP_PAIR] = sizeof("255.255.255.255 ") * 2,
20 [OPTION_STATIC_ROUTES]= sizeof("255.255.255.255/32 255.255.255.255 "), 20 [OPTION_STATIC_ROUTES]= sizeof("255.255.255.255/32 255.255.255.255 "),
21 [OPTION_STRING] = 1, 21 [OPTION_STRING] = 1,
22#if ENABLE_FEATURE_UDHCP_RFC3397 22#if ENABLE_FEATURE_UDHCP_RFC3397
23 [OPTION_STR1035] = 1, 23 [OPTION_STR1035] = 1,
diff --git a/scripts/checkhelp.awk b/scripts/checkhelp.awk
index 2468db2da..94843d6ff 100755
--- a/scripts/checkhelp.awk
+++ b/scripts/checkhelp.awk
@@ -32,7 +32,7 @@ BEGIN {
32} 32}
33END { 33END {
34 for (i = 0; i <= pos; i++) { 34 for (i = 0; i <= pos; i++) {
35# printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]); 35# printf("%s: help for #%i '%s' == %i\n", file[i], i, conf[i], help[i]);
36 if (help[i] == 0) { 36 if (help[i] == 0) {
37 printf("%s: No helptext for '%s'\n", file[i], conf[i]); 37 printf("%s: No helptext for '%s'\n", file[i], conf[i]);
38 } 38 }
diff --git a/shell/hush.c b/shell/hush.c
index 9a9b5bb91..e0c562621 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2037,7 +2037,7 @@ static const char *next_brace_sub(const char *cp)
2037 break; 2037 break;
2038 cp++; 2038 cp++;
2039 continue; 2039 continue;
2040 } 2040 }
2041 /*{*/ if ((*cp == '}' && depth-- == 0) || (*cp == ',' && depth == 0)) 2041 /*{*/ if ((*cp == '}' && depth-- == 0) || (*cp == ',' && depth == 0))
2042 break; 2042 break;
2043 if (*cp++ == '{') /*}*/ 2043 if (*cp++ == '{') /*}*/
diff --git a/shell/hush_test/hush-misc/func4.tests b/shell/hush_test/hush-misc/func4.tests
index 33b1663f3..74c1b9a46 100755
--- a/shell/hush_test/hush-misc/func4.tests
+++ b/shell/hush_test/hush-misc/func4.tests
@@ -2,6 +2,6 @@ func() {
2 eval "echo \"\${val_${1}}\"" 2 eval "echo \"\${val_${1}}\""
3} 3}
4 4
5val_x=24 5val_x=24
6(func x) 6(func x)
7echo Done 7echo Done
diff --git a/shell/msh_test/msh-execution/nested_break.tests b/shell/msh_test/msh-execution/nested_break.tests
index f2e6f81ae..1a954d227 100755
--- a/shell/msh_test/msh-execution/nested_break.tests
+++ b/shell/msh_test/msh-execution/nested_break.tests
@@ -3,15 +3,15 @@
3n=0 3n=0
4while : 4while :
5do 5do
6 echo A 6 echo A
7 while : 7 while :
8 do 8 do
9 echo B 9 echo B
10 break 10 break
11 done 11 done
12 echo iteration 12 echo iteration
13 [ $n = 1 ] && break 13 [ $n = 1 ] && break
14 echo C 14 echo C
15 n=`expr $n + 1` 15 n=`expr $n + 1`
16done 16done
17echo D 17echo D
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 8b435c120..19c3c673e 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -145,12 +145,12 @@ static void PUT(uint64_t off, void *buf, uint32_t size)
145 145
146// Standard mke2fs 1.41.9: 146// Standard mke2fs 1.41.9:
147// Usage: mke2fs [-c|-l filename] [-b block-size] [-f fragment-size] 147// Usage: mke2fs [-c|-l filename] [-b block-size] [-f fragment-size]
148// [-i bytes-per-inode] [-I inode-size] [-J journal-options] 148// [-i bytes-per-inode] [-I inode-size] [-J journal-options]
149// [-G meta group size] [-N number-of-inodes] 149// [-G meta group size] [-N number-of-inodes]
150// [-m reserved-blocks-percentage] [-o creator-os] 150// [-m reserved-blocks-percentage] [-o creator-os]
151// [-g blocks-per-group] [-L volume-label] [-M last-mounted-directory] 151// [-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]
152// [-O feature[,...]] [-r fs-revision] [-E extended-option[,...]] 152// [-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]
153// [-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count] 153// [-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]
154// 154//
155// Options not commented below are taken but silently ignored: 155// Options not commented below are taken but silently ignored:
156enum { 156enum {
@@ -311,7 +311,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
311 nreserved = (uint64_t)nblocks * reserved_percent / 100; 311 nreserved = (uint64_t)nblocks * reserved_percent / 100;
312 312
313 // N.B. killing e2fsprogs feature! Unused blocks don't account in calculations 313 // N.B. killing e2fsprogs feature! Unused blocks don't account in calculations
314 nblocks_full = nblocks; 314 nblocks_full = nblocks;
315 315
316 // If last block group is too small, nblocks may be decreased in order 316 // If last block group is too small, nblocks may be decreased in order
317 // to discard it, and control returns here to recalculate some 317 // to discard it, and control returns here to recalculate some
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 54c068d0b..a9a65aa07 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -208,7 +208,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
208 int dev; 208 int dev;
209 unsigned bytes_per_sect; 209 unsigned bytes_per_sect;
210 unsigned sect_per_fat; 210 unsigned sect_per_fat;
211 unsigned opts; 211 unsigned opts;
212 uint16_t sect_per_track; 212 uint16_t sect_per_track;
213 uint8_t media_byte; 213 uint8_t media_byte;
214 uint8_t sect_per_clust; 214 uint8_t sect_per_clust;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 10:42:35 +0000