martin: server/imap imap.annotate.patch,1.1,1.2
cvs at intevation.de
cvs at intevation.de
Wed Jun 15 16:07:53 CEST 2005
Author: martin
Update of /kolabrepository/server/imap
In directory doto:/tmp/cvs-serv32587/imap
Modified Files:
imap.annotate.patch
Log Message:
Martin Konold: Uptodate and tested patch for UW imap c-client
Index: imap.annotate.patch
===================================================================
RCS file: /kolabrepository/server/imap/imap.annotate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imap.annotate.patch 11 Jun 2005 16:52:41 -0000 1.1
+++ imap.annotate.patch 15 Jun 2005 14:07:51 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c
---- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c 2005-05-26 08:09:54.000000000 +0200
-+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c 2005-06-06 11:07:01.000000000 +0200
+diff -u -r imap-2004d/src/c-client/imap4r1.c imap-2004d.annotation/src/c-client/imap4r1.c
+--- imap-2004d/src/c-client/imap4r1.c 2005-04-09 01:43:31.000000000 +0200
++++ imap-2004d.annotation/src/c-client/imap4r1.c 2005-06-06 11:20:05.490904844 +0200
@@ -125,7 +125,8 @@
#define MULTIAPPEND 13
#define SNLIST 14
@@ -27,7 +27,7 @@
IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
STRING *st);
IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
-@@ -2679,6 +2683,84 @@
+@@ -2677,6 +2681,84 @@
args[0] = &ambx; args[1] = NIL;
return imap_acl_work (stream,"GETACL",args);
}
@@ -112,7 +112,7 @@
/* IMAP list rights
* Accepts: mail stream
-@@ -2731,6 +2813,16 @@
+@@ -2729,6 +2811,16 @@
else mm_log ("ACL not available on this IMAP server",ERROR);
return ret;
}
@@ -129,7 +129,7 @@
/* IMAP set quota
* Accepts: mail stream
-@@ -2863,6 +2955,11 @@
+@@ -2861,6 +2953,11 @@
if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
return reply;
break;
@@ -141,7 +141,7 @@
case LITERAL: /* literal, as a stringstruct */
if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
break;
-@@ -2879,6 +2976,18 @@
+@@ -2877,6 +2974,18 @@
while (list = list->next);
*s++ = ')'; /* close list */
break;
@@ -160,7 +160,7 @@
case SEARCHPROGRAM: /* search program */
if (reply = imap_send_spgm (stream,tag,CMDBASE,&s,arg->text,
CMDBASE+MAXCOMMAND))
-@@ -3046,6 +3155,32 @@
+@@ -3044,6 +3153,32 @@
mail_unlock (stream); /* unlock stream */
return reply;
}
@@ -193,7 +193,7 @@
/* IMAP send atom-string
* Accepts: MAIL stream
-@@ -3948,6 +4083,50 @@
+@@ -3949,6 +4084,50 @@
}
}
@@ -244,18 +244,18 @@
else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
(t = imap_parse_astring (stream,&s,reply,NIL))) {
getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
-diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h
---- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h 2005-04-07 20:40:17.000000000 +0200
-+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h 2005-06-03 14:22:14.000000000 +0200
+diff -u -r imap-2004d/src/c-client/imap4r1.h imap-2004d.annotation/src/c-client/imap4r1.h
+--- imap-2004d/src/c-client/imap4r1.h 2005-04-07 20:36:52.000000000 +0200
++++ imap-2004d.annotation/src/c-client/imap4r1.h 2005-06-06 11:20:05.491904694 +0200
@@ -232,3 +232,5 @@
long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
long imap_getquota (MAILSTREAM *stream,char *qroot);
long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation);
-diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c
---- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c 2005-03-17 01:12:17.000000000 +0100
-+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c 2005-06-06 10:36:04.000000000 +0200
+diff -u -r imap-2004d/src/c-client/mail.c imap-2004d.annotation/src/c-client/mail.c
+--- imap-2004d/src/c-client/mail.c 2005-03-17 01:10:18.000000000 +0100
++++ imap-2004d.annotation/src/c-client/mail.c 2005-06-06 11:20:05.497903794 +0200
@@ -60,6 +60,7 @@
static newsrcquery_t mailnewsrcquery = NIL;
/* ACL results callback */
@@ -318,9 +318,9 @@
/* Mail garbage collect quotalist
* Accepts: pointer to quotalist pointer
-diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h
---- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h 2005-02-09 00:44:54.000000000 +0100
-+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h 2005-06-06 10:37:59.000000000 +0200
+diff -u -r imap-2004d/src/c-client/mail.h imap-2004d.annotation/src/c-client/mail.h
+--- imap-2004d/src/c-client/mail.h 2005-01-22 00:56:21.000000000 +0100
++++ imap-2004d.annotation/src/c-client/mail.h 2005-06-06 11:20:05.500903345 +0200
@@ -311,6 +311,8 @@
#define SET_SNARFPRESERVE (long) 567
#define GET_INBOXPATH (long) 568
@@ -374,9 +374,9 @@
void mail_free_body (BODY **body);
void mail_free_body_data (BODY *body);
void mail_free_body_parameter (PARAMETER **parameter);
-diff -ru imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c
---- imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c 2005-04-07 20:40:57.000000000 +0200
-+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c 2005-06-06 10:37:30.000000000 +0200
+diff -u -r imap-2004d/src/mtest/mtest.c imap-2004d.annotation/src/mtest/mtest.c
+--- imap-2004d/src/mtest/mtest.c 2005-04-07 20:37:44.000000000 +0200
++++ imap-2004d.annotation/src/mtest/mtest.c 2005-06-06 11:20:05.502903045 +0200
@@ -137,6 +137,8 @@
#endif
return NIL;
More information about the commits
mailing list