Blob Blame Raw
--- cyrus-imapd-2.3.9/imap/compile_sieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/compile_sieve.c	2007-09-23 16:54:54.000000000 +0200
@@ -37,7 +37,7 @@
 
 static int is_script_parsable(FILE *stream, char **errstr, sieve_script_t **ret);
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
 
@@ -68,7 +68,7 @@
     extern char *optarg;
     char sieve_tmpname[MAX_MAILBOX_NAME+1];
 
-    if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+    if (geteuid() == 0) my_fatal("must run as the Cyrus user", EC_USAGE);
 
     while((opt = getopt(argc, argv, "C:i:o:")) != EOF) {
         switch (opt) {
@@ -218,7 +218,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 extern sieve_vacation_t vacation2;/* = {
@@ -234,7 +234,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }
 
--- cyrus-imapd-2.3.9/imap/autosieve.c.myfatal	2007-09-23 16:13:29.000000000 +0200
+++ cyrus-imapd-2.3.9/imap/autosieve.c	2007-09-23 16:37:27.000000000 +0200
@@ -35,7 +35,7 @@
 static int get_script_dir(char *sieve_script_dir, size_t buflen, char *userid, const char *sieve_dir);
 int autoadd_sieve(char *userid, const char *source_script);
 
-static void fatal(const char *s, int code);
+static void my_fatal(const char *s, int code);
 static void foo(void);
 static int sieve_notify(void *ac __attribute__((unused)),
                         void *interp_context __attribute__((unused)),
@@ -441,7 +441,7 @@
     return 0;
 }
 
-static void fatal(const char *s, int code)
+static void my_fatal(const char *s, int code)
 {   
     printf("Fatal error: %s (%d)\r\n", s, code);
     exit(1);
@@ -450,7 +450,7 @@
 /* to make larry's stupid functions happy :) */
 static void foo(void)
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
 }
 
 static int sieve_notify(void *ac __attribute__((unused)),
@@ -459,7 +459,7 @@
                         void *message_context __attribute__((unused)),
                         const char **errmsg __attribute__((unused)))
 {
-    fatal("stub function called", 0);
+    my_fatal("stub function called", 0);
     return SIEVE_FAIL;
 }