aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/upas
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2007-11-27 15:39:06 -0500
committerRuss Cox <rsc@swtch.com>2007-11-27 15:39:06 -0500
commit83ab7d88962d717ca5729e7337706b6e4da48af6 (patch)
tree2dcaeba8fec383733357f4db5e9c2d0718767838 /src/cmd/upas
parent00a8743cd85fcb605a06382387ac526e7fe8bf36 (diff)
parent00a8743cd85fcb605a06382387ac526e7fe8bf36 (diff)
downloadplan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.tar.gz
plan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.tar.bz2
plan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.zip
merge
Diffstat (limited to 'src/cmd/upas')
-rw-r--r--src/cmd/upas/nfs/imap.c10
-rw-r--r--src/cmd/upas/vf/unvf.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/src/cmd/upas/nfs/imap.c b/src/cmd/upas/nfs/imap.c
index 0a93b6b5..64ffeb17 100644
--- a/src/cmd/upas/nfs/imap.c
+++ b/src/cmd/upas/nfs/imap.c
@@ -569,13 +569,19 @@ int
imapcopylist(Imap *z, char *nbox, Msg **m, uint nm)
{
int rv;
- char *name;
+ char *name, *p;
if(nm == 0)
return 0;
qlock(&z->lk);
- name = esmprint("%Z", nbox);
+ if(strcmp(nbox, "mbox") == 0)
+ name = estrdup("INBOX");
+ else{
+ p = esmprint("%s%s", z->root, nbox);
+ name = esmprint("%Z", p);
+ free(p);
+ }
rv = imaplistcmd(z, m[0]->box, "UID COPY", m, nm, name);
free(name);
qunlock(&z->lk);
diff --git a/src/cmd/upas/vf/unvf.c b/src/cmd/upas/vf/unvf.c
index 92af6bfb..aecbca62 100644
--- a/src/cmd/upas/vf/unvf.c
+++ b/src/cmd/upas/vf/unvf.c
@@ -24,7 +24,7 @@ main(void)
while((p = Brdstr(&b, '\n', 1)) != nil){
if(p[0] == 0)
break;
- if(strncmp(p, "Content-Transfer-Encoding: ", 27) == 0)
+ if(cistrncmp(p, "Content-Transfer-Encoding: ", 27) == 0)
encoding = strdup(p+27);
free(p);
}