mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
busybox: remove old patches
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
f1b5350bac
commit
a258836a32
@ -1,12 +0,0 @@
|
||||
diff -Naur busybox-1.13.2/init/halt.c busybox-1.13.2a/init/halt.c
|
||||
--- busybox-1.13.2/init/halt.c 2008-11-09 18:28:19.000000000 +0100
|
||||
+++ busybox-1.13.2a/init/halt.c 2009-02-01 16:38:37.000000000 +0100
|
||||
@@ -79,7 +79,7 @@
|
||||
|
||||
/* Perform action. */
|
||||
rc = 1;
|
||||
- if (!(flags & 4)) { /* no -f */
|
||||
+ if (ENABLE_INIT && !(flags & 4)) { /* no -f */
|
||||
//TODO: I tend to think that signalling linuxrc is wrong
|
||||
// pity original author didn't comment on it...
|
||||
if (ENABLE_FEATURE_INITRD) {
|
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c
|
||||
--- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200
|
||||
+++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200
|
||||
@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent
|
||||
query_len = strlen(query_string) + 1;
|
||||
/* may be unaligned! */
|
||||
unaligned_type_class = (void *)(query_string + query_len);
|
||||
- query_len += sizeof(unaligned_type_class);
|
||||
+ query_len += sizeof(*unaligned_type_class);
|
||||
/* where to append answer block */
|
||||
answb = (void *)(unaligned_type_class + 1);
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c
|
||||
--- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200
|
||||
+++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200
|
||||
@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha
|
||||
#if ENABLE_FEATURE_SORT_BIG
|
||||
/* Open output file _after_ we read all input ones */
|
||||
if (option_mask32 & FLAG_o)
|
||||
- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
|
||||
+ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
|
||||
#endif
|
||||
flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
|
||||
for (i = 0; i < linecount; i++)
|
@ -1,12 +0,0 @@
|
||||
diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c
|
||||
--- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200
|
||||
+++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200
|
||||
@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p
|
||||
}
|
||||
}
|
||||
if (stats)
|
||||
- stats->byte_count = stats->unicode_count = (d - dst);
|
||||
+ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
|
||||
return dst;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user