summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libetpanstuff/libetpan_cvs.diff152
1 files changed, 152 insertions, 0 deletions
diff --git a/noncore/net/mail/libetpanstuff/libetpan_cvs.diff b/noncore/net/mail/libetpanstuff/libetpan_cvs.diff
new file mode 100644
index 0000000..0771ca5
--- a/dev/null
+++ b/noncore/net/mail/libetpanstuff/libetpan_cvs.diff
@@ -0,0 +1,152 @@
1Index: generic/imapdriver_tools.c
2===================================================================
3RCS file: /cvsroot/libetpan/libetpan/generic/imapdriver_tools.c,v
4retrieving revision 1.12
5diff -u -3 -p -r1.12 imapdriver_tools.c
6 --- generic/imapdriver_tools.c 22 Nov 2003 15:42:52 -00001.12
7 +++ generic/imapdriver_tools.c29 Nov 2003 23:52:46 -0000
8@@ -2704,7 +2704,7 @@ int mail_search_to_imap_search(struct ma
9
10 case MAIL_SEARCH_KEY_NOT:
11 type = MAILIMAP_SEARCH_KEY_NOT;
12- r = mail_search_to_imap_search(key->not, &not);
13+ r = mail_search_to_imap_search(key->_not, &not);
14 if (r != MAIL_NO_ERROR) {
15 res = r;
16 goto err;
17Index: generic/maildriver_types.c
18===================================================================
19RCS file: /cvsroot/libetpan/libetpan/generic/maildriver_types.c,v
20retrieving revision 1.20
21diff -u -3 -p -r1.20 maildriver_types.c
22 --- generic/maildriver_types.c 26 Oct 2003 23:51:01 -00001.20
23 +++ generic/maildriver_types.c29 Nov 2003 23:52:46 -0000
24@@ -146,7 +146,7 @@ mail_search_key_new(int type,
25 key->header_name = header_name;
26 key->header_value = header_value;
27 key->larger = larger;
28- key->not = not;
29+ key->_not = not;
30 key->or1 = or1;
31 key->or2 = or2;
32 key->smaller = smaller;
33@@ -182,8 +182,8 @@ void mail_search_key_free(struct mail_se
34 free(key->header_name);
35 if (key->header_value)
36 free(key->header_value);
37- if (key->not)
38- mail_search_key_free(key->not);
39+ if (key->_not)
40+ mail_search_key_free(key->_not);
41 if (key->or1)
42 mail_search_key_free(key->or1);
43 if (key->or2)
44Index: generic/maildriver_types.h
45===================================================================
46RCS file: /cvsroot/libetpan/libetpan/generic/maildriver_types.h,v
47retrieving revision 1.35
48diff -u -3 -p -r1.35 maildriver_types.h
49 --- generic/maildriver_types.h 25 Nov 2003 00:04:54 -00001.35
50 +++ generic/maildriver_types.h29 Nov 2003 23:52:46 -0000
51@@ -257,7 +257,7 @@ struct mail_search_key {
52 char * header_name;
53 char * header_value;
54 size_t larger;
55- struct mail_search_key * not;
56+ struct mail_search_key * _not;
57 struct mail_search_key * or1;
58 struct mail_search_key * or2;
59 size_t smaller;
60@@ -280,7 +280,7 @@ mail_search_key_new(int type,
61 char * header_name,
62 char * header_value,
63 size_t larger,
64 - struct mail_search_key * not,
65 + struct mail_search_key * _not,
66 struct mail_search_key * or1,
67 struct mail_search_key * or2,
68 size_t smaller,
69Index: imap/mailimap_sender.c
70===================================================================
71RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_sender.c,v
72retrieving revision 1.11
73diff -u -3 -p -r1.11 mailimap_sender.c
74 --- imap/mailimap_sender.c 17 Nov 2003 11:38:41 -00001.11
75 +++ imap/mailimap_sender.c29 Nov 2003 23:52:47 -0000
76@@ -2083,7 +2083,7 @@ static int mailimap_search_key_send(mail
77 r = mailimap_space_send(fd);
78 if (r != MAILIMAP_NO_ERROR)
79 return r;
80- r = mailimap_search_key_send(fd, key->not);
81+ r = mailimap_search_key_send(fd, key->_not);
82 if (r != MAILIMAP_NO_ERROR)
83 return r;
84 return MAILIMAP_NO_ERROR;
85Index: imap/mailimap_types.c
86===================================================================
87RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.c,v
88retrieving revision 1.15
89diff -u -3 -p -r1.15 mailimap_types.c
90 --- imap/mailimap_types.c 19 Nov 2003 01:42:54 -00001.15
91 +++ imap/mailimap_types.c29 Nov 2003 23:52:48 -0000
92@@ -2396,7 +2396,7 @@ mailimap_search_key_new(int type,
93 key->header_name = header_name;
94 key->header_value = header_value;
95 key->larger = larger;
96- key->not = not;
97+ key->_not = not;
98 key->or1 = or1;
99 key->or2 = or2;
100 key->sentbefore = sentbefore;
101@@ -2441,8 +2441,8 @@ void mailimap_search_key_free(struct mai
102 mailimap_header_fld_name_free(key->header_name);
103 if (key->header_value)
104 mailimap_astring_free(key->header_value);
105- if (key->not)
106- mailimap_search_key_free(key->not);
107+ if (key->_not)
108+ mailimap_search_key_free(key->_not);
109 if (key->or1)
110 mailimap_search_key_free(key->or1);
111 if (key->or2)
112Index: imap/mailimap_types.h
113===================================================================
114RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types.h,v
115retrieving revision 1.16
116diff -u -3 -p -r1.16 mailimap_types.h
117 --- imap/mailimap_types.h 25 Nov 2002 07:09:24 -00001.16
118 +++ imap/mailimap_types.h29 Nov 2003 23:52:50 -0000
119@@ -2858,7 +2858,7 @@ struct mailimap_search_key {
120 char * header_name;
121 char * header_value;
122 uint32_t larger;
123- struct mailimap_search_key * not;
124+ struct mailimap_search_key * _not;
125 struct mailimap_search_key * or1;
126 struct mailimap_search_key * or2;
127 struct mailimap_date * sentbefore;
128@@ -2887,7 +2887,7 @@ mailimap_search_key_new(int type,
129 char * header_name,
130 char * header_value,
131 uint32_t larger,
132 - struct mailimap_search_key * not,
133 + struct mailimap_search_key * _not,
134 struct mailimap_search_key * or1,
135 struct mailimap_search_key * or2,
136 struct mailimap_date * sentbefore,
137Index: imap/mailimap_types_helper.h
138===================================================================
139RCS file: /cvsroot/libetpan/libetpan/imap/mailimap_types_helper.h,v
140retrieving revision 1.8
141diff -u -3 -p -r1.8 mailimap_types_helper.h
142 --- imap/mailimap_types_helper.h 26 Oct 2003 23:51:01 -00001.8
143 +++ imap/mailimap_types_helper.h29 Nov 2003 23:52:50 -0000
144@@ -573,7 +573,7 @@ mailimap_search_key_new_larger(uint32_t
145 */
146
147 struct mailimap_search_key *
148-mailimap_search_key_new_not(struct mailimap_search_key * not);
149+mailimap_search_key_new_not(struct mailimap_search_key * _not);
150
151 /*
152 this function creates a condition structure to match messages that