alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* reindentation, fix mu_str_ascii_xapian_escape_in_place for '..'

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-05-22 10:27:12 +03:00
parent 000805ae1f
commit e478eeee6d
2 changed files with 252 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/mu-str.c
View File

@ -1,5 +1,7 @@
/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
/*
** Copyright (C) 2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@ -179,7 +181,7 @@ cleanup_contact (char *contact)
* good to cleanup corporate contact address spam... */
c = g_strstr_len (contact, -1, "(");
if (c && c - contact > 5)
*c = '\0';
*c = '\0';
g_strstrip (contact);
}
@ -289,37 +291,37 @@ is_xapian_prefix (const char *q, const char *colon)
time_t
mu_str_date_parse_hdwmy (const char* str)
{
long int num;
char *end;
time_t now, delta;
time_t never = (time_t)-1;
long int num;
char *end;
time_t now, delta;
time_t never = (time_t)-1;
g_return_val_if_fail (str, never);
g_return_val_if_fail (str, never);
num = strtol (str, &end, 10);
if (num <= 0 || num > 9999)
return never;
num = strtol (str, &end, 10);
if (num <= 0 || num > 9999)
return never;
if (!end || end[1] != '\0')
return never;
if (!end || end[1] != '\0')
return never;
switch (end[0]) {
case 'h': /* hour */
delta = num * 60 * 60; break;
case 'd': /* day */
delta = num * 24 * 60 * 60; break;
case 'w': /* week */
delta = num * 7 * 24 * 60 * 60; break;
case 'm':
delta = num * 30 * 24 * 60 * 60; break;
case 'y':
delta = num * 365 * 24 * 60 * 60; break;
default:
return never;
}
switch (end[0]) {
case 'h': /* hour */
delta = num * 60 * 60; break;
case 'd': /* day */
delta = num * 24 * 60 * 60; break;
case 'w': /* week */
delta = num * 7 * 24 * 60 * 60; break;
case 'm':
delta = num * 30 * 24 * 60 * 60; break;
case 'y':
delta = num * 365 * 24 * 60 * 60; break;
default:
return never;
}
now = time(NULL);
return delta <= now ? now - delta : never;
now = time(NULL);
return delta <= now ? now - delta : never;
}
guint64
@ -341,13 +343,17 @@ mu_str_size_parse_kmg (const char* str)
case 'b': return num; /* bytes */
case 'k': return num * 1000; /* kilobyte */
case 'm': return num * 1000 * 1000; /* megabyte */
/* case 'g': return num * 1000 * 1000 * 1000; /\* gigabyte *\/ */
/* case 'g': return num * 1000 * 1000 * 1000; /\* gigabyte *\/ */
default:
return G_MAXUINT64;
}
}
/*
* Xapian treats various characters such as '@', '-', ':' and '.'
* specially; function below is an ugly hack to make it DWIM in most
* cases...*/
char*
mu_str_ascii_xapian_escape_in_place (char *query)
{
@ -361,26 +367,25 @@ mu_str_ascii_xapian_escape_in_place (char *query)
replace_dot = (g_strstr_len(query, -1, "@") != NULL);
for (cur = query; *cur; ++cur) {
*cur = tolower(*cur);
if (*cur == '@' || *cur == '-')
*cur = '_';
else if (*cur == '.') {
/* don't replace a final cur */
if (cur[1] == '.' || cur[1]== ' ' || cur[1]=='\t')
cur += 2;
else if (cur[1] == '\0')
if (cur[1]== ' ' || cur[1]=='\t' || cur[1] == '\0' ||
cur[1]== '.')
++cur;
else
*cur = '_';
} else if (*cur == ':') {
/* if there's a registered xapian prefix before the
* ':', don't touch it. Otherwise replace ':' with
* a space'... ugly...
*/
* a space'... ugh yuck ugly...
*/
if (!is_xapian_prefix (query, cur))
*cur = '_';
} else
*cur = tolower(*cur);
}
}
return query;