summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
376a605)
* use mmap to read the download file for output; this way we don't need to copy it into memory first and can let the kernel do this job
* remove the 10k transfer limit
char cs_inet_fn[128]; /* Friendly-name of outbound Internet mail */
FILE *download_fp; /* Fields relating to file transfer */
char cs_inet_fn[128]; /* Friendly-name of outbound Internet mail */
FILE *download_fp; /* Fields relating to file transfer */
+ size_t download_fp_total;
char download_desired_section[128];
FILE *upload_fp;
char upl_file[256];
char download_desired_section[128];
FILE *upload_fp;
char upl_file[256];
#include <ctype.h>
#include <string.h>
#include <sys/stat.h>
#include <ctype.h>
#include <string.h>
#include <sys/stat.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
long filesize;
fstat(fileno(CC->download_fp), &statbuf);
long filesize;
fstat(fileno(CC->download_fp), &statbuf);
+ CC->download_fp_total = statbuf.st_size;
filesize = (long) statbuf.st_size;
modtime = (time_t) statbuf.st_mtime;
filesize = (long) statbuf.st_size;
modtime = (time_t) statbuf.st_mtime;
- if (bytes > 100000) bytes = 100000;
- buf = malloc(bytes + 1);
-
- fseek(CC->download_fp, start_pos, 0);
-
- actual_bytes = fread(buf, 1, bytes, CC->download_fp);
- if (actual_bytes > 0) {
+ buf = mmap(NULL,
+ CC->download_fp_total,
+ PROT_READ,
+ MAP_PRIVATE,
+ fileno(CC->download_fp),
+ 0);
+
+ actual_bytes = CC->download_fp_total - start_pos;
+ if ((actual_bytes > 0) && (buf != NULL)) {
cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
cprintf("%d %d\n", BINARY_FOLLOWS, (int)actual_bytes);
- client_write(buf, bytes);
+ client_write(buf + start_pos, actual_bytes);
}
else {
cprintf("%d %s\n", ERROR, strerror(errno));
}
}
else {
cprintf("%d %s\n", ERROR, strerror(errno));
}
+ munmap(buf, CC->download_fp_total);
CC->dl_is_net = 1;
stat(pathname, &statbuf);
CC->dl_is_net = 1;
stat(pathname, &statbuf);
+ CC->download_fp_total = statbuf.st_size;
cprintf("%d %ld\n", CIT_OK, (long)statbuf.st_size);
}
cprintf("%d %ld\n", CIT_OK, (long)statbuf.st_size);
}