Merge pull request #24 from addrummond/master

Small changes to regular expressions
fork
Brian White 13 years ago
commit 690faff0f1

@ -331,13 +331,13 @@ ImapConnection.prototype.connect = function(loginCb) {
case 'LIST': case 'LIST':
var result; var result;
if (self.delim === null if (self.delim === null
&& (result = /^\(\\No[sS]elect\) (.+?) ".*"$/.exec(data[2]))) && (result = /^\(\\No[sS]elect\) (.+?) .*$/.exec(data[2])))
self.delim = (result[1] === 'NIL' self.delim = (result[1] === 'NIL'
? false : result[1].substring(1, result[1].length-1)); ? false : result[1].substring(1, result[1].length-1));
else if (self.delim !== null) { else if (self.delim !== null) {
if (self._state.requests[0].args.length === 0) if (self._state.requests[0].args.length === 0)
self._state.requests[0].args.push({}); self._state.requests[0].args.push({});
result = /^\((.*)\) (.+?) "(.+)"$/.exec(data[2]); result = /^\((.*)\) (.+?) "?(.+)"?$/.exec(data[2]);
var box = { var box = {
attribs: result[1].split(' ').map(function(attrib) { attribs: result[1].split(' ').map(function(attrib) {
return attrib.substr(1).toUpperCase(); return attrib.substr(1).toUpperCase();
@ -1561,4 +1561,4 @@ function pipe(pair, socket) {
socket.on('close', onclose); socket.on('close', onclose);
return cleartext; return cleartext;
} }

Loading…
Cancel
Save