try again

Author: jcupitt

src/main.c

@@ -71,26 +71,33 @@ get_prefix(void)
 {
 	if (!prefix_valid) {
 		g_autofree char *basename = g_path_get_basename(main_argv0);
-		g_autofree char *pathname = path_find_file(basename);
+		g_autofree char *argv0_path = NULL;
 
 		const char *prefix;
 
 		prefix = vips_guess_prefix(main_argv0, "VIPSHOME");
 
 		if (!prefix ||
 			!existsf("%s/share/nip4", prefix)) {
-			/* the libvips guesser failed to find our install area ... try
-			 * using the path to our executable
+			printf("getting prefix from PATH\n");
+
+			/* The libvips guesser failed to find our install area ... try
+			 * searching the path for our exe name.
 			 *
-			 * This can happon with homebrew, for example, where the
-			 * compile-time libvips prefix will not match the nip4 prefix
+			 * This can happen with homebrew, for example, where the
+			 * compile-time libvips prefix will not match the nip4 prefix.
 			 */
+			GSList *path = path_parse(g_getenv("PATH"));
+			argv0_path =
+				(char *) path_map(path, basename, (path_map_fn) g_strdup, NULL);
+			g_slist_free_full(g_steal_pointer(&path), g_free);
+
 			g_autofree char *trailing = g_strjoin("/", "bin", basename, NULL);
-			if (pathname &&
-				is_postfix(pathname, trailing))
-				pathname[strlen(pathname) - strlen(trailing)] = '\0';
+			if (argv0_path &&
+				is_postfix(argv0_path, trailing))
+				argv0_path[strlen(argv0_path) - strlen(trailing)] = '\0';
 
-			prefix = pathname;
+			prefix = argv0_path;
 		}
 
 		if (!prefix ||