X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fparser.c;h=5598f963e236d2c6806aa0ac9166b242c18d266a;hp=8e767c6727c27f00ddc1ecb5ecaf173d288fdd60;hb=03fe06fa71f065e918c46a65e6a45e76063a07eb;hpb=45e9e7a53540e87e2129bb11fd853501131fb795

diff --git a/discover/parser.c b/discover/parser.c
index 8e767c6..5598f96 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,8 +1,6 @@
 
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "types/types.h"
 #include <file/file.h>
@@ -25,7 +23,7 @@ static char *local_path(struct discover_context *ctx,
 		struct discover_device *dev,
 		const char *filename)
 {
-	return join_paths(ctx, dev->mount_path, filename);
+	return join_paths(ctx, dev->root_path, filename);
 }
 
 int parser_request_file(struct discover_context *ctx,
@@ -49,24 +47,30 @@ int parser_request_file(struct discover_context *ctx,
 	return rc;
 }
 
-int parser_check_dir(struct discover_context *ctx,
-		struct discover_device *dev, const char *dirname)
+int parser_stat_path(struct discover_context *ctx,
+		struct discover_device *dev, const char *path,
+		struct stat *statbuf)
 {
-	struct stat statbuf;
-	char *path;
-	int rc;
+	int rc = -1;
+	char *full_path;
 
+	/* we only support local files at present */
 	if (!dev->mount_path)
 		return -1;
 
-	path = local_path(ctx, dev, dirname);
+	full_path = local_path(ctx, dev, path);
 
-	rc = stat(path, &statbuf);
-	talloc_free(path);
-	if (!rc)
-		return -1;
+	rc = stat(full_path, statbuf);
+	if (rc) {
+		rc = -1;
+		goto out;
+	}
 
-	return S_ISDIR(statbuf.st_mode) ? 0 : -1;
+	rc = 0;
+out:
+	talloc_free(full_path);
+
+	return rc;
 }
 
 int parser_replace_file(struct discover_context *ctx,