/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 Hiroyuki Yamamoto & The Claws Mail Team
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
+ * The code of the g_utf8_substring function below is owned by
+ * Matthias Clasen <matthiasc@src.gnome.org>/<mclasen@redhat.com>
+ * and is got from GLIB 2.30: https://git.gnome.org/browse/glib/commit/
+ * ?h=glib-2-30&id=9eb65dd3ed5e1a9638595cbe10699c7606376511
+ *
+ * GLib 2.30 is licensed under GPL v2 or later and:
+ * Copyright (C) 1999 Tom Tromey
+ * Copyright (C) 2000 Red Hat, Inc.
+ *
+ * https://git.gnome.org/browse/glib/tree/glib/gutf8.c
+ * ?h=glib-2-30&id=9eb65dd3ed5e1a9638595cbe10699c7606376511
*/
#ifdef HAVE_CONFIG_H
-#if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
+#if !defined(G_OS_UNIX)
gint g_chdir(const gchar *path)
{
#ifdef G_OS_WIN32
return open(filename, flags, mode);
#endif
}
-#endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
+#endif /* G_OS_UNIX */
#ifdef G_OS_WIN32
void extract_address(gchar *str)
{
+ cm_return_if_fail(str != NULL);
eliminate_address_comment(str);
if (strchr_with_skip_quote(str, '"', '<'))
extract_parenthesis_with_skip_quote(str, '"', '<', '>');
if (err) {
g_print("Error looking for %s: %d(%s)\n",
- dir, -err, strerror(-err));
+ dir, -err, g_strerror(-err));
exit(0);
}
rc_dir_alt = TRUE;
if (first == last) {
/* Skip all the dir reading part. */
gchar *filename = g_strdup_printf("%s%s%u", dir, G_DIR_SEPARATOR_S, first);
+ if (is_dir_exist(filename)) {
+ /* a numbered directory with this name exists,
+ * remove the dot-file instead */
+ g_free(filename);
+ filename = g_strdup_printf("%s%s.%u", dir, G_DIR_SEPARATOR_S, first);
+ }
if (claws_unlink(filename) < 0) {
FILE_OP_ERROR(filename, "unlink");
g_free(filename);
while ((dir_name = g_dir_read_name(dp)) != NULL) {
file_no = to_number(dir_name);
if (file_no > 0 && first <= file_no && file_no <= last) {
- if (is_dir_exist(dir_name))
+ if (is_dir_exist(dir_name)) {
+ gchar *dot_file = g_strdup_printf(".%s", dir_name);
+ if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+ FILE_OP_ERROR(dot_file, "unlink");
+ }
+ g_free(dot_file);
continue;
+ }
if (claws_unlink(dir_name) < 0)
FILE_OP_ERROR(dir_name, "unlink");
}
const gchar *dir_name;
gchar *prev_dir;
gint file_no;
- GHashTable *file_no_tbl;
+ GHashTable *wanted_files;
+ GSList *cur;
if (numberlist == NULL)
return 0;
return -1;
}
- file_no_tbl = g_hash_table_new(g_direct_hash, g_direct_equal);
+ wanted_files = g_hash_table_new(g_direct_hash, g_direct_equal);
+ for (cur = numberlist; cur != NULL; cur = cur->next) {
+ /* numberlist->data is expected to be GINT_TO_POINTER */
+ g_hash_table_insert(wanted_files, cur->data, GINT_TO_POINTER(1));
+ }
+
while ((dir_name = g_dir_read_name(dp)) != NULL) {
file_no = to_number(dir_name);
if (is_dir_exist(dir_name))
- continue;
- if (file_no > 0)
- g_hash_table_insert(file_no_tbl, GINT_TO_POINTER(file_no), GINT_TO_POINTER(1));
- }
-
- do {
- if (g_hash_table_lookup(file_no_tbl, numberlist->data) == NULL) {
- debug_print("removing unwanted file %d from %s\n",
- GPOINTER_TO_INT(numberlist->data), dir);
+ continue;
+ if (file_no > 0 && g_hash_table_lookup(wanted_files, GINT_TO_POINTER(file_no)) == NULL) {
+ debug_print("removing unwanted file %d from %s\n", file_no, dir);
+ if (is_dir_exist(dir_name)) {
+ gchar *dot_file = g_strdup_printf(".%s", dir_name);
+ if (is_file_exist(dot_file) && claws_unlink(dot_file) < 0) {
+ FILE_OP_ERROR(dot_file, "unlink");
+ }
+ g_free(dot_file);
+ continue;
+ }
if (claws_unlink(dir_name) < 0)
FILE_OP_ERROR(dir_name, "unlink");
}
- } while ((numberlist = g_slist_next(numberlist)));
+ }
g_dir_close(dp);
- g_hash_table_destroy(file_no_tbl);
+ g_hash_table_destroy(wanted_files);
if (g_chdir(prev_dir) < 0) {
FILE_OP_ERROR(prev_dir, "chdir");
#else
*filename = g_strdup_printf("%s%cclaws.XXXXXX", dir, G_DIR_SEPARATOR);
fd = mkstemp(*filename);
+ if (fd < 0)
+ return NULL;
#endif
return fdopen(fd, "w+");
}
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 = g_fopen(path, "rb");
- FILE *outfp = g_fopen(outpath, "wb");
+ FILE *outfp = NULL;
gchar buf[BUFFSIZE];
gboolean err = FALSE;
+ if (!fp) {
+ fp = g_fopen(path, "a");
+ if (!fp) {
+ g_warning("failed to create file %s\n", path);
+ g_free(path);
+ g_free(outpath);
+ return;
+ }
+ fp = g_freopen(path, "rb", fp);
+ if (!fp) {
+ g_warning("failed to reopen file %s\n", path);
+ g_free(path);
+ g_free(outpath);
+ return;
+ }
+ }
+
+ outfp = g_fopen(outpath, "wb");
if (!outfp) {
+ g_warning("failed to create file %s\n", outpath);
g_free(path);
g_free(outpath);
fclose(fp);
gint s_am_low_len = 0;
gint s_pm_low_len = 0;
-const gchar *def_loc_format = NULL;
-const gchar *date_loc_format = NULL;
-const gchar *time_loc_format = NULL;
-const gchar *time_am_pm = NULL;
-
static gboolean time_names_init_done = FALSE;
static void init_time_names(void)
s_pm_up_len = strlen(s_pm_up);
s_am_low_len = strlen(s_am_low);
s_pm_low_len = strlen(s_pm_low);
-
- def_loc_format = C_("For use by strftime (default date+time format)", "%a %b %e %H:%M:%S %Y");
- date_loc_format = C_("For use by strftime (default date format)", "%m/%d/%y");
- time_loc_format = C_("For use by strftime (default time format)", "%H:%M:%S");
-
- time_am_pm = C_("For use by strftime (default 12-hour time format)", "%I:%M:%S %p");
time_names_init_done = TRUE;
}
strncpy2(curpos, monthnames[lt->tm_mon], buflen - total_done);
break;
case 'c':
- fast_strftime(subbuf, 64, def_loc_format, lt);
+ strftime(subbuf, 64, "%c", lt);
len = strlen(subbuf); CHECK_SIZE();
strncpy2(curpos, subbuf, buflen - total_done);
break;
}
break;
case 'r':
- fast_strftime(subbuf, 64, time_am_pm, lt);
+ strftime(subbuf, 64, "%r", lt);
len = strlen(subbuf); CHECK_SIZE();
strncpy2(curpos, subbuf, buflen - total_done);
break;
snprintf(curpos, buflen - total_done, "%d", lt->tm_wday);
break;
case 'x':
- fast_strftime(subbuf, 64, date_loc_format, lt);
+ strftime(subbuf, 64, "%x", lt);
len = strlen(subbuf); CHECK_SIZE();
strncpy2(curpos, subbuf, buflen - total_done);
break;
case 'X':
- fast_strftime(subbuf, 64, time_loc_format, lt);
+ strftime(subbuf, 64, "%X", lt);
len = strlen(subbuf); CHECK_SIZE();
strncpy2(curpos, subbuf, buflen - total_done);
break;
format++;
break;
default:
- if (format && *format)
- g_warning("format error (%c)", *format);
+ g_warning("format error (%c)", *format);
*curpos = '\0';
return total_done;
}
return 0;
}
-#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
-gboolean auto_configure_service(const gchar *service, const gchar *domain, gchar **srvhost, guint16 *srvport)
+/* Returns a decoded base64 string, guaranteed to be null-terminated. */
+guchar *g_base64_decode_zero(const gchar *text, gsize *out_len)
{
- GResolver *resolver;
- GList *answers, *cur;
- GError *error = NULL;
- gboolean result = FALSE;
+ gchar *tmp = g_base64_decode(text, out_len);
+ gchar *out = g_strndup(tmp, *out_len);
- cm_return_val_if_fail(service != NULL, FALSE);
- cm_return_val_if_fail(domain != NULL, FALSE);
+ g_free(tmp);
- resolver = g_resolver_get_default();
- if (resolver == NULL)
- return FALSE;
-
- answers = g_resolver_lookup_service(resolver, service, "tcp", domain, NULL, &error);
-
- *srvhost = NULL;
- *srvport = 0;
-
- if (answers) {
- for (cur = g_srv_target_list_sort(answers); cur; cur = cur->next) {
- GSrvTarget *target = (GSrvTarget *)cur->data;
- const gchar *hostname = g_srv_target_get_hostname(target);
- guint16 port = g_srv_target_get_port(target);
- if (hostname && strcmp(hostname,"") && port > 0) {
- result = TRUE;
- *srvhost = g_strdup(hostname);
- *srvport = port;
- break;
- }
- }
- g_resolver_free_targets(answers);
- } else if (error) {
- g_error_free(error);
+ if (strlen(out) != *out_len) {
+ g_warning ("strlen(out) %d != *out_len %d", strlen(out), *out_len);
}
- g_object_unref(resolver);
- return result;
+ return out;
}
-#endif
\ No newline at end of file
+
+#if !GLIB_CHECK_VERSION(2, 30, 0)
+/**
+ * g_utf8_substring:
+ * @str: a UTF-8 encoded string
+ * @start_pos: a character offset within @str
+ * @end_pos: another character offset within @str
+ *
+ * Copies a substring out of a UTF-8 encoded string.
+ * The substring will contain @end_pos - @start_pos
+ * characters.
+ *
+ * Returns: a newly allocated copy of the requested
+ * substring. Free with g_free() when no longer needed.
+ *
+ * Since: GLIB 2.30
+ */
+gchar *
+g_utf8_substring (const gchar *str,
+ glong start_pos,
+ glong end_pos)
+{
+ gchar *start, *end, *out;
+
+ start = g_utf8_offset_to_pointer (str, start_pos);
+ end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
+
+ out = g_malloc (end - start + 1);
+ memcpy (out, start, end - start);
+ out[end - start] = 0;
+
+ return out;
+}
+#endif
projects / claws.git / blobdiff