From bd1c15e047fd3dc2207b26a4a9c115a54aded836 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 8 Aug 2017 09:33:01 +0200 Subject: wgtpkg-install: search in subdir "htdocs" also MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For widgets that are fully HTML, the search of the content was not checking the subdirectory "htdocs" that is enforced elsewhere. This commits add the search of the content in the subdirectory "htdocs". This is a temporarily fix. A better complete solution has to be delivered later. Bug-AGL: SPEC-808 Change-Id: I8bef7c4a31ff919827ceca05e203c2b277cf7657 Signed-off-by: José Bollo --- src/wgtpkg-install.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index 79cb7fb..2b57a4e 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -295,6 +295,7 @@ static int check_one_content(const char *src, const char *type) { int rc; struct stat s; + int fhtdocs, serr; if (!src) { ERROR("a content src is missing"); @@ -304,6 +305,16 @@ static int check_one_content(const char *src, const char *type) /* TODO: when dealing with HTML and languages, the check should * include i18n path search of widgets */ rc = fstatat(workdirfd, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW); + if (rc < 0) { + serr = errno; + fhtdocs = openat(workdirfd, "htdocs", O_DIRECTORY|O_PATH); + if (fhtdocs >= 0) { + rc = fstatat(fhtdocs, src, &s, AT_NO_AUTOMOUNT|AT_SYMLINK_NOFOLLOW); + serr = errno; + close(fhtdocs); + } + errno = serr; + } if (rc < 0) ERROR("can't get info on content %s: %m", src); else if (!S_ISREG(s.st_mode)) { -- cgit 1.2.3-korg