packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trivial-httpd: Handle the autoexit case when the docroot is a symlink

This commit is contained in:
Vivek Dasmohapatra 2013-08-22 19:44:29 +01:00 committed by Colin Walters
parent 3dc6cedba5
commit 14c9f88e9c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ostree/ot-builtin-trivial-httpd.c
View File

@ -342,7 +342,23 @@ ostree_builtin_trivial_httpd (int argc, char **argv, GFile *repo_path, GCancella
app->running = TRUE; app->running = TRUE;
if (opt_autoexit) if (opt_autoexit)
{ {
dirmon = g_file_monitor_directory (app->root, 0, cancellable, error); gboolean is_symlink = FALSE;
gs_unref_object GFileInfo *info = NULL;
info = g_file_query_info (app->root,
G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable, error);
if (!info)
goto out;
is_symlink = g_file_info_get_is_symlink (info);
if (is_symlink)
dirmon = g_file_monitor_file (app->root, 0, cancellable, error);
else
dirmon = g_file_monitor_directory (app->root, 0, cancellable, error);
if (!dirmon) if (!dirmon)
goto out; goto out;
g_signal_connect (dirmon, "changed", G_CALLBACK (on_dir_changed), app); g_signal_connect (dirmon, "changed", G_CALLBACK (on_dir_changed), app);