Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-26 02:29:31 +00:00
Code Issues Projects Releases Wiki Activity

ftpd: optimize writes of LIST results a bit

Browse Source 
function                                             old     new   delta
handle_dir_common                                    201     207      +6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-06-26 12:07:48 +02:00
parent 2a870d091e
commit 0b0ccd4570
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/ftpd.c
View File

@ -709,6 +709,7 @@ handle_dir_common(int opts)
* which can be problematic in chroot */
ls_fd = popen_ls((opts & LONG_LISTING) ? "-l" : "-1");
ls_fp = xfdopen_for_read(ls_fd);
/* FIXME: filenames with embedded newlines are mishandled */
if (opts & USE_CTRL_CONN) {
/* STAT <filename> */
@ -729,16 +730,20 @@ handle_dir_common(int opts)
int remote_fd = get_remote_transfer_fd(" Directory listing");
if (remote_fd >= 0) {
while (1) {
line = xmalloc_fgetline(ls_fp);
unsigned len;
line = xmalloc_fgets(ls_fp);
if (!line)
break;
/* I've seen clients complaining when they
* are fed with ls output with bare '\n'.
* Pity... that would be much simpler.
* Replace trailing "\n\0" with "\r\n".
*/
/* TODO: need to s/LF/NUL/g here */
xwrite_str(remote_fd, line);
xwrite(remote_fd, "\r\n", 2);
len = strlen(line);
if (len != 0) /* paranoia check */
line[len - 1] = '\r';
line[len] = '\n';
xwrite(remote_fd, line, len + 1);
free(line);
}
}