-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
-@@ -138,8 +138,8 @@
- extern char *bb_get_line_from_file(FILE *file);
- extern char *bb_get_chomped_line_from_file(FILE *file);
- extern char *bb_get_chunk_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);
-@@ -195,6 +195,8 @@
- extern int safe_strtod(char *arg, double* value);
- extern int safe_strtol(char *arg, long* value);
- extern int safe_strtoul(char *arg, unsigned long* value);
-+extern int safe_strtoll(char *arg, long long* value);
-+extern int safe_strtoull(char *arg, unsigned long long* value);
-
- 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 @@
- #endif
-
-
--static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
-+static off_t bb_full_fd_action(int src_fd, int dst_fd, const off_t size2)
- {
- int status;
-- size_t xread, wrote, total, size = size2;
-+ off_t xread, wrote, total, size = size2;
-
- if (src_fd < 0) {
- return -1;
-@@ -90,7 +90,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));
-@@ -98,7 +98,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
-@@ -72,7 +72,7 @@
- xgetularg_bnd.o xgetularg10_bnd.o xgetularg10.o
-
- LIBBB_MSRC4:=$(srcdir)/safe_strtol.c
--LIBBB_MOBJ4:=safe_strtoi.o safe_strtod.o safe_strtol.o safe_strtoul.o
-+LIBBB_MOBJ4:=safe_strtoi.o safe_strtod.o safe_strtol.o safe_strtoul.o safe_strtoull.o safe_strtoll.o
-
- 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
-@@ -90,3 +90,38 @@
- }
- #endif
-
-+#ifdef L_safe_strtoll
-+extern
-+int safe_strtoll(char *arg, long long* value)
-+{
-+ char *endptr;
-+ int errno_save = errno;
-+
-+ assert(arg!=NULL);
-+ errno = 0;
-+ *value = strtoll(arg, &endptr, 0);
-+ if (errno != 0 || *endptr!='\0' || endptr==arg) {
-+ return 1;
-+ }
-+ errno = errno_save;
-+ return 0;
-+}
-+#endif
-+
-+#ifdef L_safe_strtoull
-+extern
-+int safe_strtoull(char *arg, unsigned long long* value)
-+{
-+ char *endptr;
-+ int errno_save = errno;
-+
-+ assert(arg!=NULL);
-+ errno = 0;
-+ *value = strtoull(arg, &endptr, 0);
-+ if (errno != 0 || *endptr!='\0' || endptr==arg) {
-+ return 1;
-+ }
-+ errno = errno_save;
-+ 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
-@@ -152,8 +152,12 @@
- fd_data = xconnect_ftpdata(server, buf);
-
- if (ftpcmd("SIZE ", server_path, control_stream, buf) == 213) {
-- unsigned long value=filesize;
-+ off_t value=filesize;
-+#ifdef CONFIG_LFS
-+ if (safe_strtoull(buf + 4, &value))
-+#else
- if (safe_strtoul(buf + 4, &value))
-+#endif
- bb_error_msg_and_die("SIZE error: %s", buf + 4);
- filesize = value;
- }
-@@ -176,7 +180,11 @@
- }
-
- if (do_continue) {
-+#ifdef CONFIG_LFS
-+ sprintf(buf, "REST %lld", (long long)beg_range);
-+#else
- sprintf(buf, "REST %ld", (long)beg_range);
-+#endif
- if (ftpcmd(buf, NULL, control_stream, buf) != 350) {
- do_continue = 0;
- } else {
-@@ -240,7 +248,11 @@
- fd_local = bb_xopen(local_path, O_RDONLY);
+--- busybox-1.3.1/networking/ftpgetput.c.orig 2006-12-27 05:52:39.000000000 +0100
++++ busybox-1.3.1/networking/ftpgetput.c 2006-12-30 12:52:37.368206690 +0100
+@@ -218,7 +218,7 @@
+ fd_local = xopen(local_path, O_RDONLY);
fstat(fd_local, &sbuf);
-+#ifdef CONFIG_LFS
-+ sprintf(buf, "ALLO %llu", (unsigned long long)sbuf.st_size);
-+#else
- sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size);
-+#endif
+- sprintf(buf, "ALLO %lu", (unsigned long)sbuf.st_size);
++ sprintf(buf, "ALLO %"OFF_FMT"u", sbuf.st_size);
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
-@@ -389,8 +389,12 @@
- */
- while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
- if (strcasecmp(buf, "content-length") == 0) {
-- unsigned long value;
-+ off_t value;
-+#ifdef CONFIG_LFS
-+ if (safe_strtoull(s, &value)) {
-+#else
- if (safe_strtoul(s, &value)) {
-+#endif
- close_delete_and_die("content-length %s is garbage", s);
- }
- filesize = value;
-@@ -460,8 +464,12 @@
- * Querying file size
- */
- if (ftpcmd("SIZE /", target.path, sfp, buf) == 213) {
-- unsigned long value;
-+ off_t value;
-+#ifdef CONFIG_LFS
-+ if (safe_strtoull(buf+4, &value)) {
-+#else
- if (safe_strtoul(buf+4, &value)) {
-+#endif
- close_delete_and_die("SIZE value is garbage");
- }
- filesize = value;
-@@ -502,7 +510,12 @@
- */
- if (chunked) {
- fgets(buf, sizeof(buf), dfp);
-+#ifdef CONFIG_LFS
-+ filesize = strtoll(buf, (char **) NULL, 16);
-+#else
- filesize = strtol(buf, (char **) NULL, 16);
-+#endif
-+
- }
- #ifdef CONFIG_FEATURE_WGET_STATUSBAR
- if (quiet_flag==FALSE)
-@@ -524,7 +537,11 @@
- if (chunked) {
- safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
- safe_fgets(buf, sizeof(buf), dfp);
-+#ifdef CONFIG_LFS
-+ filesize = strtoll(buf, (char **) NULL, 16);
-+#else
- filesize = strtol(buf, (char **) NULL, 16);
-+#endif
- if (filesize==0) {
- chunked = 0; /* all done! */
- }
projects / packages / busybox.git / blobdiff