oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

quote '^From ' properly

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5013 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-06-02 15:34:57 +00:00
parent 2f37688fbf
commit 2f6811fbde
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
appl/push/push.c
View File

@@ -277,6 +277,7 @@ doit(int s,
if (FD_ISSET(s, &readset)) { if (FD_ISSET(s, &readset)) {
char *beg, *p; char *beg, *p;
size_t rem; size_t rem;
int blank_line;
ret = read (s, in_ptr, sizeof(in_buf) - in_len - 1); ret = read (s, in_ptr, sizeof(in_buf) - in_len - 1);
if (ret < 0) if (ret < 0)
@@ -297,6 +298,8 @@ doit(int s,
if (beg[0] == '.') { if (beg[0] == '.') {
if (beg[1] == '\r' && beg[2] == '\n') { if (beg[1] == '\r' && beg[2] == '\n') {
if(!blank_line)
write_state_add(&write_state, "\n", 1);
state = STAT; state = STAT;
rem -= p - beg + 2; rem -= p - beg + 2;
beg = p + 2; beg = p + 2;
@@ -335,13 +338,18 @@ doit(int s,
++copy; ++copy;
} }
*p = '\n'; *p = '\n';
if(blank_line &&
strncmp(copy, "From ", min(p - copy + 1, 5)) == 0)
write_state_add(&write_state, ">", 1);
write_state_add(&write_state, copy, p - copy + 1); write_state_add(&write_state, copy, p - copy + 1);
blank_line = (*copy == '\n');
rem -= p - beg + 2; rem -= p - beg + 2;
beg = p + 2; beg = p + 2;
} else if (rem >= 3 && strncmp (beg, "+OK", 3) == 0) { } else if (rem >= 3 && strncmp (beg, "+OK", 3) == 0) {
if (state == STAT) { if (state == STAT) {
write_state_add(&write_state, write_state_add(&write_state,
from_line, from_line_length); from_line, from_line_length);
blank_line = 0;
state = RETR; state = RETR;
} else if (state == DELE) { } else if (state == DELE) {
if (++deleted == count) { if (++deleted == count) {