o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mailfs: support for UTF-8 searches

Browse source 
UTF-8 searches with the SEARCH command must
be conducted in two steps: the first sends
the SEARCH command with the length of the
UTF-8 encoded string and the second sends
the literal search term. The searches need
to not be quoted.

R=rsc, david.ducolombier, rsc, 0intro
CC=plan9port.codebot
https://codereview.appspot.com/13244043
This commit is contained in:
Akshat Kumar 2013-09-06 16:09:29 -04:00 • committed by Russ Cox
parent 1889a25783
commit 6541f1798b
1 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/cmd/upas/nfs/imap.c
View file

@ -34,6 +34,8 @@ struct Imap
/* SEARCH results */ /* SEARCH results */
uint *uid; uint *uid;
uint nuid; uint nuid;
uint reply;
}; };
static struct { static struct {
@ -66,10 +68,11 @@ static int getbox(Imap*, Box*);
static int getboxes(Imap*); static int getboxes(Imap*);
static char* gsub(char*, char*, char*); static char* gsub(char*, char*, char*);
static int imapcmd(Imap*, Box*, char*, ...); static int imapcmd(Imap*, Box*, char*, ...);
static Sx* imapcmdsxlit(Imap*, Box*, char*, ...);
static Sx* imapcmdsx(Imap*, Box*, char*, ...); static Sx* imapcmdsx(Imap*, Box*, char*, ...);
static Sx* imapcmdsx0(Imap*, char*, ...); static Sx* imapcmdsx0(Imap*, char*, ...);
static Sx* imapvcmdsx(Imap*, Box*, char*, va_list); static Sx* imapvcmdsx(Imap*, Box*, char*, va_list, int);
static Sx* imapvcmdsx0(Imap*, char*, va_list); static Sx* imapvcmdsx0(Imap*, char*, va_list, int);
static int imapdial(char*, int); static int imapdial(char*, int);
static int imaplogin(Imap*); static int imaplogin(Imap*);
static int imapquote(Fmt*); static int imapquote(Fmt*);
@ -338,7 +341,7 @@ imaprefreshthread(void *v)
* Run a single command and return the Sx. Does NOT redial. * Run a single command and return the Sx. Does NOT redial.
*/ */
static Sx* static Sx*
imapvcmdsx0(Imap *z, char *fmt, va_list arg) imapvcmdsx0(Imap *z, char *fmt, va_list arg, int dotag)
{ {
char *s; char *s;
Fmt f; Fmt f;
@ -353,6 +356,7 @@ imapvcmdsx0(Imap *z, char *fmt, va_list arg)
prefix = strlen(tag)+1; prefix = strlen(tag)+1;
fmtstrinit(&f); fmtstrinit(&f);
if(dotag)
fmtprint(&f, "%s ", tag); fmtprint(&f, "%s ", tag);
fmtvprint(&f, fmt, arg); fmtvprint(&f, fmt, arg);
fmtprint(&f, "\r\n"); fmtprint(&f, "\r\n");
@ -379,7 +383,7 @@ imapcmdsx0(Imap *z, char *fmt, ...)
Sx *sx; Sx *sx;
va_start(arg, fmt); va_start(arg, fmt);
sx = imapvcmdsx0(z, fmt, arg); sx = imapvcmdsx0(z, fmt, arg, 1);
va_end(arg); va_end(arg);
return sx; return sx;
} }
@ -388,7 +392,7 @@ imapcmdsx0(Imap *z, char *fmt, ...)
* Run a single command on box b. Does redial. * Run a single command on box b. Does redial.
*/ */
static Sx* static Sx*
imapvcmdsx(Imap *z, Box *b, char *fmt, va_list arg) imapvcmdsx(Imap *z, Box *b, char *fmt, va_list arg, int dotag)
{ {
int tries; int tries;
Sx *sx; Sx *sx;
@ -419,7 +423,7 @@ reconnect:
freesx(sx); freesx(sx);
} }
if((sx=imapvcmdsx0(z, fmt, arg)) == nil){ if((sx=imapvcmdsx0(z, fmt, arg, dotag)) == nil){
if(tries++ == 0 && (z->fd < 0 || !z->connected)) if(tries++ == 0 && (z->fd < 0 || !z->connected))
goto reconnect; goto reconnect;
return nil; return nil;
@ -434,7 +438,7 @@ imapcmd(Imap *z, Box *b, char *fmt, ...)
va_list arg; va_list arg;
va_start(arg, fmt); va_start(arg, fmt);
sx = imapvcmdsx(z, b, fmt, arg); sx = imapvcmdsx(z, b, fmt, arg, 1);
va_end(arg); va_end(arg);
if(sx == nil) if(sx == nil)
return -1; return -1;
@ -454,7 +458,19 @@ imapcmdsx(Imap *z, Box *b, char *fmt, ...)
va_list arg; va_list arg;
va_start(arg, fmt); va_start(arg, fmt);
sx = imapvcmdsx(z, b, fmt, arg); sx = imapvcmdsx(z, b, fmt, arg, 1);
va_end(arg);
return sx;
}
static Sx*
imapcmdsxlit(Imap *z, Box *b, char *fmt, ...)
{
Sx *sx;
va_list arg;
va_start(arg, fmt);
sx = imapvcmdsx(z, b, fmt, arg, 0);
va_end(arg); va_end(arg);
return sx; return sx;
} }
@ -469,6 +485,10 @@ imapwaitsx(Imap *z)
fprint(2, "<| %#$\n", sx); fprint(2, "<| %#$\n", sx);
if(sx->nsx >= 1 && sx->sx[0]->type == SxAtom && cistrcmp(sx->sx[0]->data, tag) == 0) if(sx->nsx >= 1 && sx->sx[0]->type == SxAtom && cistrcmp(sx->sx[0]->data, tag) == 0)
return sx; return sx;
if(sx->nsx >= 1 && sx->sx[0]->type == SxAtom && cistrcmp(sx->sx[0]->data, "+") == 0){
z->reply = 1;
return sx;
}
if(sx->nsx >= 1 && sx->sx[0]->type == SxAtom && strcmp(sx->sx[0]->data, "*") == 0) if(sx->nsx >= 1 && sx->sx[0]->type == SxAtom && strcmp(sx->sx[0]->data, "*") == 0)
unexpected(z, sx); unexpected(z, sx);
if(sx->type == SxList && sx->nsx == 0){ if(sx->type == SxList && sx->nsx == 0){
@ -651,17 +671,32 @@ imapsearchbox(Imap *z, Box *b, char *search, Msg ***mm)
int i, nuid; int i, nuid;
Msg **m; Msg **m;
int nm; int nm;
Sx *sx;
qlock(&z->lk); qlock(&z->lk);
if(imapcmd(z, b, "UID SEARCH CHARSET UTF-8 TEXT %Z", search) < 0){ sx = imapcmdsx(z, b, "UID SEARCH CHARSET UTF-8 TEXT {%d}", strlen(search));
freesx(sx);
if(!z->reply){
qunlock(&z->lk); qunlock(&z->lk);
return -1; return -1;
} }
if((sx = imapcmdsxlit(z, b, "%s", search)) == nil){
qunlock(&z->lk);
return -1;
}
if(sx->nsx < 2 || !isatom(sx->sx[1], "OK")){
werrstr("%$", sx);
freesx(sx);
qunlock(&z->lk);
return -1;
}
freesx(sx);
uid = z->uid; uid = z->uid;
nuid = z->nuid; nuid = z->nuid;
z->uid = nil; z->uid = nil;
z->nuid = 0; z->nuid = 0;
z->reply = 0;
qunlock(&z->lk); qunlock(&z->lk);
m = emalloc(nuid*sizeof m[0]); m = emalloc(nuid*sizeof m[0]);