diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-18 17:32:44 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-18 17:32:44 +0000 |
| commit | 9f57cf6604638f14390effa01b51c8ad979f14cd (patch) | |
| tree | 713ecefd47867bb5d2b16c4ae3e5acd28c1c90e3 /libbb/read.c | |
| parent | fce4a9454c5399c2ce8ca8e87048331c6e3d98fa (diff) | |
| download | busybox-9f57cf6604638f14390effa01b51c8ad979f14cd.tar.gz | |
ftpd: fix command fetching to not do it in 1-byte reads;
fix command de-escaping. Tested to download files with embeeded \xff and LF.
libbb: tweaks for the above
function old new delta
ftpd_main 2231 2321 +90
xmalloc_fgets_internal 190 222 +32
xmalloc_fgets_str_len - 27 +27
xmalloc_fgets_str 7 23 +16
xmalloc_fgetline_str 10 26 +16
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 4/0 up/down: 181/0) Total: 181 bytes
Diffstat (limited to 'libbb/read.c')
| -rw-r--r-- | libbb/read.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/read.c b/libbb/read.c index 815007c1e..37503e84d 100644 --- a/libbb/read.c +++ b/libbb/read.c @@ -141,7 +141,7 @@ char* FAST_FUNC xmalloc_reads(int fd, char *buf, size_t *maxsz_p) { char *p; size_t sz = buf ? strlen(buf) : 0; - size_t maxsz = maxsz_p ? *maxsz_p : MAXINT(size_t); + size_t maxsz = maxsz_p ? *maxsz_p : (INT_MAX - 4095); goto jump_in; while (sz < maxsz) { @@ -198,7 +198,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p) size_t to_read; struct stat st; - to_read = maxsz_p ? *maxsz_p : MAXINT(ssize_t); /* max to read */ + to_read = maxsz_p ? *maxsz_p : (INT_MAX - 4095); /* max to read */ /* Estimate file size */ st.st_size = 0; /* in case fstat fails, assume 0 */ @@ -262,7 +262,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p) len = lseek(fd, 0, SEEK_END) | 0x3ff; /* + up to 1k */ if (len != (off_t)-1) { xlseek(fd, 0, SEEK_SET); - size = maxsz_p ? *maxsz_p : INT_MAX; + size = maxsz_p ? *maxsz_p : (INT_MAX - 4095); if (len < size) size = len; } |