gint mkstemp_name(const gchar *template, gchar **name_used)
{
static gulong count=0; /* W32-_mktemp only supports up to 27
- tempfiles... */
+ tempfiles... */
int tmpfd;
*name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
- (S_IRUSR | S_IWUSR));
+ (S_IRUSR | S_IWUSR));
tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
if (tmpfd<0) {
if (first == NULL) {
if (second == NULL)
return NULL;
- else
+ else
return second;
} else if (second == NULL)
return first;
}
return ret;
}
-
+
static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
{
g_free(key);
return itos_buf(nstr, n);
}
+#define divide(num,divisor,i,d) \
+{ \
+ register int tmp; \
+ i = num/divisor; \
+ tmp = i*divisor; \
+ d = num-tmp; \
+ if (d > 1000) d /= 1000; \
+ else if (d > 100) d /= 100; \
+ else if (d > 10) d /= 10; \
+}
+
gchar *to_human_readable(off_t size)
{
- static gchar str[10];
-
- if (size < 1024)
- g_snprintf(str, sizeof(str), _("%dB"), (gint)size);
- else if (size >> 10 < 1024)
- g_snprintf(str, sizeof(str), _("%.1fKB"), (gfloat)size / (1 << 10));
- else if (size >> 20 < 1024)
- g_snprintf(str, sizeof(str), _("%.2fMB"), (gfloat)size / (1 << 20));
- else
- g_snprintf(str, sizeof(str), _("%.2fGB"), (gfloat)size / (1 << 30));
-
- return str;
+ static gchar str[14];
+ static gchar *b_format = NULL, *kb_format = NULL,
+ *mb_format = NULL, *gb_format = NULL;
+ register int t = 0, r = 0;
+ if (b_format == NULL) {
+ b_format = _("%dB");
+ kb_format = _("%d.%dKB");
+ mb_format = _("%.2fMB");
+ gb_format = _("%.2fGB");
+ }
+
+ if (size < 1024) {
+ g_snprintf(str, sizeof(str), b_format, (gint)size);
+ return str;
+ } else if (size >> 10 < 1024) {
+ divide(size, (1 << 10), t, r);
+ g_snprintf(str, sizeof(str), kb_format, t, r);
+ return str;
+ } else if (size >> 20 < 1024) {
+ g_snprintf(str, sizeof(str), mb_format, (gfloat)size / (1 << 20));
+ return str;
+ } else {
+ g_snprintf(str, sizeof(str), gb_format, (gfloat)size / (1 << 30));
+ return str;
+ }
}
/* strcmp with NULL-checking */
gint path_cmp(const gchar *s1, const gchar *s2)
{
gint len1, len2;
- int rc;
+ int rc;
#ifdef G_OS_WIN32
- gchar *s1buf, *s2buf;
+ gchar *s1buf, *s2buf;
#endif
if (s1 == NULL || s2 == NULL) return -1;
if (*s1 == '\0' || *s2 == '\0') return -1;
#ifdef G_OS_WIN32
- s1buf = g_strdup (s1);
- s2buf = g_strdup (s2);
- subst_char (s1buf, '/', G_DIR_SEPARATOR);
- subst_char (s2buf, '/', G_DIR_SEPARATOR);
- s1 = s1buf;
- s2 = s2buf;
+ s1buf = g_strdup (s1);
+ s2buf = g_strdup (s2);
+ subst_char (s1buf, '/', G_DIR_SEPARATOR);
+ subst_char (s2buf, '/', G_DIR_SEPARATOR);
+ s1 = s1buf;
+ s2 = s2buf;
#endif /* !G_OS_WIN32 */
len1 = strlen(s1);
rc = strncmp(s1, s2, MAX(len1, len2));
#ifdef G_OS_WIN32
- g_free (s1buf);
- g_free (s2buf);
+ g_free (s1buf);
+ g_free (s2buf);
#endif /* !G_OS_WIN32 */
- return rc;
+ return rc;
}
/* remove trailing return code */
return str;
}
-void file_strip_crs(const gchar *file)
+void file_strip_crs(const gchar *file)
{
FILE *fp = NULL, *outfp = NULL;
gchar buf[4096];
gchar *out = get_tmp_file();
if (file == NULL)
goto freeout;
-
+
fp = fopen(file, "rb");
if (!fp)
goto freeout;
strcrchomp(buf);
fputs(buf, outfp);
}
-
+
fclose(fp);
fclose(outfp);
rename_force(out, file);
g_strstrip(str);
srcp = str + subject_get_prefix_length(str);
- if (srcp != str)
+ if (srcp != str)
memmove(str, srcp, strlen(srcp) + 1);
}
register gchar *srcp;
gchar op, cl;
gint in_brace;
-
+
g_strstrip(str);
srcp = str + subject_get_prefix_length(str);
quote_level++;
else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) {
/* any characters are allowed except '-' and space */
- while (*p != '-'
- && !strchr(quote_chars, *p)
- && !g_ascii_isspace(*p)
+ while (*p != '-'
+ && !strchr(quote_chars, *p)
+ && !g_ascii_isspace(*p)
&& p < last_pos)
p++;
if (strchr(quote_chars, *p))
return 0;
}
-const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
+const gchar * line_has_quote_char(const gchar * str, const gchar *quote_chars)
{
gchar * position = NULL;
gchar * tmp_pos = NULL;
if (quote_chars == NULL)
return FALSE;
-
+
for (i = 0; i < strlen(quote_chars); i++) {
tmp_pos = strchr (str, quote_chars[i]);
- if(position == NULL
+ if(position == NULL
|| (tmp_pos != NULL && position >= tmp_pos) )
position = tmp_pos;
}
- return position;
+ return position;
}
-const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
+const gchar * line_has_quote_char_last(const gchar * str, const gchar *quote_chars)
{
gchar * position = NULL;
gchar * tmp_pos = NULL;
if (quote_chars == NULL)
return FALSE;
-
+
for (i = 0; i < strlen(quote_chars); i++) {
tmp_pos = strrchr (str, quote_chars[i]);
- if(position == NULL
+ if(position == NULL
|| (tmp_pos != NULL && position <= tmp_pos) )
position = tmp_pos;
}
- return position;
+ return position;
}
gchar *strstr_with_skip_quote(const gchar *haystack, const gchar *needle)
strncpy(escaped_utf8uri, p, q - p + 1);
escaped_utf8uri[q - p + 1] = '\0';
decode_uri(file, escaped_utf8uri);
- /*
+ /*
* g_filename_from_uri() rejects escaped/locale encoded uri
* string which come from Nautilus.
*/
return result;
}
-/* Converts two-digit hexadecimal to decimal. Used for unescaping escaped
+/* Converts two-digit hexadecimal to decimal. Used for unescaping escaped
* characters
*/
static gint axtoi(const gchar *hexstr)
{
gint hi, lo, result;
-
+
hi = hexstr[0];
if ('0' <= hi && hi <= '9') {
hi -= '0';
gboolean is_uri_string(const gchar *str)
{
+ while (str && *str && g_ascii_isspace(*str))
+ str++;
return (g_ascii_strncasecmp(str, "http://", 7) == 0 ||
g_ascii_strncasecmp(str, "https://", 8) == 0 ||
g_ascii_strncasecmp(str, "ftp://", 6) == 0 ||
gchar *get_uri_path(const gchar *uri)
{
+ while (uri && *uri && g_ascii_isspace(*uri))
+ uri++;
if (g_ascii_strncasecmp(uri, "http://", 7) == 0)
return (gchar *)(uri + 7);
else if (g_ascii_strncasecmp(uri, "https://", 8) == 0)
return 0;
}
-\f
+
#ifdef G_OS_WIN32
-#include <windows.h>
+#include <windows.h>
#ifndef CSIDL_APPDATA
#define CSIDL_APPDATA 0x001a
#endif
if (w32_errno == 0)
w32_errno = ec;
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, w32_errno,
- MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
- strerr, DIM (strerr)-1, NULL);
+ MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+ strerr, DIM (strerr)-1, NULL);
return strerr;
}
{
void * fnc = GetProcAddress (hd, sym);
if (!fnc)
- return NULL;
+ return NULL;
return fnc;
}
return NULL;
return 0;
}
return -1;
-}
+}
static HRESULT
w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e)
initialized = 1;
for (i=0, handle = NULL; !handle && dllnames[i]; i++)
- {
- handle = dlopen (dllnames[i], RTLD_LAZY);
- if (handle)
- {
- func = dlsym (handle, "SHGetFolderPathA");
- if (!func)
- {
- dlclose (handle);
- handle = NULL;
- }
- }
- }
+ {
+ handle = dlopen (dllnames[i], RTLD_LAZY);
+ if (handle)
+ {
+ func = dlsym (handle, "SHGetFolderPathA");
+ if (!func)
+ {
+ dlclose (handle);
+ handle = NULL;
+ }
+ }
+ }
}
if (func)
else
return -1;
}
+
+/* Returns a static string with the directroy from which the module
+ has been loaded. Returns an empty string on error. */
+static char *w32_get_module_dir(void)
+{
+ static char *moddir;
+
+ if (!moddir) {
+ char name[MAX_PATH+10];
+ char *p;
+
+ if ( !GetModuleFileNameA (0, name, sizeof (name)-10) )
+ *name = 0;
+ else {
+ p = strrchr (name, '\\');
+ if (p)
+ *p = 0;
+ else
+ *name = 0;
+ }
+ moddir = g_strdup (name);
+ }
+ return moddir;
+}
+#endif /* G_OS_WIN32 */
+
+/* Return a static string with the locale dir. */
+const gchar *get_locale_dir(void)
+{
+ static gchar *loc_dir;
+
+#ifdef G_OS_WIN32
+ if (!loc_dir)
+ loc_dir = g_strconcat(w32_get_module_dir(), G_DIR_SEPARATOR_S,
+ "\\share\\locale", NULL);
#endif
+ if (!loc_dir)
+ loc_dir = LOCALEDIR;
+
+ return loc_dir;
+}
+
const gchar *get_home_dir(void)
{
#ifdef G_OS_WIN32
static char home_dir[MAX_PATH] = "";
- if (home_dir[0] == '\0')
- {
- if (w32_shgetfolderpath
+ if (home_dir[0] == '\0') {
+ if (w32_shgetfolderpath
(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE,
NULL, 0, home_dir) < 0)
strcpy (home_dir, "C:\\Sylpheed");
}
return home_dir;
#else
- return g_get_home_dir();
+ static const gchar *homeenv = NULL;
+
+ if (homeenv)
+ return homeenv;
+
+ if (!homeenv && g_getenv("HOME") != NULL)
+ homeenv = g_strdup(g_getenv("HOME"));
+ if (!homeenv)
+ homeenv = g_get_home_dir();
+
+ return homeenv;
#endif
}
/* Return the default directory for Plugins. */
const gchar *get_plugin_dir(void)
{
-#ifdef G_OS_WIN32
+#ifdef G_OS_WIN32
static gchar *plugin_dir = NULL;
if (!plugin_dir)
- plugin_dir = g_strconcat(sylpheed_get_startup_dir(),
- "\\lib\\sylpheed-claws\\plugins\\",
- NULL);
+ plugin_dir = g_strconcat(w32_get_module_dir(),
+ "\\lib\\sylpheed-claws\\plugins\\",
+ NULL);
return plugin_dir;
#else
- return PLUGINDIR;
+ if (is_dir_exist(PLUGINDIR))
+ return PLUGINDIR;
+ else {
+ static gchar *plugin_dir = NULL;
+ if (!plugin_dir)
+ plugin_dir = g_strconcat(get_rc_dir(),
+ G_DIR_SEPARATOR_S, "plugins",
+ G_DIR_SEPARATOR_S, NULL);
+ return plugin_dir;
+ }
#endif
}
/* Test on whether FILE is a relative file name. This is
* straightforward for Unix but more complex for Windows. */
-gboolean is_relative_filename(const gchar *file)
+gboolean is_relative_filename(const gchar *file)
{
- if (!file)
- return TRUE;
+ if (!file)
+ return TRUE;
#ifdef G_OS_WIN32
- if ( *file == '\\' && file[1] == '\\' && strchr (file+2, '\\') )
- return FALSE; /* Prefixed with a hostname - this can't
- * be a relative name. */
+ if ( *file == '\\' && file[1] == '\\' && strchr (file+2, '\\') )
+ return FALSE; /* Prefixed with a hostname - this can't
+ * be a relative name. */
- if ( ((*file >= 'a' && *file <= 'z')
- || (*file >= 'A' && *file <= 'Z'))
- && file[1] == ':')
- file += 2; /* Skip drive letter. */
+ if ( ((*file >= 'a' && *file <= 'z')
+ || (*file >= 'A' && *file <= 'Z'))
+ && file[1] == ':')
+ file += 2; /* Skip drive letter. */
- return !(*file == '\\' || *file == '/');
+ return !(*file == '\\' || *file == '/');
#else
- return !(*file == G_DIR_SEPARATOR);
-#endif
+ return !(*file == G_DIR_SEPARATOR);
+#endif
}
FILE_OP_ERROR(src, "fopen");
return -1;
}
-
+
if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
FILE_OP_ERROR(dest, "fopen");
fclose(src_fp);
* uniqueness if everything is either quoted-printable or base64
* encoded (note that conversion is allowed), but because MIME bodies
* may be nested, it may happen that the same boundary has already
- * been used.
+ * been used.
*
* boundary := 0*69<bchars> bcharsnospace
* bchars := bcharsnospace / " "
* bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
- * "+" / "_" / "," / "-" / "." /
- * "/" / ":" / "=" / "?"
+ * "+" / "_" / "," / "-" / "." /
+ * "/" / ":" / "=" / "?"
*
* some special characters removed because of buggy MTAs
*/
gchar *fname;
gint fd;
FILE *fp;
+ gchar buf[2]="\0";
tmpdir = get_tmp_dir();
tmplen = strlen(tmpdir);
#ifndef G_OS_WIN32
g_unlink(fname);
+
+ /* verify that we can write in the file after unlinking */
+ if (write(fd, buf, 1) < 0) {
+ close(fd);
+ return tmpfile();
+ }
+
#endif
fp = fdopen(fd, "w+b");
if (!fp)
close(fd);
- else
+ else {
+ rewind(fp);
return fp;
+ }
+
#endif /* HAVE_MKSTEMP || G_OS_WIN32 */
return tmpfile();
int fd;
#ifdef G_OS_WIN32
char *template = g_strdup_printf ("%s%csylpheed.XXXXXX",
- dir, G_DIR_SEPARATOR);
+ dir, G_DIR_SEPARATOR);
fd = mkstemp_name(template, filename);
g_free(template);
#else
}
else {
char * hexa = "0123456789ABCDEF";
-
+
if (k + 4 >= bufsize)
break;
encoded_uri[k++] = '%';
gchar buf[BUFFSIZE];
gchar *p;
gchar encoded_uri[BUFFSIZE];
-
+
g_return_val_if_fail(uri != NULL, -1);
/* an option to choose whether to use encode_uri or not ? */
encode_uri(encoded_uri, BUFFSIZE, uri);
-
+
if (cmdline &&
(p = strchr(cmdline, '%')) && *(p + 1) == 's' &&
!strchr(p + 2, '%'))
const char * debug_srcname(const char *file)
{
- const char *s = strrchr (file, '/');
- return s? s+1:file;
+ const char *s = strrchr (file, '/');
+ return s? s+1:file;
}
if (subject == NULL)
return;
- subject += subject_get_prefix_length(subject);
+ subject += subject_get_prefix_length(subject);
g_hash_table_remove(subject_table, subject);
}
/*!
- *\brief Check if a string is prefixed with known (combinations)
- * of prefixes. The function assumes that each prefix
+ *\brief Check if a string is prefixed with known (combinations)
+ * of prefixes. The function assumes that each prefix
* is terminated by zero or exactly _one_ space.
*
*\param str String to check for a prefixes
*
- *\return int Number of chars in the prefix that should be skipped
+ *\return int Number of chars in the prefix that should be skipped
* for a "clean" subject line. If no prefix was found, 0
* is returned.
- */
+ */
int subject_get_prefix_length(const gchar *subject)
{
/*!< Array with allowable reply prefixes regexps. */
static const gchar * const prefixes[] = {
"Re\\:", /* "Re:" */
+ "RE\\:", /* "RE:" (outlook) */
"Re\\[[1-9][0-9]*\\]\\:", /* "Re[XXX]:" (non-conforming news mail clients) */
"Antw\\:", /* "Antw:" (Dutch / German Outlook) */
"Aw\\:", /* "Aw:" (German) */
"Fw\\:", /* "Fw:" Forward */
"Enc\\:", /* "Enc:" Forward (Brazilian Outlook) */
"Odp\\:", /* "Odp:" Re (Polish Outlook) */
- "Rif\\:" /* "Rif:" (Italian Outlook) */
+ "Rif\\:", /* "Rif:" (Italian Outlook) */
+ "SV\\:", /* "SV" (Norwegian) */
+ "Sv\\:", /* "Sv" (Norwegian) */
+ "VS\\:", /* "VS" (Norwegian) */
+ "Vs\\:", /* "Vs" (Norwegian) */
+ "AD\\:", /* "AD" (Norwegian) */
+ "Ad\\:" /* "Ad" (Norwegian) */
/* add more */
};
const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
if (!init_) {
GString *s = g_string_new("");
-
+
for (n = 0; n < PREFIXES; n++)
/* Terminate each prefix regexpression by a
* "\ ?" (zero or ONE space), and OR them */
g_string_append_printf(s, "(%s\\ ?)%s",
prefixes[n],
- n < PREFIXES - 1 ?
+ n < PREFIXES - 1 ?
"|" : "");
-
+
g_string_prepend(s, "(");
g_string_append(s, ")+"); /* match at least once */
g_string_prepend(s, "^\\ *"); /* from beginning of line */
-
- /* We now have something like "^\ *((PREFIX1\ ?)|(PREFIX2\ ?))+"
+
+ /* We now have something like "^\ *((PREFIX1\ ?)|(PREFIX2\ ?))+"
* TODO: Should this be "^\ *(((PREFIX1)|(PREFIX2))\ ?)+" ??? */
- if (regcomp(®ex, s->str, REG_EXTENDED | REG_ICASE)) {
+ if (regcomp(®ex, s->str, REG_EXTENDED | REG_ICASE)) {
debug_print("Error compiling regexp %s\n", s->str);
g_string_free(s, TRUE);
return 0;
g_string_free(s, TRUE);
}
}
-
+
if (!regexec(®ex, subject, 1, &pos, 0) && pos.rm_so != -1)
return pos.rm_eo;
else
const char *str;
for (str = gptr; str && *str; str++) {
- if (isupper((guchar)*str)) hash_result += (*str + ' ');
- else hash_result += *str;
+ hash_result += toupper(*str);
}
return hash_result;
const char *str1 = gptr1;
const char *str2 = gptr2;
- return !g_utf8_collate(str1, str2);
+ return !strcasecmp(str1, str2);
}
gint g_int_compare(gconstpointer a, gconstpointer b)
/*
quote_cmd_argument()
-
+
return a quoted string safely usable in argument of a command.
-
+
code is extracted and adapted from etPan! project -- DINH V. Hoà .
*/
if (isalnum((guchar)*p) || (* p == '/')) {
if (remaining > 0) {
* result_p = * p;
- result_p ++;
+ result_p ++;
remaining --;
}
else {
return -1;
}
}
- else {
+ else {
if (remaining >= 2) {
* result_p = '\\';
- result_p ++;
+ result_p ++;
* result_p = * p;
- result_p ++;
+ result_p ++;
remaining -= 2;
}
else {
result[size - 1] = '\0';
return -1;
}
-
+
return 0;
}
-typedef struct
+typedef struct
{
GNode *parent;
GNodeMapFunc func;
*\brief Register ref counted pointer. It is based on GBoxed, so should
* work with anything that uses the GType system. The semantics
* are similar to a C++ auto pointer, with the exception that
- * C doesn't have automatic closure (calling destructors) when
+ * C doesn't have automatic closure (calling destructors) when
* exiting a block scope.
* Use the \ref G_TYPE_AUTO_POINTER macro instead of calling this
* function directly.
("G_TYPE_AUTO_POINTER",
(GBoxedCopyFunc) g_auto_pointer_copy,
(GBoxedFreeFunc) g_auto_pointer_free);
- return auto_pointer_type;
+ return auto_pointer_type;
}
/*!
/*!
*\brief Creates an auto pointer for a g_new()ed pointer. Example:
*
- *\code
+ *\code
*
* ... tell gtk_list_store it should use a G_TYPE_AUTO_POINTER
* ... when assigning, copying and freeing storage elements
*
- * gtk_list_store_new(N_S_COLUMNS,
+ * gtk_list_store_new(N_S_COLUMNS,
* G_TYPE_AUTO_POINTER,
* -1);
*
* S_DATA, protect,
* -1);
*
- * ... the gtk_list_store has copied the pointer and
+ * ... the gtk_list_store has copied the pointer and
* ... incremented its reference count, we should free
* ... the auto pointer (in C++ a destructor would do
* ... this for us when leaving block scope)
- *
+ *
* g_auto_pointer_free(protect);
*
* ... gtk_list_store_set() now manages the data. When
- * ... *explicitly* requesting a pointer from the list
- * ... store, don't forget you get a copy that should be
+ * ... *explicitly* requesting a pointer from the list
+ * ... store, don't forget you get a copy that should be
* ... freed with g_auto_pointer_free() eventually.
*
*\endcode
{
AutoPointerRef *ref;
AutoPointer *ptr;
-
- if (p == NULL)
+
+ if (p == NULL)
return NULL;
ref = g_new0(AutoPointerRef, 1);
GAuto *g_auto_pointer_new_with_free(gpointer p, GFreeFunc free_)
{
AutoPointer *aptr;
-
+
if (p == NULL)
return NULL;
aptr = g_auto_pointer_new(p);
aptr->ref->free = free_;
- return aptr;
+ return aptr;
}
gpointer g_auto_pointer_get_ptr(GAuto *auto_ptr)
{
- if (auto_ptr == NULL)
+ if (auto_ptr == NULL)
return NULL;
- return ((AutoPointer *) auto_ptr)->ptr;
+ return ((AutoPointer *) auto_ptr)->ptr;
}
/*!
* to call this function directly, unless you copy/assign
* the guarded pointer.
*
- *\param auto_ptr Auto pointer returned by previous call to
+ *\param auto_ptr Auto pointer returned by previous call to
* g_auto_pointer_new_XXX()
*
*\return gpointer An auto pointer
AutoPointerRef *ref;
AutoPointer *newp;
- if (auto_ptr == NULL)
+ if (auto_ptr == NULL)
return NULL;
ptr = auto_ptr;
newp->ref = ref;
newp->ptr = ref->pointer;
++(ref->cnt);
-
+
#ifdef REF_DEBUG
G_PRINT_REF ("XXXX COPY(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
#endif
{
AutoPointer *ptr;
AutoPointerRef *ref;
-
+
if (auto_ptr == NULL)
return;
#endif
ref->free(ref->pointer);
g_free(ref);
- }
+ }
#ifdef REF_DEBUG
else
G_PRINT_REF ("XXXX DEREF(%lx) -- REF (%d)\n", ref->pointer, ref->cnt);
#endif
- g_free(ptr);
+ g_free(ptr);
}
void replace_returns(gchar *str)
const gchar **bp, const gchar **ep, gboolean hdr)
{
const gchar *ep_;
+ gint parenthese_cnt = 0;
g_return_val_if_fail(start != NULL, FALSE);
g_return_val_if_fail(scanpos != NULL, FALSE);
for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
if (!g_ascii_isgraph(*(const guchar *)ep_) ||
!IS_ASCII(*(const guchar *)ep_) ||
- strchr("[]{}<>\"", *ep_))
+ strchr("[]{}<>\"", *ep_)) {
break;
+ } else if (strchr("(", *ep_)) {
+ parenthese_cnt++;
+ } else if (strchr(")", *ep_)) {
+ if (parenthese_cnt > 0)
+ parenthese_cnt--;
+ else
+ break;
+ }
}
/* no punctuation at end of string */
* should pass some URI type to this function and decide on that whether
* to perform punctuation stripping */
-#define IS_REAL_PUNCT(ch) (g_ascii_ispunct(ch) && !strchr("/?=)", ch))
+#define IS_REAL_PUNCT(ch) (g_ascii_ispunct(ch) && !strchr("/?=-)", ch))
for (; ep_ - 1 > scanpos + 1 &&
IS_REAL_PUNCT(*(ep_ - 1));
*ep = ep_;
- return TRUE;
+ return TRUE;
}
gchar *make_uri_string(const gchar *bp, const gchar *ep)
{
+ while (bp && *bp && g_ascii_isspace(*bp))
+ bp++;
return g_strndup(bp, ep - bp);
}
"tc", "td", "tf", "tg", "th", "tj", "tk", "tm", "tn", "to",
"tp", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "um",
"us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu",
- "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw"
+ "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw"
};
gint n;
GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
-
+
g_return_val_if_fail(htab, NULL);
- for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
+ for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++)
g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
return htab;
}
gchar buf[MAX_LVL_DOM_NAME_LEN + 1];
const gchar *m = buf + MAX_LVL_DOM_NAME_LEN + 1;
register gchar *p;
-
+
if (last - first > MAX_LVL_DOM_NAME_LEN || first > last)
return FALSE;
const gchar *last_dot = NULL;
const gchar *prelast_dot = NULL;
const gchar *last_tld_char = NULL;
-
+
/* the informative part of the email address (describing the name
* of the email address owner) may contain quoted parts. the
* closure stack stores the last encountered quotes. */
g_return_val_if_fail(ep != NULL, FALSE);
if (hdr) {
+ const gchar *start_quote = NULL;
+ const gchar *end_quote = NULL;
search_again:
/* go to the real start */
if (start[0] == ',')
start++;
if (start[0] == ';')
start++;
+ while (start[0] == '\n' || start[0] == '\r')
+ start++;
while (start[0] == ' ' || start[0] == '\t')
start++;
*bp = start;
+ /* check if there are quotes (to skip , in them) */
+ if (*start == '"') {
+ start_quote = start;
+ start++;
+ end_quote = strstr(start, "\"");
+ } else {
+ start_quote = NULL;
+ end_quote = NULL;
+ }
+
+ /* skip anything between quotes */
+ if (start_quote && end_quote) {
+ start = end_quote;
+
+ }
+
/* find end (either , or ; or end of line) */
if (strstr(start, ",") && strstr(start, ";"))
*ep = strstr(start,",") < strstr(start, ";")
*ep = strstr(start, ";");
else
*ep = start+strlen(start);
-
- /* check there's still an @ in that, or search
+
+ /* go back to real start */
+ if (start_quote && end_quote) {
+ start = start_quote;
+ }
+
+ /* check there's still an @ in that, or search
* further if possible */
if (strstr(start, "@") && strstr(start, "@") < *ep)
return TRUE;
else if (*ep < start+strlen(start)) {
start = *ep;
goto search_again;
+ } else if (start_quote && strstr(start, "\"") && strstr(start, "\"") < *ep) {
+ *bp = start_quote;
+ return TRUE;
} else
return FALSE;
}
if (!dom_tab)
dom_tab = create_domain_tab();
- g_return_val_if_fail(dom_tab, FALSE);
+ g_return_val_if_fail(dom_tab, FALSE);
/* scan start of address */
for (bp_ = scanpos - 1;
last_dot = ep_;
if (*(last_dot + 1) == '.') {
if (prelast_dot == NULL)
- return FALSE;
+ return FALSE;
last_dot = prelast_dot;
break;
}
if (!result) return FALSE;
- if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"'
+ if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"'
&& *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
&& IS_RFC822_CHAR(*(ep_ + 3))) {
- /* this informative part with an @ in it is
+ /* this informative part with an @ in it is
* followed by the email address */
ep_ += 3;
-
+
/* go to matching '>' (or next non-rfc822 char, like \n) */
for (; *ep_ != '>' && *ep != '\0' && IS_RFC822_CHAR(*ep_); ep_++)
;
-
+
/* include the bracket */
if (*ep_ == '>') ep_++;
-
- /* include the leading quote */
+
+ /* include the leading quote */
bp_--;
*ep = ep_;
}
/* if nothing in the closure stack, do the special conditions
- * the following if..else expression simply checks whether
+ * the following if..else expression simply checks whether
* a token is acceptable. if not acceptable, the clause
* should terminate the loop with a 'break' */
if (!PEEK_STACK()) {
*bp = bp_;
*ep = ep_;
-
+
return result;
}
gchar *tmp;
gchar *result;
+ while (bp && *bp && g_ascii_isspace(*bp))
+ bp++;
tmp = g_strndup(bp, ep - bp);
result = g_strconcat("http://", tmp, NULL);
g_free(tmp);
return result;
}
-static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type)
+static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
{
FILE *fp = fopen(path, "rb");
gchar buf[BUFFSIZE];
if (!fp)
return NULL;
while (fgets(buf, sizeof (buf), fp) != NULL) {
- gchar **parts = g_strsplit(buf, ";", -1);
+ gchar **parts = g_strsplit(buf, ";", 3);
gchar *trimmed = parts[0];
while (trimmed[0] == ' ')
trimmed++;
- while (trimmed[strlen(trimmed)-1] == ' ')
+ while (trimmed[strlen(trimmed)-1] == ' ')
trimmed[strlen(trimmed)-1] = '\0';
-
+
if (!strcmp(trimmed, type)) {
+ gboolean needsterminal = FALSE;
+ if (parts[2] && strstr(parts[2], "needsterminal")) {
+ needsterminal = TRUE;
+ }
+ if (parts[2] && strstr(parts[2], "test=")) {
+ gchar *orig_testcmd = g_strdup(strstr(parts[2], "test=")+5);
+ gchar *testcmd = orig_testcmd;
+ if (strstr(testcmd,";"))
+ *(strstr(testcmd,";")) = '\0';
+ while (testcmd[0] == ' ')
+ testcmd++;
+ while (testcmd[strlen(testcmd)-1] == '\n')
+ testcmd[strlen(testcmd)-1] = '\0';
+ while (testcmd[strlen(testcmd)-1] == '\r')
+ testcmd[strlen(testcmd)-1] = '\0';
+ while (testcmd[strlen(testcmd)-1] == ' ')
+ testcmd[strlen(testcmd)-1] = '\0';
+
+ if (strstr(testcmd, "%s")) {
+ gchar *tmp = g_strdup_printf(testcmd, file_to_open);
+ gint res = system(tmp);
+ g_free(tmp);
+ g_free(orig_testcmd);
+
+ if (res != 0) {
+ g_strfreev(parts);
+ continue;
+ }
+ } else {
+ gint res = system(testcmd);
+ g_free(orig_testcmd);
+
+ if (res != 0) {
+ g_strfreev(parts);
+ continue;
+ }
+ }
+ }
+
trimmed = parts[1];
while (trimmed[0] == ' ')
trimmed++;
- while (trimmed[strlen(trimmed)-1] == ' ')
+ while (trimmed[strlen(trimmed)-1] == '\n')
trimmed[strlen(trimmed)-1] = '\0';
- while (trimmed[strlen(trimmed)-1] == '\n')
+ while (trimmed[strlen(trimmed)-1] == '\r')
trimmed[strlen(trimmed)-1] = '\0';
- while (trimmed[strlen(trimmed)-1] == '\r')
+ while (trimmed[strlen(trimmed)-1] == ' ')
trimmed[strlen(trimmed)-1] = '\0';
result = g_strdup(trimmed);
g_strfreev(parts);
fclose(fp);
- if (strstr(result, "%s") && !strstr(result, "'%s'")) {
+ /* if there are no single quotes around %s, add them.
+ * '.*%s.*' is ok, as in display 'png:%s'
+ */
+ if (strstr(result, "%s")
+ && !(strstr(result, "'") < strstr(result,"%s") &&
+ strstr(strstr(result,"%s"), "'"))) {
gchar *start = g_strdup(result);
gchar *end = g_strdup(strstr(result, "%s")+2);
gchar *tmp;
g_free(result);
result = tmp;
}
+ if (needsterminal) {
+ gchar *tmp = g_strdup_printf("xterm -e %s", result);
+ g_free(result);
+ result = tmp;
+ }
return result;
}
g_strfreev(parts);
fclose(fp);
return NULL;
}
-gchar *mailcap_get_command_for_type(const gchar *type)
+gchar *mailcap_get_command_for_type(const gchar *type, const gchar *file_to_open)
{
gchar *result = NULL;
gchar *path = NULL;
+ if (type == NULL)
+ return NULL;
path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
- result = mailcap_get_command_in_file(path, type);
+ result = mailcap_get_command_in_file(path, type, file_to_open);
g_free(path);
if (result)
return result;
- result = mailcap_get_command_in_file("/etc/mailcap", type);
+ result = mailcap_get_command_in_file("/etc/mailcap", type, file_to_open);
return result;
}
+void mailcap_update_default(const gchar *type, const gchar *command)
+{
+ gchar *path = NULL, *outpath = NULL;
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
+ outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
+ FILE *fp = fopen(path, "rb");
+ FILE *outfp = fopen(outpath, "wb");
+ gchar buf[BUFFSIZE];
+
+ if (!fp) {
+ g_free(path);
+ g_free(outpath);
+ return;
+ }
+ if (!outfp) {
+ g_free(path);
+ g_free(outpath);
+ fclose(fp);
+ return;
+ }
+ while (fgets(buf, sizeof (buf), fp) != NULL) {
+ gchar **parts = g_strsplit(buf, ";", 3);
+ gchar *trimmed = parts[0];
+ while (trimmed[0] == ' ')
+ trimmed++;
+ while (trimmed[strlen(trimmed)-1] == ' ')
+ trimmed[strlen(trimmed)-1] = '\0';
+
+ if (!strcmp(trimmed, type)) {
+ g_strfreev(parts);
+ continue;
+ }
+ else {
+ fputs(buf, outfp);
+ }
+ g_strfreev(parts);
+ }
+ fprintf(outfp, "%s; %s\n", type, command);
+ fclose(fp);
+ fclose(outfp);
+ g_rename(outpath, path);
+}
+
gint copy_dir(const gchar *src, const gchar *dst)
{
GDir *dir;
const gchar *name;
-
+
if ((dir = g_dir_open(src, 0, NULL)) == NULL) {
g_warning("failed to open directory: %s\n", src);
return -1;
if (make_dir(dst) < 0)
return -1;
-
+
while ((name = g_dir_read_name(dir)) != NULL) {
gchar *old_file, *new_file;
old_file = g_strconcat(src, G_DIR_SEPARATOR_S, name, NULL);
projects / claws.git / blobdiff