/[imapfilter]/imapfilter/file.c
ViewVC logotype

Diff of /imapfilter/file.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.24 by lefcha, Mon Oct 8 08:55:07 2001 UTC revision 1.25 by lefcha, Wed Oct 17 14:06:20 2001 UTC
# Line 101  int parse_config(FILE * fp) Line 101  int parse_config(FILE * fp)
101      regmatch_t match[7];      regmatch_t match[7];
102      const char *reg[12] = {      const char *reg[12] = {
103          "^([[:blank:]]*\n|#.*\n)$",          "^([[:blank:]]*\n|#.*\n)$",
104    #ifndef SSL_TLS
105          "^[[:blank:]]*ACCOUNT[[:blank:]]+([[:graph:]]*):([[:graph:]]*)@([[:alnum:].-]+)(:[[:digit:]]+)?[[:blank:]]*\n$",          "^[[:blank:]]*ACCOUNT[[:blank:]]+([[:graph:]]*):([[:graph:]]*)@([[:alnum:].-]+)(:[[:digit:]]+)?[[:blank:]]*\n$",
106    #else
107            "^[[:blank:]]*ACCOUNT[[:blank:]]+([[:graph:]]*):([[:graph:]]*)@([[:alnum:].-]+)(:[[:digit:]]+)?[[:blank:]]*([[:blank:]]SSL|[[:blank:]]SSL2|[[:blank:]]SSL3|[[:blank:]]TLS1)?[[:blank:]]*\n$",
108    #endif
109          "^[[:blank:]]*FOLDER[[:blank:]]+([[:alnum:]_-]+)[[:blank:]]+([[:graph:]]+)[[:blank:]]*\n$",          "^[[:blank:]]*FOLDER[[:blank:]]+([[:alnum:]_-]+)[[:blank:]]+([[:graph:]]+)[[:blank:]]*\n$",
110          "^[[:blank:]]*FILTER[[:blank:]]+([[:alnum:]_-]+)[[:blank:]]*([[:blank:]]OR|[[:blank:]]AND)?[[:blank:]]*\n$",          "^[[:blank:]]*FILTER[[:blank:]]+([[:alnum:]_-]+)[[:blank:]]*([[:blank:]]OR|[[:blank:]]AND)?[[:blank:]]*\n$",
111          "^[[:blank:]]*ACTION[[:blank:]]+(DELETE|COPY[[:blank:]]+([[:graph:]]+)|MOVE[[:blank:]]+([[:graph:]]+)|LIST)[[:blank:]]*([[:graph:]]*)[[:blank:]]*\n$",          "^[[:blank:]]*ACTION[[:blank:]]+(DELETE|COPY[[:blank:]]+([[:graph:]]+)|MOVE[[:blank:]]+([[:graph:]]+)|LIST)[[:blank:]]*([[:graph:]]*)[[:blank:]]*\n$",
# Line 121  int parse_config(FILE * fp) Line 125  int parse_config(FILE * fp)
125          row++;          row++;
126          if (!regexec(&creg[0], line, 0, match, 0))          if (!regexec(&creg[0], line, 0, match, 0))
127              continue;              continue;
128    #ifndef SSL_TLS
129            else if (!regexec(&creg[1], line, 5, match, 0))
130    #else
131          else if (!regexec(&creg[1], line, 6, match, 0))          else if (!regexec(&creg[1], line, 6, match, 0))
132    #endif
133              set_account(line, match);              set_account(line, match);
134          else if (!regexec(&creg[2], line, 3, match, 0))          else if (!regexec(&creg[2], line, 3, match, 0))
135              r = set_mboxgrp(line, match);              r = set_mboxgrp(line, match);
# Line 167  void set_options(char *line, regmatch_t Line 175  void set_options(char *line, regmatch_t
175      } else {      } else {
176          if (!strncasecmp(line + match[2].rm_so, "yes", 3))          if (!strncasecmp(line + match[2].rm_so, "yes", 3))
177              options |= OPTION_HEADERS;              options |= OPTION_HEADERS;
178          else if (options & OPTION_HEADERS)          else
179              options ^= OPTION_HEADERS;              options &= ~(OPTION_HEADERS);
180      }      }
181  }  }

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25

webmaster@linux.gr
ViewVC Help
Powered by ViewVC 1.1.26