SOURCES: busybox-LFS.patch - updated, works better

[tommat]

Author: tommat                       Date: Tue Sep 27 16:55:12 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated, works better

---- Files affected:
SOURCES:
   busybox-LFS.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/busybox-LFS.patch
diff -u SOURCES/busybox-LFS.patch:1.8 SOURCES/busybox-LFS.patch:1.9
--- SOURCES/busybox-LFS.patch:1.8	Sat Sep  3 21:09:50 2005
+++ SOURCES/busybox-LFS.patch	Tue Sep 27 18:55:07 2005
@@ -1,6 +1,6 @@
-diff -Nur busybox-1.00/include/libbb.h.orig busybox-1.00/include/libbb.h
---- busybox-1.00/include/libbb.h.orig	2005-02-15 16:48:07.491412688 +0100
-+++ busybox-1.00/include/libbb.h	2005-02-15 16:40:15.000000000 +0100
+diff -Nur busybox-1.01-orig/include/libbb.h busybox-1.01/include/libbb.h
+--- busybox-1.01-orig/include/libbb.h	2005-09-27 09:07:59.097072152 +0200
++++ busybox-1.01/include/libbb.h	2005-09-27 17:08:02.912226664 +0200
 @@ -138,8 +138,8 @@
  extern char *find_real_root_device_name(void);
  extern char *bb_get_line_from_file(FILE *file);
@@ -21,10 +21,10 @@
  
  struct suffix_mult {
  	const char *suffix;
-diff -Nur busybox-1.00/libbb/copyfd.c.orig busybox-1.00/libbb/copyfd.c
---- busybox-1.00/libbb/copyfd.c.orig	2005-02-15 16:48:45.561625136 +0100
-+++ busybox-1.00/libbb/copyfd.c	2005-02-15 16:39:24.000000000 +0100
-@@ -34,10 +34,10 @@
+diff -Nur busybox-1.01-orig/libbb/copyfd.c busybox-1.01/libbb/copyfd.c
+--- busybox-1.01-orig/libbb/copyfd.c	2005-08-17 03:29:14.000000000 +0200
++++ busybox-1.01/libbb/copyfd.c	2005-09-27 17:11:40.083211656 +0200
+@@ -34,29 +34,25 @@
  #endif
  
  
@@ -33,11 +33,33 @@
  {
  	int status;
 -	size_t xread, wrote, total, size = size2;
-+	off_t xread, wrote, total, size = size2;
++	ssize_t xread, wrote;
++	off_t total, size = size2;
  
  	if (src_fd < 0) {
  		return -1;
-@@ -90,7 +90,7 @@
+ 	}
+ 
+-	if (size == 0) {
+-		/* If size is 0 copy until EOF */
+-		size = ULONG_MAX;
+-	}
+-
+ 	{
+ 		RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+ 		total = 0;
+ 		wrote = 0;
+ 		status = -1;
+-		while (total < size)
++		while (total < size || size == 0)
+ 		{
+ 			xread = BUFSIZ;
+-			if (size < (total + BUFSIZ))
++			if (size < (total + BUFSIZ) && size != 0)
+ 				xread = size - total;
+ 			xread = bb_full_read(src_fd, buffer, xread);
+ 			if (xread > 0) {
+@@ -90,7 +86,7 @@
  }
  
  
@@ -46,7 +68,7 @@
  {
  	if (size) {
  		return(bb_full_fd_action(fd1, fd2, size));
-@@ -98,7 +98,7 @@
+@@ -98,7 +94,7 @@
  	return(0);
  }
  
@@ -55,9 +77,9 @@
  {
  	return(bb_full_fd_action(fd1, fd2, 0));
  }
-diff -Nur busybox-1.00-orig/libbb/Makefile.in busybox-1.00/libbb/Makefile.in
---- busybox-1.00-orig/libbb/Makefile.in	2004-10-08 09:45:31.000000000 +0200
-+++ busybox-1.00/libbb/Makefile.in	2005-02-15 10:51:08.585581312 +0100
+diff -Nur busybox-1.01-orig/libbb/Makefile.in busybox-1.01/libbb/Makefile.in
+--- busybox-1.01-orig/libbb/Makefile.in	2005-08-17 03:29:14.000000000 +0200
++++ busybox-1.01/libbb/Makefile.in	2005-09-27 17:08:02.913226512 +0200
 @@ -72,7 +72,7 @@
  	xgetularg_bnd.o xgetularg10_bnd.o xgetularg10.o
  
@@ -67,9 +89,9 @@
  
  LIBBB_MOBJS0=$(patsubst %,$(LIBBB_DIR)%, $(LIBBB_MOBJ0))
  LIBBB_MOBJS1=$(patsubst %,$(LIBBB_DIR)%, $(LIBBB_MOBJ1))
-diff -Nur busybox-1.00-orig/libbb/safe_strtol.c busybox-1.00/libbb/safe_strtol.c
---- busybox-1.00-orig/libbb/safe_strtol.c	2004-03-06 23:11:45.000000000 +0100
-+++ busybox-1.00/libbb/safe_strtol.c	2005-02-15 10:53:56.546047440 +0100
+diff -Nur busybox-1.01-orig/libbb/safe_strtol.c busybox-1.01/libbb/safe_strtol.c
+--- busybox-1.01-orig/libbb/safe_strtol.c	2005-08-17 03:29:14.000000000 +0200
++++ busybox-1.01/libbb/safe_strtol.c	2005-09-27 17:08:02.914226360 +0200
 @@ -90,3 +90,38 @@
  }
  #endif
@@ -109,9 +131,9 @@
 +	return 0;
 +}
 +#endif
-diff -Nur busybox-1.00-orig/networking/ftpgetput.c busybox-1.00/networking/ftpgetput.c
---- busybox-1.00-orig/networking/ftpgetput.c	2004-05-04 12:43:34.000000000 +0200
-+++ busybox-1.00/networking/ftpgetput.c	2005-02-15 11:02:41.127298968 +0100
+diff -Nur busybox-1.01-orig/networking/ftpgetput.c busybox-1.01/networking/ftpgetput.c
+--- busybox-1.01-orig/networking/ftpgetput.c	2005-08-17 03:29:10.000000000 +0200
++++ busybox-1.01/networking/ftpgetput.c	2005-09-27 17:08:02.914226360 +0200
 @@ -152,8 +152,12 @@
  	fd_data = xconnect_ftpdata(server, buf);
  
@@ -150,9 +172,9 @@
  		response = ftpcmd(buf, NULL, control_stream, buf);
  		switch (response) {
  		case 200:
-diff -Nur busybox-1.00-orig/networking/wget.c busybox-1.00/networking/wget.c
---- busybox-1.00-orig/networking/wget.c	2004-10-08 10:27:40.000000000 +0200
-+++ busybox-1.00/networking/wget.c	2005-02-15 11:33:10.235232296 +0100
+diff -Nur busybox-1.01-orig/networking/wget.c busybox-1.01/networking/wget.c
+--- busybox-1.01-orig/networking/wget.c	2005-08-17 03:29:10.000000000 +0200
++++ busybox-1.01/networking/wget.c	2005-09-27 17:08:02.916226056 +0200
 @@ -389,8 +389,12 @@
  			 */
  			while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/busybox-LFS.patch?r1=1.8&r2=1.9&f=u