Fix pb-discover segfaults caused by list corruption.

[petitboot] / discover / parser.h

diff --git a/discover/parser.h b/discover/parser.h
index 970d72c05b6814f33c80ff674eef68e378c67c9f..bff52e30d09fbfda86620664b2a4d61108ac8439 100644 (file)
--- a/discover/parser.h
+++ b/discover/parser.h
@@ -2,6 +2,10 @@
 #define _PARSER_H
 
 #include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
 
 #include "device-handler.h"
 
@@ -51,8 +55,9 @@ int parse_user_event(struct discover_context *ctx, struct event *event);
 /* File IO functions for parsers; these should be the only interface that
  * parsers use to access a device's filesystem.
  *
- * These are intended for small amounts of data, typically text configuration
- * and state files.
+ * These are intended for small amounts of data, typically text
+ * configuration and state files.  Note that parser_request_file,
+ * and parser_replace_file work only on non-directories.
  */
 int parser_request_file(struct discover_context *ctx,
                struct discover_device *dev, const char *filename,
@@ -62,5 +67,22 @@ int parser_replace_file(struct discover_context *ctx,
                char *buf, int len);
 int parser_request_url(struct discover_context *ctx, struct pb_url *url,
                char **buf, int *len);
+/* parser_stat_path returns 0 if path can be stated on dev by the
+ * running user.  Note that this function follows symlinks, like the
+ * stat system call.  When the function returns 0, also fills in
+ * statbuf for the path.  Returns non-zero on error.  This function
+ * does not have the limitations on file size that the functions above
+ * do.  Unlike some of the functions above, this function also works
+ * on directories. */
+int parser_stat_path(struct discover_context *ctx,
+               struct discover_device *dev, const char *path,
+               struct stat *statbuf);
+/* Function used to list the files on a directory. The dirname should
+ * be relative to the discover context device mount path. It returns
+ * the number of files returned in files or a negative value on error.
+ */
+int parser_scandir(struct discover_context *ctx, const char *dirname,
+                  struct dirent ***files, int (*filter)(const struct dirent *),
+                  int (*comp)(const struct dirent **, const struct dirent **));
 
 #endif /* _PARSER_H */