Author: tommat Date: Tue Feb 15 16:37:16 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
busybox-LFS.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/busybox-LFS.patch
diff -u SOURCES/busybox-LFS.patch:1.1 SOURCES/busybox-LFS.patch:1.2
--- SOURCES/busybox-LFS.patch:1.1 Tue Feb 15 14:56:27 2005
+++ SOURCES/busybox-LFS.patch Tue Feb 15 17:37:11 2005
@@ -1,6 +1,17 @@
-diff -Nur busybox-1.00-orig/include/libbb.h busybox-1.00/include/libbb.h
---- busybox-1.00-orig/include/libbb.h 2005-02-14 16:53:58.000000000 +0100
-+++ busybox-1.00/include/libbb.h 2005-02-15 10:55:16.547885312 +0100
+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
+@@ -137,8 +137,8 @@
+ extern char *find_real_root_device_name(void);
+ extern char *bb_get_line_from_file(FILE *file);
+ extern char *bb_get_chomped_line_from_file(FILE *file);
+-extern int bb_copyfd_size(int fd1, int fd2, const off_t size);
+-extern int bb_copyfd_eof(int fd1, int fd2);
++extern off_t bb_copyfd_size(int fd1, int fd2, const off_t size);
++extern off_t bb_copyfd_eof(int fd1, int fd2);
+ extern void bb_xprint_and_close_file(FILE *file);
+ extern int bb_xprint_file_by_name(const char *filename);
+ extern char bb_process_escape_sequence(const char **ptr);
@@ -193,6 +193,8 @@
extern int safe_strtod(char *arg, double* value);
extern int safe_strtol(char *arg, long* value);
@@ -10,6 +21,39 @@
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,9 +34,9 @@
+
+
+ /* If size is 0 copy until EOF */
+-static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size)
++static off_t bb_full_fd_action(int src_fd, int dst_fd, const off_t size)
+ {
+- size_t read_total = 0;
++ off_t read_total = 0;
+ RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+
+ while ((size == 0) || (read_total < size)) {
+@@ -76,7 +76,7 @@
+ }
+
+
+-extern int bb_copyfd_size(int fd1, int fd2, const off_t size)
++extern off_t bb_copyfd_size(int fd1, int fd2, const off_t size)
+ {
+ if (size) {
+ return(bb_full_fd_action(fd1, fd2, size));
+@@ -84,7 +84,7 @@
+ return(0);
+ }
+
+-extern int bb_copyfd_eof(int fd1, int fd2)
++extern off_t bb_copyfd_eof(int fd1, int fd2)
+ {
+ 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/busybox-LFS.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
