upgrade busybox to 1.4.0

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6204 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 62 insertions, 92 deletions

diff --git a/package/busybox/patches/913-libbb_hash.patch b/package/busybox/patches/913-libbb_hash.patch
index dc29bb05c0..a9cb23988e 100644
--- a/package/busybox/patches/913-libbb_hash.patch
+++ b/package/busybox/patches/913-libbb_hash.patch
@@ -1,14 +1,7 @@
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# expose (again) an hash_fd function (used in 911-ipkg.patch)
-#
-diff -ruN busybox-1.3.1-orig/coreutils/md5_sha1_sum.c busybox-1.3.1-913/coreutils/md5_sha1_sum.c
---- busybox-1.3.1-orig/coreutils/md5_sha1_sum.c	2006-12-27 05:54:50.000000000 +0100
-+++ busybox-1.3.1-913/coreutils/md5_sha1_sum.c	2006-12-28 00:59:35.000000000 +0100
-@@ -8,78 +8,10 @@
+diff -ur busybox.old/coreutils/md5_sha1_sum.c busybox.dev/coreutils/md5_sha1_sum.c
+--- busybox.old/coreutils/md5_sha1_sum.c	2007-01-19 22:23:05.000000000 +0100
++++ busybox.dev/coreutils/md5_sha1_sum.c	2007-01-22 13:24:51.000000000 +0100
+@@ -8,76 +8,10 @@
  
  #include "busybox.h"
  
@@ -22,11 +15,9 @@ diff -ruN busybox-1.3.1-orig/coreutils/md5_sha1_sum.c busybox-1.3.1-913/coreutil
 -static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
 -				unsigned hash_length)
 -{
--	int len = 0;
--	char *hex_value = xmalloc((hash_length * 2) + 2);
--	while (hash_length--) {
--		len += sprintf(hex_value + len, "%02x", *hash_value++);
--	}
+-	/* xzalloc zero-terminates */
+-	char *hex_value = xzalloc((hash_length * 2) + 1);
+-	bin2hex(hex_value, (char*)hash_value, hash_length);
 -	return hex_value;
 -}
 -
@@ -43,7 +34,7 @@ diff -ruN busybox-1.3.1-orig/coreutils/md5_sha1_sum.c busybox-1.3.1-913/coreutil
 -	void (*final)(void*, void*);
 -
 -	src_fd = STDIN_FILENO;
--	if (filename[0] != '-' || filename[1]) { /* not "-" */
+-	if (NOT_LONE_DASH(filename)) {
 -		src_fd = open(filename, O_RDONLY);
 -		if (src_fd < 0) {
 -			bb_perror_msg("%s", filename);
@@ -87,33 +78,40 @@ diff -ruN busybox-1.3.1-orig/coreutils/md5_sha1_sum.c busybox-1.3.1-913/coreutil
  int md5_sha1_sum_main(int argc, char **argv)
  {
  	int return_value = EXIT_SUCCESS;
-diff -ruN busybox-1.3.1-orig/include/libbb.h busybox-1.3.1-913/include/libbb.h
---- busybox-1.3.1-orig/include/libbb.h	2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1-913/include/libbb.h	2006-12-27 23:25:52.000000000 +0100
-@@ -528,6 +528,8 @@
+diff -ur busybox.old/include/libbb.h busybox.dev/include/libbb.h
+--- busybox.old/include/libbb.h	2007-01-19 22:23:10.000000000 +0100
++++ busybox.dev/include/libbb.h	2007-01-22 13:28:56.000000000 +0100
+@@ -637,6 +637,7 @@
  extern const char bb_uuenc_tbl_std[];
  void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
  
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
-+
  typedef struct sha1_ctx_t {
  	uint32_t count[2];
  	uint32_t hash[5];
-@@ -550,6 +552,10 @@
+@@ -658,6 +659,8 @@
+ void md5_begin(md5_ctx_t *ctx);
  void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
  void *md5_end(void *resbuf, md5_ctx_t *ctx);
- 
-+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length);
-+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value);
++unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned hash_length);
 +uint8_t *hash_file(const char *filename, hash_algo_t hash_algo);
-+
- uint32_t *crc32_filltable(int endian);
  
+ uint32_t *crc32_filltable(int endian);
  
-diff -ruN busybox-1.3.1-orig/libbb/hash.c busybox-1.3.1-913/libbb/hash.c
---- busybox-1.3.1-orig/libbb/hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.3.1-913/libbb/hash.c	2006-12-28 00:48:52.000000000 +0100
-@@ -0,0 +1,99 @@
+diff -ur busybox.old/libbb/Kbuild busybox.dev/libbb/Kbuild
+--- busybox.old/libbb/Kbuild	2007-01-19 22:23:06.000000000 +0100
++++ busybox.dev/libbb/Kbuild	2007-01-22 13:29:24.000000000 +0100
+@@ -37,6 +37,7 @@
+ lib-y += get_last_path_component.o
+ lib-y += get_line_from_file.o
+ lib-y += getopt32.o
++lib-y += hash.o
+ lib-y += herror_msg.o
+ lib-y += herror_msg_and_die.o
+ lib-y += human_readable.o
+--- busybox.old/libbb/hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox.dev/libbb/hash.c	2007-01-22 13:52:41.000000000 +0100
+@@ -0,0 +1,82 @@
 +/*
 + *  Copyright (C) 2003 Glenn L. McGrath
 + *  Copyright (C) 2003-2004 Erik Andersen
@@ -131,96 +129,68 @@ diff -ruN busybox-1.3.1-orig/libbb/hash.c busybox-1.3.1-913/libbb/hash.c
 +
 +#include "busybox.h"
 +
-+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length)
++/* This might be useful elsewhere */
++unsigned char *hash_bin_to_hex(unsigned char *hash_value,
++				unsigned hash_length)
 +{
-+	int len = 0;
-+	char *hex_value = xmalloc((hash_length * 2) + 2);
-+	while (hash_length--) {
-+		len += sprintf(hex_value + len, "%02x", *hash_value++);
-+	}
++	/* xzalloc zero-terminates */
++	char *hex_value = xzalloc((hash_length * 2) + 1);
++	bin2hex(hex_value, (char*)hash_value, hash_length);
 +	return hex_value;
 +}
 +
-+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value)
++uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
 +{
-+	int count, result = 0;
++	int src_fd, hash_len, count;
 +	union _ctx_ {
 +		sha1_ctx_t sha1;
 +		md5_ctx_t md5;
 +	} context;
++	uint8_t *hash_value = NULL;
 +	RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-+	void (*update)(const void*, size_t, void*) = NULL;
-+	void (*final)(void*, void*) = NULL;
-+	
-+	// figure specific hash algorithims
++	void (*update)(const void*, size_t, void*);
++	void (*final)(void*, void*);
++
++	src_fd = STDIN_FILENO;
++	if (NOT_LONE_DASH(filename)) {
++		src_fd = open(filename, O_RDONLY);
++		if (src_fd < 0) {
++			bb_perror_msg("%s", filename);
++			return NULL;
++		}
++	}
++
++	/* figure specific hash algorithims */
 +	if (hash_algo==HASH_MD5) {
 +		md5_begin(&context.md5);
 +		update = (void (*)(const void*, size_t, void*))md5_hash;
 +		final = (void (*)(void*, void*))md5_end;
++		hash_len = 16;
 +	} else if (hash_algo==HASH_SHA1) {
 +		sha1_begin(&context.sha1);
 +		update = (void (*)(const void*, size_t, void*))sha1_hash;
 +		final = (void (*)(void*, void*))sha1_end;
++		hash_len = 20;
++	} else {
++		bb_error_msg_and_die("algorithm not supported");
 +	}
 +
-+
-+	while (0 < (count = safe_read(fd, in_buf, sizeof in_buf))) {
++	while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
 +		update(in_buf, count, &context);
-+		result += count;
 +	}
 +
 +	if (count == 0) {
-+		final(hash_value, &context);
++		final(in_buf, &context);
++		hash_value = hash_bin_to_hex(in_buf, hash_len);
 +	}
-+	
-+	RELEASE_CONFIG_BUFFER(in_buf);
-+	
-+	return result;
-+}
 +
-+uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
-+{
-+	int src_fd, hash_len;
-+	RESERVE_CONFIG_UBUFFER(hash_buf, 20);
-+	uint8_t *hash_value = NULL;
-+	
-+	if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
-+		hash_len = 16;
-+	} else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
-+		hash_len = 20;
-+	} else {
-+		bb_error_msg_and_die("algotithm not supported");
-+	}
-+
-+	src_fd = STDIN_FILENO;
-+	if (filename[0] != '-' || filename[1]) { /* not "-" */
-+		src_fd = open(filename, O_RDONLY);
-+		if (src_fd < 0) {
-+			bb_perror_msg("%s", filename);
-+			return NULL;
-+		}
-+	}
++	RELEASE_CONFIG_BUFFER(in_buf);
 +
-+	if (hash_fd(src_fd, hash_algo, hash_buf) > 0) {
-+		hash_value = hash_bin_to_hex(hash_buf, hash_len);
-+	}
-+	
 +	if (src_fd != STDIN_FILENO) {
 +		close(src_fd);
 +	}
-+	
-+	RELEASE_CONFIG_BUFFER(hash_buf);
 +
 +	return hash_value;
 +}
-diff -ruN busybox-1.3.1-orig/libbb/Kbuild busybox-1.3.1-913/libbb/Kbuild
---- busybox-1.3.1-orig/libbb/Kbuild	2006-12-27 05:55:04.000000000 +0100
-+++ busybox-1.3.1-913/libbb/Kbuild	2006-12-27 23:31:20.000000000 +0100
-@@ -37,6 +37,7 @@
- lib-y += get_last_path_component.o
- lib-y += get_line_from_file.o
- lib-y += getopt32.o
-+lib-y += hash.o
- lib-y += herror_msg.o
- lib-y += herror_msg_and_die.o
- lib-y += human_readable.o
++
++