/*
* (SLIK) SimpLIstic sKin functions
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "ui_fileops.h"
#include "ui_utildlg.h" /* for locale warning dialog */
+#include "md5-util.h"
/*
*-----------------------------------------------------------------------------
gchar *text_l;
text_l = g_locale_from_utf8(text_utf8, -1, NULL, NULL, NULL);
- fputs((text_l) ? text_l : text_utf8, stdout);
+ fputs((text_l) ? text_l : text_utf8, stderr);
g_free(text_l);
}
-static void encoding_dialog(const gchar *path);
-
-static gint encoding_dialog_idle(gpointer data)
-{
- gchar *path = data;
-
- encoding_dialog(path);
- g_free(path);
-
- return FALSE;
-}
-
-static gint encoding_dialog_delay(gpointer data)
-{
- g_idle_add(encoding_dialog_idle, data);
-
- return 0;
-}
-
static void encoding_dialog(const gchar *path)
{
- static gint warned_user = FALSE;
+ static gboolean warned_user = FALSE;
GenericDialog *gd;
GString *string;
const gchar *lc;
const gchar *bf;
- /* check that gtk is initialized (loop is level > 0) */
- if (gtk_main_level() == 0)
- {
- /* gtk not initialized */
- gtk_init_add(encoding_dialog_delay, g_strdup(path));
- return;
- }
-
if (warned_user) return;
warned_user = TRUE;
g_string_free(string, TRUE);
}
+#if GQ_DEBUG_PATH_UTF8
+gchar *path_to_utf8_debug(const gchar *path, const gchar *file, gint line)
+#else
gchar *path_to_utf8(const gchar *path)
+#endif
{
gchar *utf8;
GError *error = NULL;
utf8 = g_filename_to_utf8(path, -1, NULL, NULL, &error);
if (error)
{
+#if GQ_DEBUG_PATH_UTF8
+ log_printf("%s:%d: Unable to convert filename to UTF-8:\n%s\n%s\n", file, line, path, error->message);
+#else
log_printf("Unable to convert filename to UTF-8:\n%s\n%s\n", path, error->message);
+#endif
g_error_free(error);
encoding_dialog(path);
}
return utf8;
}
+#if GQ_DEBUG_PATH_UTF8
+gchar *path_from_utf8_debug(const gchar *utf8, const gchar *file, gint line)
+#else
gchar *path_from_utf8(const gchar *utf8)
+#endif
{
gchar *path;
GError *error = NULL;
path = g_filename_from_utf8(utf8, -1, NULL, NULL, &error);
if (error)
{
+#if GQ_DEBUG_PATH_UTF8
+ log_printf("%s:%d: Unable to convert filename to locale from UTF-8:\n%s\n%s\n", file, line, utf8, error->message);
+#else
log_printf("Unable to convert filename to locale from UTF-8:\n%s\n%s\n", utf8, error->message);
+#endif
g_error_free(error);
}
if (!path)
return trash_dir;
}
-gint stat_utf8(const gchar *s, struct stat *st)
+gboolean stat_utf8(const gchar *s, struct stat *st)
{
gchar *sl;
- gint ret;
+ gboolean ret;
if (!s) return FALSE;
sl = path_from_utf8(s);
return ret;
}
-gint lstat_utf8(const gchar *s, struct stat *st)
+gboolean lstat_utf8(const gchar *s, struct stat *st)
{
gchar *sl;
- gint ret;
+ gboolean ret;
if (!s) return FALSE;
sl = path_from_utf8(s);
return ret;
}
-/* extension must contain only ASCII characters */
-gint stat_utf8_case_insensitive_ext(GString *base, const gchar *ext, struct stat *st)
-{
- gchar *sl;
- gchar *extl;
- gint ret = 0;
- gint ext_len;
- gint base_len = strlen(base->str);
-
- g_string_append(base, ext);
- sl = path_from_utf8(base->str);
-
- extl = strrchr(sl, '.');
- if (extl)
- {
- gint i, j;
- extl++; /* the first char after . */
- ext_len = strlen(extl);
-
- for (i = 0; i < (1 << ext_len); i++)
- {
- for (j = 0; j < ext_len; j++)
- {
- if (i & (1 << j))
- extl[j] = g_ascii_toupper(extl[j]);
- else
- extl[j] = g_ascii_tolower(extl[j]);
- }
- ret = (stat(sl, st) == 0);
- if (ret) break;
- }
-
- if (ret)
- {
- /* append the found extension to base */
- base = g_string_truncate(base, base_len);
- extl--;
- g_string_append(base, extl);
- }
- }
- g_free(sl);
-
- return ret;
-}
-
-gint isname(const gchar *s)
+gboolean isname(const gchar *s)
{
struct stat st;
return stat_utf8(s, &st);
}
-gint isfile(const gchar *s)
+gboolean isfile(const gchar *s)
{
struct stat st;
return (stat_utf8(s, &st) && S_ISREG(st.st_mode));
}
-gint isdir(const gchar *s)
+gboolean isdir(const gchar *s)
{
struct stat st;
return (stat_utf8(s, &st) && S_ISDIR(st.st_mode));
}
-gint islink(const gchar *s)
+gboolean islink(const gchar *s)
{
struct stat st;
return st.st_mtime;
}
-gint filetime_set(const gchar *s, time_t tval)
+gboolean filetime_set(const gchar *s, time_t tval)
{
- gint ret = FALSE;
+ gboolean ret = FALSE;
if (tval > 0)
{
return ret;
}
-gint access_file(const gchar *s, gint mode)
+gboolean is_readable_file(const gchar *s)
+{
+ if (!s || !s[0] || !isfile(s)) return FALSE;
+ return access_file(s, R_OK);
+}
+
+gboolean access_file(const gchar *s, gint mode)
{
gchar *sl;
gint ret;
- if (!s) return FALSE;
+ if (!s || !s[0]) return FALSE;
sl = path_from_utf8(s);
ret = (access(sl, mode) == 0);
return ret;
}
-gint unlink_file(const gchar *s)
+gboolean unlink_file(const gchar *s)
{
gchar *sl;
- gint ret;
+ gboolean ret;
if (!s) return FALSE;
return ret;
}
-gint symlink_utf8(const gchar *source, const gchar *target)
+gboolean symlink_utf8(const gchar *source, const gchar *target)
{
gchar *sl;
gchar *tl;
- gint ret;
+ gboolean ret;
if (!source || !target) return FALSE;
return ret;
}
-gint mkdir_utf8(const gchar *s, gint mode)
+gboolean mkdir_utf8(const gchar *s, gint mode)
{
gchar *sl;
- gint ret;
+ gboolean ret;
if (!s) return FALSE;
return ret;
}
-gint rmdir_utf8(const gchar *s)
+gboolean rmdir_utf8(const gchar *s)
{
gchar *sl;
- gint ret;
+ gboolean ret;
if (!s) return FALSE;
return ret;
}
-gint copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime)
+gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime)
{
struct stat st;
gchar *sl, *tl;
- gint ret = FALSE;
+ gboolean ret = FALSE;
if (!s || !t) return FALSE;
/* set the dest file attributes to that of source (ignoring errors) */
- if (perms && chown(tl, st.st_uid, st.st_gid) < 0) ret = FALSE;
- if (perms && chmod(tl, st.st_mode) < 0) ret = FALSE;
+ if (perms)
+ {
+ ret = chown(tl, st.st_uid, st.st_gid);
+ /* Ignores chown errors, while still doing chown
+ (so root still can copy files preserving ownership) */
+ ret = TRUE;
+ if (chmod(tl, st.st_mode) < 0) ret = FALSE;
+ }
tb.actime = st.st_atime;
tb.modtime = st.st_mtime;
}
/* paths are in filesystem encoding */
-static gint hard_linked(const gchar *a, const gchar *b)
+static gboolean hard_linked(const gchar *a, const gchar *b)
{
struct stat sta;
struct stat stb;
sta.st_ino == stb.st_ino);
}
-gint copy_file(const gchar *s, const gchar *t)
+gboolean copy_file(const gchar *s, const gchar *t)
{
FILE *fi = NULL;
FILE *fo = NULL;
- gchar *sl, *tl;
- gchar buf[4096];
+ gchar *sl = NULL;
+ gchar *tl = NULL;
+ gchar *randname = NULL;
+ gchar buf[16384];
size_t b;
+ gint ret = FALSE;
+ gint fd = -1;
sl = path_from_utf8(s);
tl = path_from_utf8(t);
if (hard_linked(sl, tl))
{
- g_free(sl);
- g_free(tl);
- return TRUE;
+ ret = TRUE;
+ goto end;
}
fi = fopen(sl, "rb");
- if (fi)
- {
- fo = fopen(tl, "wb");
- if (!fo)
- {
- fclose(fi);
- fi = NULL;
- }
- }
-
- g_free(sl);
- g_free(tl);
-
- if (!fi || !fo) return FALSE;
+ if (!fi) goto end;
+
+ /* First we write to a temporary file, then we rename it on success,
+ and attributes from original file are copied */
+ randname = g_strconcat(tl, ".tmp_XXXXXX", NULL);
+ if (!randname) goto end;
+
+ fd = g_mkstemp(randname);
+ if (fd == -1) goto end;
+
+ fo = fdopen(fd, "wb");
+ if (!fo) {
+ close(fd);
+ goto end;
+ }
while ((b = fread(buf, sizeof(gchar), sizeof(buf), fi)) && b != 0)
{
if (fwrite(buf, sizeof(gchar), b, fo) != b)
{
- fclose(fi);
- fclose(fo);
- return FALSE;
+ unlink(randname);
+ goto end;
}
}
- fclose(fi);
- fclose(fo);
+ fclose(fi); fi = NULL;
+ fclose(fo); fo = NULL;
- copy_file_attributes(s, t, TRUE, TRUE);
+ if (rename(randname, tl) < 0) {
+ unlink(randname);
+ goto end;
+ }
- return TRUE;
+ ret = copy_file_attributes(s, t, TRUE, TRUE);
+
+end:
+ if (fi) fclose(fi);
+ if (fo) fclose(fo);
+ if (sl) g_free(sl);
+ if (tl) g_free(tl);
+ if (randname) g_free(randname);
+ return ret;
}
-gint move_file(const gchar *s, const gchar *t)
+gboolean move_file(const gchar *s, const gchar *t)
{
gchar *sl, *tl;
- gint ret = TRUE;
+ gboolean ret = TRUE;
if (!s || !t) return FALSE;
return ret;
}
-gint rename_file(const gchar *s, const gchar *t)
+gboolean rename_file(const gchar *s, const gchar *t)
{
gchar *sl, *tl;
- gint ret;
+ gboolean ret;
if (!s || !t) return FALSE;
g_list_free(list);
}
-GList *string_list_copy(GList *list)
+GList *string_list_copy(const GList *list)
{
GList *new_list = NULL;
- GList *work;
+ GList *work = (GList *) list;
- work = list;
while (work)
{
gchar *path;
return g_list_reverse(new_list);
}
-gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gint pad)
+gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gboolean pad)
{
gchar *unique;
gint n = 1;
return strrchr(path, '.');
}
-gint file_extension_match(const gchar *path, const gchar *ext)
+gboolean file_extension_match(const gchar *path, const gchar *ext)
{
gint p;
gint e;
e = strlen(ext);
/* FIXME: utf8 */
- return (p > e && strncasecmp(path + p - e, ext, e) == 0);
+ return (p > e && g_ascii_strncasecmp(path + p - e, ext, e) == 0);
}
gchar *remove_extension_from_path(const gchar *path)
path[t] = '\0';
}
-gint file_in_path(const gchar *name)
+gboolean file_in_path(const gchar *name)
{
gchar *path;
gchar *namel;
gint p, l;
- gint ret = FALSE;
+ gboolean ret = FALSE;
if (!name) return FALSE;
path = g_strdup(getenv("PATH"));
p++;
if (p[0] == G_DIR_SEPARATOR || p[0] == '\0')
{
- gint end = TRUE;
+ gboolean end = TRUE;
if (p[0] != '\0')
{
return TRUE;
}
+/* does filename utf8 to filesystem encoding first */
+gboolean md5_get_digest_from_file_utf8(const gchar *path, guchar digest[16])
+{
+ gboolean success;
+ gchar *pathl;
+
+ pathl = path_from_utf8(path);
+ success = md5_get_digest_from_file(pathl, digest);
+ g_free(pathl);
+
+ return success;
+}
+
+
+gchar *md5_text_from_file_utf8(const gchar *path, const gchar *error_text)
+{
+ guchar digest[16];
+
+ if (!md5_get_digest_from_file_utf8(path, digest)) return g_strdup(error_text);
+
+ return md5_digest_to_text(digest);
+}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff