marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

export: keep the original name for modified desktop/service files 

Rather than keeping around a symlink to the temporary file we rename
the temporary over the original name. Also we keep all seen
files and temporary files in a hashtable so we don't accidentally
process anything twice.
tingping/wmclass
Alexander Larsson 2015-02-11 14:30:53 +01:00
parent c1a0b41a7d
commit d9c10e5103
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xdg-app-dir.c
View File

@ -2,6 +2,7 @@
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
#include <gio/gio.h>
#include "libgsystem.h"
@ -618,11 +619,14 @@ export_dir (const char *app,
int res;
gs_dirfd_iterator_cleanup GSDirFdIterator source_iter;
gs_fd_close int destination_dfd = -1;
gs_unref_hashtable GHashTable *visited_children = NULL;
struct dirent *dent;
if (!gs_dirfd_iterator_init_at (source_parent_fd, source_name, FALSE, &source_iter, error))
goto out;
visited_children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
do
res = mkdirat (destination_parent_fd, destination_name, 0777);
while (G_UNLIKELY (res == -1 && errno == EINTR));
@ -650,6 +654,12 @@ export_dir (const char *app,
if (dent == NULL)
break;
if (g_hash_table_contains (visited_children, dent->d_name))
continue;
/* Avoid processing the same file again if it was re-created during an export */
g_hash_table_insert (visited_children, g_strdup (dent->d_name), GINT_TO_POINTER(1));
if (fstatat (source_iter.fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
{
int errsv = errno;
@ -683,13 +693,17 @@ export_dir (const char *app,
if (!export_desktop_file (app, branch, arch, source_iter.fd, dent->d_name, &stbuf, &new_name, cancellable, error))
goto out;
target = g_build_filename (source_symlink_prefix, new_name, NULL);
}
else
{
target = g_build_filename (source_symlink_prefix, dent->d_name, NULL);
g_hash_table_insert (visited_children, g_strdup (new_name), GINT_TO_POINTER(1));
if (renameat (source_iter.fd, new_name, source_iter.fd, dent->d_name) != 0)
{
gs_set_error_from_errno (error, errno);
goto out;
}
}
target = g_build_filename (source_symlink_prefix, dent->d_name, NULL);
if (unlinkat (destination_dfd, dent->d_name, 0) != 0 && errno != ENOENT)
{
gs_set_error_from_errno (error, errno);