diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-04-05 23:26:44 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-04-05 23:26:44 +0000 |
| commit | 250a22176815303f9af072a11278108f7767282b (patch) | |
| tree | deb2971095d68588538830f0f0044ddf1eb5ae43 | |
| parent | 83f173b61ec4df708d6ead45540ede3a28c2e630 (diff) | |
| download | busybox-250a22176815303f9af072a11278108f7767282b.tar.gz | |
more FILE_OFFSET_BITS == 64 adjustments.
| -rw-r--r-- | coreutils/ls.c | 2 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | libbb/libbb.h | 2 | ||||
| -rw-r--r-- | ls.c | 2 | ||||
| -rw-r--r-- | more.c | 8 | ||||
| -rw-r--r-- | util-linux/more.c | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 0b89ecce1..8f4cae10d 100644 --- 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 d0896ab86..05f61f25b 100644 --- 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 d0896ab86..05f61f25b 100644 --- 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); @@ -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 @@ -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 b89143e4d..1d918cf5c 100644 --- 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 |