You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

80 lines
2.4 KiB

Index: configure
--- configure.orig 2007-10-20 13:21:16 +0200
+++ configure 2007-10-20 17:07:11 +0200
@@ -2620,19 +2620,19 @@
withval=$with_pkglibdir; pkglibdirname="$withval"
fi
- if test "x$pkglibdirname" = "x"
+ if false
then
DM_PKGLIBDIR="/usr/lib/dbmail"
else
DM_PKGLIBDIR=$pkglibdirname
fi
- if test "x$localstatedir" = 'x${prefix}/var'
+ if false
then
DM_STATEDIR="/var/run"
else
DM_STATEDIR=$localstatedir
fi
- if test "x$sysconfdir" = 'x${prefix}/etc'
+ if false
then
DM_CONFDIR="/etc"
else
Index: dbmail-mailbox.c
--- dbmail-mailbox.c.orig 2007-10-20 13:21:16 +0200
+++ dbmail-mailbox.c 2007-10-20 17:07:11 +0200
@@ -905,7 +905,7 @@
else if ( MATCH(key, "before") ) {
g_return_val_if_fail(search_keys[*idx + 1], -1);
- g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+ g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
value->type = IST_IDATE;
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date < '%s'", date_imap2sql(search_keys[*idx]));
@@ -913,7 +913,7 @@
} else if ( MATCH(key, "on") ) {
g_return_val_if_fail(search_keys[*idx + 1], -1);
- g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+ g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
value->type = IST_IDATE;
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date %s '%s%%'",
@@ -922,7 +922,7 @@
} else if ( MATCH(key, "since") ) {
g_return_val_if_fail(search_keys[*idx + 1], -1);
- g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+ g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
value->type = IST_IDATE;
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date > '%s'", date_imap2sql(search_keys[*idx]));
Index: misc.c
--- misc.c.orig 2007-10-20 13:21:16 +0200
+++ misc.c 2007-10-20 17:07:11 +0200
@@ -923,7 +923,7 @@
// Define len if "01-Jan-1970" string
#define STRLEN_MINDATA 11
-int check_date(const char *date)
+int dbmail_check_date(const char *date)
{
char sub[4];
int days, i, j=1;
Index: misc.h
--- misc.h.orig 2007-10-20 13:21:16 +0200
+++ misc.h 2007-10-20 17:07:11 +0200
@@ -137,7 +137,7 @@
int checkmailboxname(const char *s);
int check_msg_set(const char *s);
-int check_date(const char *date);
+int dbmail_check_date(const char *date);
/**
* \brief discards all input coming from instream