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

lpd,lpr: send/receive ACKs after filenames, not only after file bodies.

Browse Source 
lpqr_main                                           1114    1149     +35
lpd_main                                             748     768     +20
This commit is contained in:
Denis Vlasenko
2008-07-22 19:15:30 +00:00
parent e99a92dc2f
commit c445758708
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
printutils/lpd.c
View File

@ -236,6 +236,9 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[])
fd = xopen(queue, O_RDWR | O_APPEND);
}
// signal OK
safe_write(STDOUT_FILENO, "", 1);
// copy the file
real_len = bb_copyfd_size(STDIN_FILENO, fd, expected_len);
if (real_len != expected_len) {
@ -243,7 +246,7 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[])
expected_len, real_len);
goto err_exit;
}
// get ACK and see whether it is NUL (ok)
// get EOF indicator, see whether it is NUL (ok)
// (and don't trash s[0]!)
if (safe_read(STDIN_FILENO, &s[1], 1) != 1 || s[1] != 0) {
// don't send error msg to peer - it obviously
@ -262,6 +265,9 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[])
free(s);
close(fd); // NB: can do close(-1). Who cares?
// NB: don't do "signal OK" write here, it will be done
// at the top of the loop
} // while (1)
err_exit: