diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2003-01-22 20:23:21 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2003-01-22 20:23:21 +0000 |
| commit | 4aae35d60a5eba9e73e0b40bbc923667b17d1ef3 (patch) | |
| tree | 4fe304fa06ce98b31f4296543279fcedd8c5daae /imap4d | |
| parent | c7246a16910aa37caa79a83a678e6c5da8193a5d (diff) | |
| download | mailutils-4aae35d60a5eba9e73e0b40bbc923667b17d1ef3.tar.gz mailutils-4aae35d60a5eba9e73e0b40bbc923667b17d1ef3.tar.bz2 | |
Fixed STORE untagged output in accordance with rfc2060-errata document.
Diffstat (limited to 'imap4d')
| -rw-r--r-- | imap4d/fetch.c | 3 | ||||
| -rw-r--r-- | imap4d/store.c | 4 | ||||
| -rw-r--r-- | imap4d/testsuite/imap4d/expunge.exp | 6 | ||||
| -rw-r--r-- | imap4d/testsuite/imap4d/fetch.exp | 8 | ||||
| -rw-r--r-- | imap4d/testsuite/imap4d/search.exp | 6 |
5 files changed, 12 insertions, 15 deletions
diff --git a/imap4d/fetch.c b/imap4d/fetch.c index c198fce4b..d95e17b23 100644 --- a/imap4d/fetch.c +++ b/imap4d/fetch.c @@ -290,14 +290,11 @@ fetch_flags0 (const char *prefix, message_t msg, int isuid) { struct fetch_command *fcmd = &fetch_command_table[F_UID]; fcmd->msg = msg; - util_send ("("); fetch_uid (fcmd, NULL); util_send (" "); } util_send ("%s (", prefix); util_print_flags(attr); - if (isuid) - util_send (")"); util_send (")"); } diff --git a/imap4d/store.c b/imap4d/store.c index 99194393f..1dee646a6 100644 --- a/imap4d/store.c +++ b/imap4d/store.c @@ -140,9 +140,9 @@ imap4d_store0 (char *arg, int isuid, char *resp, size_t resplen) } if (ack) { - util_send ("* %d FETCH ", msgno); + util_send ("* %d FETCH (", msgno); fetch_flags0 ("FLAGS", msg, isuid); - util_send ("\n"); + util_send (")\n"); } free (p); /* Update the flags of uid table. */ diff --git a/imap4d/testsuite/imap4d/expunge.exp b/imap4d/testsuite/imap4d/expunge.exp index cc2aada99..82e24a8b9 100644 --- a/imap4d/testsuite/imap4d/expunge.exp +++ b/imap4d/testsuite/imap4d/expunge.exp @@ -43,9 +43,9 @@ imap4d_test "SELECT mbox1" \ "OK" imap4d_test "STORE 2:* +FLAGS (\\Deleted)"\ -"2 FETCH FLAGS (\\Deleted \\Recent)"\ -"3 FETCH FLAGS (\\Deleted \\Recent)"\ -"4 FETCH FLAGS (\\Deleted \\Recent)"\ +"2 FETCH (FLAGS (\\Deleted \\Recent))"\ +"3 FETCH (FLAGS (\\Deleted \\Recent))"\ +"4 FETCH (FLAGS (\\Deleted \\Recent))"\ "OK" imap4d_test "EXPUNGE"\ diff --git a/imap4d/testsuite/imap4d/fetch.exp b/imap4d/testsuite/imap4d/fetch.exp index 407d1eaac..06ad8b578 100644 --- a/imap4d/testsuite/imap4d/fetch.exp +++ b/imap4d/testsuite/imap4d/fetch.exp @@ -392,10 +392,10 @@ imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\ # Clean \Seen flags imap4d_test "STORE 1:* -FLAGS (\\Seen)"\ -"1 FETCH FLAGS (\\Recent)"\ -"2 FETCH FLAGS (\\Recent)"\ -"3 FETCH FLAGS (\\Recent)"\ -"4 FETCH FLAGS (\\Recent)"\ +"1 FETCH (FLAGS (\\Recent))"\ +"2 FETCH (FLAGS (\\Recent))"\ +"3 FETCH (FLAGS (\\Recent))"\ +"4 FETCH (FLAGS (\\Recent))"\ "OK" # RFC822 Functionally equivalent to BODY[], differing in the diff --git a/imap4d/testsuite/imap4d/search.exp b/imap4d/testsuite/imap4d/search.exp index 30fa4b759..8e6125ede 100644 --- a/imap4d/testsuite/imap4d/search.exp +++ b/imap4d/testsuite/imap4d/search.exp @@ -159,9 +159,9 @@ imap4d_test "SEARCH SINCE \"29-Jul-2002 22:01:36 +0000\""\ "OK" imap4d_test "STORE 3,5,89 +FLAGS (\\Answered)"\ -"3 FETCH FLAGS (\\Answered \\Recent)"\ -"5 FETCH FLAGS (\\Answered \\Recent)"\ -"89 FETCH FLAGS (\\Answered \\Recent)"\ +"3 FETCH (FLAGS (\\Answered \\Recent))"\ +"5 FETCH (FLAGS (\\Answered \\Recent))"\ +"89 FETCH (FLAGS (\\Answered \\Recent))"\ "OK" # ANSWERED Messages with the \Answered flag set. |