aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2022-02-09 09:03:18 +0000
committerRon Yorston <rmy@pobox.com>2022-02-09 09:05:39 +0000
commit492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch)
tree4f5764a5c2250c031ea05e9aeacbb40d7971f493 /coreutils
parent4734416a21312488a5099a297907783bee4ccc22 (diff)
parentcaa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff)
downloadbusybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz
busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2
busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip
Merge busybox into merge
Fix conflicts in reset and ash. Redefine the new safe_read_key() as a reference to read_key(). Disable SHA256_HWACCEL.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/head.c6
-rw-r--r--coreutils/od.c2
-rw-r--r--coreutils/test.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/coreutils/head.c b/coreutils/head.c
index 9586f869f..c7537a20e 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -76,7 +76,7 @@ print_except_N_last_bytes(FILE *fp, unsigned count)
76{ 76{
77 unsigned char *circle = xmalloc(++count); 77 unsigned char *circle = xmalloc(++count);
78 unsigned head = 0; 78 unsigned head = 0;
79 for(;;) { 79 for (;;) {
80 int c; 80 int c;
81 c = getc(fp); 81 c = getc(fp);
82 if (c == EOF) 82 if (c == EOF)
@@ -105,7 +105,7 @@ print_except_N_last_lines(FILE *fp, unsigned count)
105{ 105{
106 char **circle = xzalloc((++count) * sizeof(circle[0])); 106 char **circle = xzalloc((++count) * sizeof(circle[0]));
107 unsigned head = 0; 107 unsigned head = 0;
108 for(;;) { 108 for (;;) {
109 char *c; 109 char *c;
110 c = xmalloc_fgets(fp); 110 c = xmalloc_fgets(fp);
111 if (!c) 111 if (!c)
@@ -127,7 +127,7 @@ print_except_N_last_lines(FILE *fp, unsigned count)
127 } 127 }
128 ret: 128 ret:
129 head = 0; 129 head = 0;
130 for(;;) { 130 for (;;) {
131 free(circle[head++]); 131 free(circle[head++]);
132 if (head == count) 132 if (head == count)
133 break; 133 break;
diff --git a/coreutils/od.c b/coreutils/od.c
index 9a888dd5f..6f22331e0 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -144,7 +144,7 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
144 } 144 }
145} 145}
146 146
147static const char *const add_strings[] = { 147static const char *const add_strings[] ALIGN_PTR = {
148 "16/1 \"%3_u \" \"\\n\"", /* a */ 148 "16/1 \"%3_u \" \"\\n\"", /* a */
149 "8/2 \" %06o \" \"\\n\"", /* B, o */ 149 "8/2 \" %06o \" \"\\n\"", /* B, o */
150 "16/1 \"%03o \" \"\\n\"", /* b */ 150 "16/1 \"%03o \" \"\\n\"", /* b */
diff --git a/coreutils/test.c b/coreutils/test.c
index a914c7490..840a0daaf 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -242,7 +242,7 @@ int depth;
242 depth--; \ 242 depth--; \
243 return __res; \ 243 return __res; \
244} while (0) 244} while (0)
245static const char *const TOKSTR[] = { 245static const char *const TOKSTR[] ALIGN_PTR = {
246 "EOI", 246 "EOI",
247 "FILRD", 247 "FILRD",
248 "FILWR", 248 "FILWR",