From aab3226d906188c8051ff77523f4299cfef44b89 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 21 Jan 2011 20:11:11 -0500 Subject: [PATCH] * remove '-characters, () from contact displays --- src/mu-str.c | 464 +++++++++++++++++++++++++-------------------------- 1 file changed, 232 insertions(+), 232 deletions(-) diff --git a/src/mu-str.c b/src/mu-str.c index e90f294a..922ec7be 100644 --- a/src/mu-str.c +++ b/src/mu-str.c @@ -34,305 +34,305 @@ /* not all systems provide PATH_MAX in limits.h */ #ifndef PATH_MAX #include -#ifndef PATH_MAX -#define PATH_MAX MAXPATHLEN -#endif /*!PATH_MAX*/ -#endif /*PATH_MAX*/ +/* #ifndef PATH_MAX */ +/* #define PATH_MAX MAXPATHLEN */ +/* #endif /\*!PATH_MAX*\/ */ +/* #endif /\*PATH_MAX*\/ */ -#include "mu-str.h" -#include "mu-msg-flags.h" -#include "mu-msg-fields.h" +/* #include "mu-str.h" */ +/* #include "mu-msg-flags.h" */ +/* #include "mu-msg-fields.h" */ -const char* -mu_str_date_s (const char* frm, time_t t) -{ - struct tm *tmbuf; - static char buf[128]; +/* const char* */ +/* mu_str_date_s (const char* frm, time_t t) */ +/* { */ +/* struct tm *tmbuf; */ +/* static char buf[128]; */ - g_return_val_if_fail (frm, NULL); +/* g_return_val_if_fail (frm, NULL); */ - tmbuf = localtime(&t); +/* tmbuf = localtime(&t); */ - strftime (buf, sizeof(buf), frm, tmbuf); +/* strftime (buf, sizeof(buf), frm, tmbuf); */ - return buf; -} +/* return buf; */ +/* } */ -char* -mu_str_date (const char *frm, time_t t) -{ - return g_strdup (mu_str_date_s(frm, t)); -} +/* char* */ +/* mu_str_date (const char *frm, time_t t) */ +/* { */ +/* return g_strdup (mu_str_date_s(frm, t)); */ +/* } */ -const char* -mu_str_display_date_s (time_t t) -{ - time_t now; - static const time_t SECS_IN_DAY = 24 * 60 * 60; +/* const char* */ +/* mu_str_display_date_s (time_t t) */ +/* { */ +/* time_t now; */ +/* static const time_t SECS_IN_DAY = 24 * 60 * 60; */ - now = time (NULL); +/* now = time (NULL); */ - if (ABS(now - t) > SECS_IN_DAY) - return mu_str_date_s ("%x", t); - else - return mu_str_date_s ("%X", t); -} +/* if (ABS(now - t) > SECS_IN_DAY) */ +/* return mu_str_date_s ("%x", t); */ +/* else */ +/* return mu_str_date_s ("%X", t); */ +/* } */ -const char* -mu_str_size_s (size_t s) -{ - static char buf[32]; +/* const char* */ +/* mu_str_size_s (size_t s) */ +/* { */ +/* static char buf[32]; */ -#ifdef HAVE_GLIB216 - char *tmp; +/* #ifdef HAVE_GLIB216 */ +/* char *tmp; */ - tmp = g_format_size_for_display ((goffset)s); - strncpy (buf, tmp, sizeof(buf)); - buf[sizeof(buf) -1] = '\0'; /* just in case */ - g_free (tmp); +/* tmp = g_format_size_for_display ((goffset)s); */ +/* strncpy (buf, tmp, sizeof(buf)); */ +/* buf[sizeof(buf) -1] = '\0'; /\* just in case *\/ */ +/* g_free (tmp); */ -#else - if (s >= 1000 * 1000) - g_snprintf(buf, sizeof(buf), "%.1f MB", - (double)s/(1000*1000)); - else - g_snprintf(buf, sizeof(buf), "%.1f kB", (double)s/(1000)); -#endif /*HAVE_GLIB216*/ +/* #else */ +/* if (s >= 1000 * 1000) */ +/* g_snprintf(buf, sizeof(buf), "%.1f MB", */ +/* (double)s/(1000*1000)); */ +/* else */ +/* g_snprintf(buf, sizeof(buf), "%.1f kB", (double)s/(1000)); */ +/* #endif /\*HAVE_GLIB216*\/ */ - return buf; -} +/* return buf; */ +/* } */ -char* -mu_str_size (size_t s) -{ - return g_strdup (mu_str_size_s(s)); -} +/* char* */ +/* mu_str_size (size_t s) */ +/* { */ +/* return g_strdup (mu_str_size_s(s)); */ +/* } */ -const char* -mu_str_flags_s (MuMsgFlags flags) -{ - return mu_msg_flags_str_s (flags); -} +/* const char* */ +/* mu_str_flags_s (MuMsgFlags flags) */ +/* { */ +/* return mu_msg_flags_str_s (flags); */ +/* } */ -char* -mu_str_flags (MuMsgFlags flags) -{ - return g_strdup (mu_str_flags_s(flags)); -} +/* char* */ +/* mu_str_flags (MuMsgFlags flags) */ +/* { */ +/* return g_strdup (mu_str_flags_s(flags)); */ +/* } */ -char* -mu_str_summarize (const char* str, size_t max_lines) -{ - char *summary; - size_t nl_seen; - unsigned i,j; - gboolean last_was_blank; +/* char* */ +/* mu_str_summarize (const char* str, size_t max_lines) */ +/* { */ +/* char *summary; */ +/* size_t nl_seen; */ +/* unsigned i,j; */ +/* gboolean last_was_blank; */ - g_return_val_if_fail (str, NULL); - g_return_val_if_fail (max_lines > 0, NULL); +/* g_return_val_if_fail (str, NULL); */ +/* g_return_val_if_fail (max_lines > 0, NULL); */ - /* len for summary <= original len */ - summary = g_new (gchar, strlen(str) + 1); +/* /\* len for summary <= original len *\/ */ +/* summary = g_new (gchar, strlen(str) + 1); */ - /* copy the string up to max_lines lines, replace CR/LF/tab with - * single space */ - for (i = j = 0, nl_seen = 0, last_was_blank = TRUE; - nl_seen < max_lines && str[i] != '\0'; ++i) { +/* /\* copy the string up to max_lines lines, replace CR/LF/tab with */ +/* * single space *\/ */ +/* for (i = j = 0, nl_seen = 0, last_was_blank = TRUE; */ +/* nl_seen < max_lines && str[i] != '\0'; ++i) { */ - if (str[i] == '\n' || str[i] == '\r' || - str[i] == '\t' || str[i] == ' ' ) { +/* if (str[i] == '\n' || str[i] == '\r' || */ +/* str[i] == '\t' || str[i] == ' ' ) { */ - if (str[i] == '\n') - ++nl_seen; +/* if (str[i] == '\n') */ +/* ++nl_seen; */ - /* no double-blanks or blank at end of str */ - if (!last_was_blank && str[i+1] != '\0') - summary[j++] = ' '; +/* /\* no double-blanks or blank at end of str *\/ */ +/* if (!last_was_blank && str[i+1] != '\0') */ +/* summary[j++] = ' '; */ - last_was_blank = TRUE; - } else { +/* last_was_blank = TRUE; */ +/* } else { */ - summary[j++] = str[i]; - last_was_blank = FALSE; - } - } +/* summary[j++] = str[i]; */ +/* last_was_blank = FALSE; */ +/* } */ +/* } */ - summary[j] = '\0'; - return summary; -} +/* summary[j] = '\0'; */ +/* return summary; */ +/* } */ -/* this is still somewhat simplistic... */ -const char* -mu_str_display_contact_s (const char *str) -{ - static gchar contact[255]; - gchar *c, *c2; +/* /\* this is still somewhat simplistic... *\/ */ +/* const char* */ +/* mu_str_display_contact_s (const char *str) */ +/* { */ +/* static gchar contact[255]; */ +/* gchar *c, *c2; */ - str = str ? str : ""; - g_strlcpy (contact, str, sizeof(contact)); +/* str = str ? str : ""; */ +/* g_strlcpy (contact, str, sizeof(contact)); */ - /* we check for '<', so we can strip out the address stuff in - * e.g. 'Hello World , but only if there is - * something alphanumeric before the < - */ - c = g_strstr_len (contact, -1, "<"); - if (c != NULL) { - for (c2 = contact; c2 < c && !(isalnum(*c2)); ++c2); - if (c2 != c) /* apparently, there was something, - * so we can remove the <... part*/ - *c = '\0'; - } +/* /\* we check for '<', so we can strip out the address stuff in */ +/* * e.g. 'Hello World , but only if there is */ +/* * something alphanumeric before the < */ +/* *\/ */ +/* c = g_strstr_len (contact, -1, "<"); */ +/* if (c != NULL) { */ +/* for (c2 = contact; c2 < c && !(isalnum(*c2)); ++c2); */ +/* if (c2 != c) /\* apparently, there was something, */ +/* * so we can remove the <... part*\/ */ +/* *c = '\0'; */ +/* } */ - /* replace " with space */ - for (c2 = contact; *c2; ++c2) - if (*c2 == '"' || *c2 == '<' || *c2 == '>') - *c2 = ' '; +/* /\* replace "'<> with space *\/ */ +/* for (c2 = contact; *c2; ++c2) */ +/* if (*c2 == '"' || *c2 == '\'' || *c2 == '<' || *c2 == '>') */ +/* *c2 = ' '; */ - /* FIXME: this breaks cc10 */ +/* /\* FIXME: this breaks cc10 *\/ */ - /* remove everything between '()' if it's after the 5th pos*/ - /* c = g_strstr_len (contact, -1, "("); */ - /* if (c && c - contact > 5) */ - /* *c = '\0'; */ +/* /\* remove everything between '()' if it's after the 5th pos*\/ */ +/* /\* c = g_strstr_len (contact, -1, "("); *\/ */ +/* /\* if (c && c - contact > 5) *\/ */ +/* /\* *c = '\0'; *\/ */ - g_strstrip (contact); +/* g_strstrip (contact); */ - return contact; -} +/* return contact; */ +/* } */ -char* -mu_str_display_contact (const char *str) -{ - g_return_val_if_fail (str, NULL); +/* char* */ +/* mu_str_display_contact (const char *str) */ +/* { */ +/* g_return_val_if_fail (str, NULL); */ - return g_strdup (mu_str_display_contact_s (str)); -} +/* return g_strdup (mu_str_display_contact_s (str)); */ +/* } */ -struct _CheckPrefix { - const char *pfx; - guint len; - gboolean match; -}; -typedef struct _CheckPrefix CheckPrefix; +/* struct _CheckPrefix { */ +/* const char *pfx; */ +/* guint len; */ +/* gboolean match; */ +/* }; */ +/* typedef struct _CheckPrefix CheckPrefix; */ -static void -each_check_prefix (MuMsgFieldId mfid, CheckPrefix *cpfx) -{ - const char *field_name; - char field_shortcut; +/* static void */ +/* each_check_prefix (MuMsgFieldId mfid, CheckPrefix *cpfx) */ +/* { */ +/* const char *field_name; */ +/* char field_shortcut; */ - if (!cpfx || cpfx->match) - return; +/* if (!cpfx || cpfx->match) */ +/* return; */ - field_shortcut = mu_msg_field_shortcut (mfid); - if (field_shortcut == cpfx->pfx[0] && cpfx->pfx[1] == ':') { - cpfx->match = TRUE; - return; - } +/* field_shortcut = mu_msg_field_shortcut (mfid); */ +/* if (field_shortcut == cpfx->pfx[0] && cpfx->pfx[1] == ':') { */ +/* cpfx->match = TRUE; */ +/* return; */ +/* } */ - field_name = mu_msg_field_name (mfid); - if (field_name && - strncmp (cpfx->pfx, field_name, cpfx->len) == 0) { - cpfx->match = TRUE; - return; - } -} +/* field_name = mu_msg_field_name (mfid); */ +/* if (field_name && */ +/* strncmp (cpfx->pfx, field_name, cpfx->len) == 0) { */ +/* cpfx->match = TRUE; */ +/* return; */ +/* } */ +/* } */ -/* colon is a position inside q pointing at a ':' character. function - * determines whether the prefix is a registered prefix (like - * 'subject' or 'from' or 's') */ -static gboolean -is_xapian_prefix (const char *q, const char *colon) -{ - const char *cur; +/* /\* colon is a position inside q pointing at a ':' character. function */ +/* * determines whether the prefix is a registered prefix (like */ +/* * 'subject' or 'from' or 's') *\/ */ +/* static gboolean */ +/* is_xapian_prefix (const char *q, const char *colon) */ +/* { */ +/* const char *cur; */ - if (colon == q) - return FALSE; /* : at beginning, not a prefix */ +/* if (colon == q) */ +/* return FALSE; /\* : at beginning, not a prefix *\/ */ - /* track back from colon until a boundary or beginning of the - * str */ - for (cur = colon - 1; cur >= q; --cur) { +/* /\* track back from colon until a boundary or beginning of the */ +/* * str *\/ */ +/* for (cur = colon - 1; cur >= q; --cur) { */ - if (cur == q || !isalpha (*(cur-1))) { +/* if (cur == q || !isalpha (*(cur-1))) { */ - CheckPrefix cpfx; - memset (&cpfx, 0, sizeof(CheckPrefix)); +/* CheckPrefix cpfx; */ +/* memset (&cpfx, 0, sizeof(CheckPrefix)); */ - cpfx.pfx = cur; - cpfx.len = (colon - cur); - cpfx.match = FALSE; +/* cpfx.pfx = cur; */ +/* cpfx.len = (colon - cur); */ +/* cpfx.match = FALSE; */ - mu_msg_field_foreach ((MuMsgFieldForEachFunc) - each_check_prefix, - &cpfx); +/* mu_msg_field_foreach ((MuMsgFieldForEachFunc) */ +/* each_check_prefix, */ +/* &cpfx); */ - return (cpfx.match); - } - } +/* return (cpfx.match); */ +/* } */ +/* } */ - return FALSE; -} +/* return FALSE; */ +/* } */ -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; +/* 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; */ - 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 -mu_str_size_parse_kmg (const char* str) -{ - guint64 num; - char *end; +/* guint64 */ +/* mu_str_size_parse_kmg (const char* str) */ +/* { */ +/* guint64 num; */ +/* char *end; */ - g_return_val_if_fail (str, G_MAXUINT64); +/* g_return_val_if_fail (str, G_MAXUINT64); */ - num = strtol (str, &end, 10); - if (num <= 0) - return G_MAXUINT64; +/* num = strtol (str, &end, 10); */ +/* if (num <= 0) */ +/* return G_MAXUINT64; */ - if (!end || end[1] != '\0') - return G_MAXUINT64; +/* if (!end || end[1] != '\0') */ +/* return G_MAXUINT64; */ - switch (tolower(end[0])) { - case 'k': return num * 1000; /* kilobyte */ - case 'm': return num * 1000 * 1000; /* megabyte */ - /* case 'g': return num * 1000 * 1000 * 1000; /\* gigabyte *\/ */ - default: +/* switch (tolower(end[0])) { */ +/* case 'k': return num * 1000; /\* kilobyte *\/ */ +/* case 'm': return num * 1000 * 1000; /\* megabyte *\/ */ +/* /\* case 'g': return num * 1000 * 1000 * 1000; /\\* gigabyte *\\/ *\/ */ +/* default: */ return G_MAXUINT64; }