diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-27 18:01:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-27 18:01:42 +0200 |
| commit | 20cc390b9bb33cd0ab05c8bbfcd24babad7ec204 (patch) | |
| tree | 876974f2abe0ae0213e5707fb551af70b73665cd /libbb | |
| parent | bae3abf2c7185f0a9145ed2c97abb2d2e7bc2b40 (diff) | |
| download | busybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.tar.gz busybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.tar.bz2 busybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.zip | |
post-1.14.0 fixes
hush significantly updated.
fixes for acpid, awk, depmod, dhcp, gzip, mdev, modprobe, sysctl.
libbb fixes.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/pw_encrypt_des.c | 4 | ||||
| -rw-r--r-- | libbb/read.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c index 52548d623..c8e02ddff 100644 --- a/libbb/pw_encrypt_des.c +++ b/libbb/pw_encrypt_des.c | |||
| @@ -778,8 +778,10 @@ des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE], | |||
| 778 | to64_msb_first(output + 2, (r0 >> 8)); | 778 | to64_msb_first(output + 2, (r0 >> 8)); |
| 779 | /* bits 7..0 of r0 and 31..16 of r1 */ | 779 | /* bits 7..0 of r0 and 31..16 of r1 */ |
| 780 | to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16)); | 780 | to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16)); |
| 781 | /* (bits 15..0 of r1 + 00) and NUL byte */ | 781 | /* bits 15..0 of r1 and two zero bits (plus extra zero byte) */ |
| 782 | to64_msb_first(output + 10, (r1 << 8)); | 782 | to64_msb_first(output + 10, (r1 << 8)); |
| 783 | /* extra zero byte is encoded as '.', fixing it */ | ||
| 784 | output[13] = '\0'; | ||
| 783 | #endif | 785 | #endif |
| 784 | 786 | ||
| 785 | return output; | 787 | return output; |
diff --git a/libbb/read.c b/libbb/read.c index 37503e84d..4654f737e 100644 --- a/libbb/read.c +++ b/libbb/read.c | |||
| @@ -229,7 +229,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p) | |||
| 229 | if (size > 64*1024) | 229 | if (size > 64*1024) |
| 230 | size = 64*1024; | 230 | size = 64*1024; |
| 231 | } | 231 | } |
| 232 | xrealloc(buf, total + 1); | 232 | buf = xrealloc(buf, total + 1); |
| 233 | buf[total] = '\0'; | 233 | buf[total] = '\0'; |
| 234 | 234 | ||
| 235 | if (maxsz_p) | 235 | if (maxsz_p) |
| @@ -273,7 +273,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p) | |||
| 273 | free(buf); | 273 | free(buf); |
| 274 | return NULL; | 274 | return NULL; |
| 275 | } | 275 | } |
| 276 | xrealloc(buf, size + 1); | 276 | buf = xrealloc(buf, size + 1); |
| 277 | buf[size] = '\0'; | 277 | buf[size] = '\0'; |
| 278 | 278 | ||
| 279 | if (maxsz_p) | 279 | if (maxsz_p) |