emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more FILE_OFFSET_BITS == 64 adjustments.

Browse Source
This commit is contained in:
Eric Andersen 2001-04-05 23:26:44 +00:00
parent 83f173b61e
commit 250a221768
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/ls.c
View File

@ -655,7 +655,7 @@ static int list_single(struct dnode *dn)
#endif #endif
{ {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size); printf("%9lld ", (long long)dn->dstat.st_size);
#else #else
printf("%9ld ", dn->dstat.st_size); printf("%9ld ", dn->dstat.st_size);
#endif #endif

2
include/libbb.h
View File

@ -96,7 +96,7 @@ void reset_ino_dev_hashtable(void);
int copy_file(const char *srcName, const char *destName, int copy_file(const char *srcName, const char *destName,
int setModes, int followLinks, int forceFlag); 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); char *buildName(const char *dirName, const char *fileName);
int makeString(int argc, const char **argv, char *buf, int bufLen); int makeString(int argc, const char **argv, char *buf, int bufLen);
char *getChunk(int size); char *getChunk(int size);

2
libbb/libbb.h
View File

@ -96,7 +96,7 @@ void reset_ino_dev_hashtable(void);
int copy_file(const char *srcName, const char *destName, int copy_file(const char *srcName, const char *destName,
int setModes, int followLinks, int forceFlag); 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); char *buildName(const char *dirName, const char *fileName);
int makeString(int argc, const char **argv, char *buf, int bufLen); int makeString(int argc, const char **argv, char *buf, int bufLen);
char *getChunk(int size); char *getChunk(int size);

2
ls.c
View File

@ -655,7 +655,7 @@ static int list_single(struct dnode *dn)
#endif #endif
{ {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size); printf("%9lld ", (long long)dn->dstat.st_size);
#else #else
printf("%9ld ", dn->dstat.st_size); printf("%9ld ", dn->dstat.st_size);
#endif #endif

8
more.c
View File

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

8
util-linux/more.c
View File

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