*
* 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
*
*/
#include "defs.h"
#include <glib.h>
+#include <gio/gio.h>
#include <glib/gi18n.h>
}
#endif /* G_OS_WIN32 */
+GSList *slist_copy_deep(GSList *list, GCopyFunc func)
+{
+#if GLIB_CHECK_VERSION(2, 34, 0)
+ return g_slist_copy_deep(list, func, NULL);
+#else
+ GSList *res = g_slist_copy(list);
+ GSList *walk = res;
+ while (walk) {
+ walk->data = func(walk->data, NULL);
+ walk = walk->next;
+ }
+ return res;
+#endif
+}
+
void list_free_strings(GList *list)
{
list = g_list_first(list);
#if GLIB_CHECK_VERSION(2,28,0)
g_slist_free_full(list, (GDestroyNotify)g_free);
#else
- while (list != NULL) {
- g_free(list->data);
- list = list->next;
- }
+ g_slist_foreach(list, (GFunc)g_free, NULL);
g_slist_free(list);
#endif
}
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 (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) {
+ g_free(path);
+ g_free(outpath);
+ return;
+ }
+
+ outfp = g_fopen(outpath, "wb");
if (!outfp) {
g_free(path);
g_free(outpath);
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;
}
slist_free_strings_full(canonical_parts);
return 0;
}
+
+#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