Re: [libvirt PATCH 008/351] meson: src/util/virfile: rewrite virFileActivateDirOverrideForProg

With meson we no longer have .libs directory with the actual binary so we have to take a different approach to detect if running from build directory. This is not as robust as for autotools because if you select --prefix in the build directory it will incorrectly enable the override as well but nobody should do that.

We have to modify some of the tests to not add current build path into PATH variable and use the full path for virsh instead. Otherwise it would be impossible to figure out that we are running virsh from build directory. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/util/virfile.c | 34 ++++++++++++++++++------- tests/virsh-optparse | 58 +++++++++++++++++++------------------------ tests/virsh-schedinfo | 12 +++------ 3 files changed, 54 insertions(+), 50 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 213acdbcaa2..4542a38278e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1781,21 +1781,37 @@ virFileFindResource(const char *filename, * virFileActivateDirOverrideForProg: * @argv0: argv[0] of the calling program * - * Look at @argv0 and try to detect if running from - * a build directory, by looking for a 'lt-' prefix - * on the binary name, or '/.libs/' in the path + * Combine $PWD and @argv0, canonicalize it and check if abs_top_builddir + * matches as prefix in the path. */ void virFileActivateDirOverrideForProg(const char *argv0) { - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') + const char *pwd = g_getenv("PWD");

+ g_autofree char *fullPath = NULL; + g_autofree char *canonPath = NULL; + const char *path = NULL; + + if (!pwd) return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { + + if (argv0[0] != '/') { + fullPath = g_strdup_printf("%s/%s", pwd, argv0); + canonPath = virFileCanonicalizePath(fullPath); + + if (!canonPath) { + VIR_DEBUG("Failed to get canonicalized path errno=%d", errno); + return; + } + + path = canonPath; + } else { + path = argv0; + } + + if (STRPREFIX(path, abs_top_builddir)) {

useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); + VIR_DEBUG("Activating build dir override for %s", path); } }