Attachment #5845 for bug #29046

View | Details | Raw Unified | Return to bug 29046
Collapse All | Expand All




+ /* spam support */
+ 
+ static int
+ local_getline (int s, char *buf, int len)
+ {
+     char *bp = buf;
+     int ret = 1;

+     int score;
+     int threshold;
+ 
+     if (! local_getline (s, buf, sizeof (buf))) {
+ 	syslog (LOG_ERR, "read_response: response local_getline failed");
+ 	return SIEVE_FAIL;
+     }
+     if (sscanf (buf, "SPAMD/%d.%d %d %*s", &major, &minor, &response) != 3) {

+ 		major, minor);
+ 	return SIEVE_FAIL;
+     }
+     if (! local_getline (s, buf, sizeof (buf))) {
+ 	syslog (LOG_ERR, "read_response: header local_getline failed");
+ 	return SIEVE_FAIL;
+     }
+     if (sscanf (buf, "Spam: %5s ; %d / %d", is_spam, &score, &threshold) != 3) {

Lines 161-167 Link Here

(-)kolab-cyrus-imapd-2.2.13~/makedepend/def.h (-1 / +1 lines)
161		161
162	char *copy();	162	char *copy();
163	char *base_name();	163	char *base_name();
164	char *getline();	164	char *local_getline();
165	struct symtab *slookup();	165	struct symtab *slookup();
166	struct symtab *isdefined();	166	struct symtab *isdefined();
167	struct symtab *fdefined();	167	struct symtab *fdefined();

Lines 548-554 Link Here

(-)kolab-cyrus-imapd-2.2.13~/makedepend/main.c (-1 / +1 lines)
548	* Get the next line. We only return lines beginning with '#' since that	548	* Get the next line. We only return lines beginning with '#' since that
549	* is all this program is ever interested in.	549	* is all this program is ever interested in.
550	*/	550	*/
551	char *getline(filep)	551	char *local_getline(filep)
552	register struct filepointer *filep;	552	register struct filepointer *filep;
553	{	553	{
554	register char p, / walking pointer */	554	register char p, / walking pointer */

Lines 82-88 Link Here

(-)kolab-cyrus-imapd-2.2.13~/makedepend/parse.c (-2 / +2 lines)
82	register int type;	82	register int type;
83	boolean recfailOK;	83	boolean recfailOK;
84		84
85	while (line = getline(filep)) {	85	while (line = local_getline(filep)) {
86	switch(type = deftype(line, filep, file_red, file, TRUE)) {	86	switch(type = deftype(line, filep, file_red, file, TRUE)) {
87	case IF:	87	case IF:
88	doif:	88	doif:
Lines 204-210 Link Here
204	register char *line;	204	register char *line;
205	register int type;	205	register int type;
206		206
207	while (line = getline(filep)) {	207	while (line = local_getline(filep)) {
208	switch(type = deftype(line, filep, file_red, file, FALSE)) {	208	switch(type = deftype(line, filep, file_red, file, FALSE)) {
209	case IF:	209	case IF:
210	case IFFALSE:	210	case IFFALSE:

Return to bug 29046

Lines 85-91 Link Here

(-)kolab-cyrus-imapd-2.2.13~/contrib/sieve-spamasssassin (-5 / +5 lines)
85	+ /* spam support */	85	+ /* spam support */
86	+	86	+
87	+ static int	87	+ static int
88	+ getline (int s, char *buf, int len)	88	+ local_getline (int s, char *buf, int len)
89	+ {	89	+ {
90	+ char *bp = buf;	90	+ char *bp = buf;
91	+ int ret = 1;	91	+ int ret = 1;
Lines 129-136 Link Here
129	+ int score;	129	+ int score;
130	+ int threshold;	130	+ int threshold;
131	+	131	+
132	+ if (! getline (s, buf, sizeof (buf))) {	132	+ if (! local_getline (s, buf, sizeof (buf))) {
133	+ syslog (LOG_ERR, "read_response: response getline failed");	133	+ syslog (LOG_ERR, "read_response: response local_getline failed");
134	+ return SIEVE_FAIL;	134	+ return SIEVE_FAIL;
135	+ }	135	+ }
136	+ if (sscanf (buf, "SPAMD/%d.%d %d %*s", &major, &minor, &response) != 3) {	136	+ if (sscanf (buf, "SPAMD/%d.%d %d %*s", &major, &minor, &response) != 3) {
Lines 143-150 Link Here
143	+ major, minor);	143	+ major, minor);
144	+ return SIEVE_FAIL;	144	+ return SIEVE_FAIL;
145	+ }	145	+ }
146	+ if (! getline (s, buf, sizeof (buf))) {	146	+ if (! local_getline (s, buf, sizeof (buf))) {
147	+ syslog (LOG_ERR, "read_response: header getline failed");	147	+ syslog (LOG_ERR, "read_response: header local_getline failed");
148	+ return SIEVE_FAIL;	148	+ return SIEVE_FAIL;
149	+ }	149	+ }
150	+ if (sscanf (buf, "Spam: %5s ; %d / %d", is_spam, &score, &threshold) != 3) {	150	+ if (sscanf (buf, "Spam: %5s ; %d / %d", is_spam, &score, &threshold) != 3) {