merge of '00387fb21eaf4cb1b4d1ece522a38e6417a162c1'

and '3316e8de631c5da2b7ba6c4505fa74b707b80b51'

Monotone-Parent: 00387fb21eaf4cb1b4d1ece522a38e6417a162c1
Monotone-Parent: 3316e8de631c5da2b7ba6c4505fa74b707b80b51
Monotone-Revision: 2b83c62317d266d5f7a2e2046fc19f68f88a385f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-23T21:01:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-23 21:01:07 +00:00
+13 -2
View File
@@ -2984,7 +2984,18 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
if (_la(self, 0) != ')') {
_consume(self,1);
[dict setObject: _parseBodyString(self, YES)
@@ -2170,6 +2475,21 @@
@@ -2090,6 +2395,10 @@
cnt = 0;
str = nil;
while ((c = _la(self, 0)) != _c) {
+ if (c == '\\') {
+ _consume(self, 1);
+ c = _la(self, 0);
+ }
buf[cnt] = c;
_consume(self, 1);
cnt++;
@@ -2170,6 +2479,21 @@
}
}
@@ -3006,7 +3017,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
- (NSException *)exceptionForFailedMatch:(unsigned char)_match
got:(unsigned char)_avail
{
@@ -2225,9 +2545,9 @@
@@ -2225,9 +2549,9 @@
[s release];
if (c == '\n') {