more FILE_OFFSET_BITS == 64 adjustments.

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0b89ecce13a91abf280420a3e2e9ff517adb1423..8f4cae10df9428f28288d74928777e2b5e816bf2 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -655,7 +655,7 @@ static int list_single(struct dnode *dn)
 #endif 
                                        {
 #if _FILE_OFFSET_BITS == 64
-                                               printf("%9lld ", dn->dstat.st_size);
+                                               printf("%9lld ", (long long)dn->dstat.st_size);
 #else
                                                printf("%9ld ", dn->dstat.st_size);
 #endif

diff --git a/include/libbb.h b/include/libbb.h
index d0896ab8693b9b8a3d2f048e211b313388d6f563..05f61f25b77059fd476347de2e812fd6b3afd047 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -96,7 +96,7 @@ void reset_ino_dev_hashtable(void);
 
 int copy_file(const char *srcName, const char *destName,
                 int setModes, int followLinks, int forceFlag);
-int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
+int copy_file_chunk(int srcFd, int dstFd, off_t remaining);
 char *buildName(const char *dirName, const char *fileName);
 int makeString(int argc, const char **argv, char *buf, int bufLen);
 char *getChunk(int size);

diff --git a/libbb/libbb.h b/libbb/libbb.h
index d0896ab8693b9b8a3d2f048e211b313388d6f563..05f61f25b77059fd476347de2e812fd6b3afd047 100644 (file)
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -96,7 +96,7 @@ void reset_ino_dev_hashtable(void);
 
 int copy_file(const char *srcName, const char *destName,
                 int setModes, int followLinks, int forceFlag);
-int copy_file_chunk(int srcFd, int dstFd, size_t remaining);
+int copy_file_chunk(int srcFd, int dstFd, off_t remaining);
 char *buildName(const char *dirName, const char *fileName);
 int makeString(int argc, const char **argv, char *buf, int bufLen);
 char *getChunk(int size);

diff --git a/ls.c b/ls.c
index 0b89ecce13a91abf280420a3e2e9ff517adb1423..8f4cae10df9428f28288d74928777e2b5e816bf2 100644 (file)
--- a/ls.c
+++ b/ls.c
@@ -655,7 +655,7 @@ static int list_single(struct dnode *dn)
 #endif 
                                        {
 #if _FILE_OFFSET_BITS == 64
-                                               printf("%9lld ", dn->dstat.st_size);
+                                               printf("%9lld ", (long long)dn->dstat.st_size);
 #else
                                                printf("%9ld ", dn->dstat.st_size);
 #endif

diff --git a/more.c b/more.c
index b89143e4d6f14b3c61a440b8f3a63a8590be6a73..1d918cf5c11b54d41f9c2ab3c7cedab0f2fff699 100644 (file)
--- a/more.c
+++ b/more.c
@@ -124,13 +124,13 @@ extern int more_main(int argc, char **argv)
                                if (file != stdin) {
 #if _FILE_OFFSET_BITS == 64
                                        len += printf("(%d%% of %lld bytes)",
+                                                  (int) (100 * ((double) ftell(file) /
+                                                  (double) st.st_size)), (long long)st.st_size);
 #else
                                        len += printf("(%d%% of %ld bytes)",
+                                                  (int) (100 * ((double) ftell(file) /
+                                                  (double) st.st_size)), (long)st.st_size);
 #endif
-                                                                  (int) (100 *
-                                                                                 ((double) ftell(file) /
-                                                                                  (double) st.st_size)),
-                                                                  st.st_size);
                                }
                                len += printf("%s",
 #ifdef BB_FEATURE_USE_TERMIOS

diff --git a/util-linux/more.c b/util-linux/more.c
index b89143e4d6f14b3c61a440b8f3a63a8590be6a73..1d918cf5c11b54d41f9c2ab3c7cedab0f2fff699 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -124,13 +124,13 @@ extern int more_main(int argc, char **argv)
                                if (file != stdin) {
 #if _FILE_OFFSET_BITS == 64
                                        len += printf("(%d%% of %lld bytes)",
+                                                  (int) (100 * ((double) ftell(file) /
+                                                  (double) st.st_size)), (long long)st.st_size);
 #else
                                        len += printf("(%d%% of %ld bytes)",
+                                                  (int) (100 * ((double) ftell(file) /
+                                                  (double) st.st_size)), (long)st.st_size);
 #endif
-                                                                  (int) (100 *
-                                                                                 ((double) ftell(file) /
-                                                                                  (double) st.st_size)),
-                                                                  st.st_size);
                                }
                                len += printf("%s",
 #ifdef BB_FEATURE_USE_TERMIOS