summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-07-18 07:13:02 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2021-07-18 07:13:02 +0200
commit8a5144d02a0146c4f0ec577232c0a102d12c8ee7 (patch)
tree85b0459bb60bfaa2a765e21bb7e19a0edc6c2d6a /lib
parent2551aad17a15fe06ae3b76b12b5df2207c1e11f6 (diff)
parent368deb2baa56a6ab0f4ec7d7a42559c4db14b063 (diff)
downloadbarebox-8a5144d02a0146c4f0ec577232c0a102d12c8ee7.tar.gz
barebox-8a5144d02a0146c4f0ec577232c0a102d12c8ee7.tar.xz
Merge branch 'for-next/firmware'
Diffstat (limited to 'lib')
-rw-r--r--lib/libbb.c58
-rw-r--r--lib/libfile.c23
2 files changed, 61 insertions, 20 deletions
diff --git a/lib/libbb.c b/lib/libbb.c
index d0c9bf4d80..642e54d78f 100644
--- a/lib/libbb.c
+++ b/lib/libbb.c
@@ -49,11 +49,47 @@ char *concat_subpath_file(const char *path, const char *f)
}
EXPORT_SYMBOL(concat_subpath_file);
+/**
+ * find_path - find a file in a colon separated path
+ * @path: The search path, colon separated
+ * @filename: The filename to search for
+ * @filter: filter function
+ *
+ * searches for @filename in a colon separated list of directories given in
+ * @path. @filter should return true when the current file matches the expectations,
+ * false otherwise. @filter should check for existence of the file, but could also
+ * check for additional flags.
+ */
+char *find_path(const char *path, const char *filename,
+ bool (*filter)(const char *))
+{
+ char *p, *n, *freep;
+
+ freep = p = strdup(path);
+ while (p) {
+ n = strchr(p, ':');
+ if (n)
+ *n++ = '\0';
+ if (*p != '\0') { /* it's not a PATH="foo::bar" situation */
+ p = concat_path_file(p, filename);
+ if (filter(p)) {
+ free(freep);
+ return p;
+ }
+ free(p);
+ }
+ p = n;
+ }
+ free(freep);
+ return NULL;
+}
+EXPORT_SYMBOL(find_path);
+
/* check if path points to an executable file;
* return 1 if found;
* return 0 otherwise;
*/
-int execable_file(const char *name)
+bool execable_file(const char *name)
{
struct stat s;
return (!stat(name, &s) && S_ISREG(s.st_mode));
@@ -67,25 +103,7 @@ EXPORT_SYMBOL(execable_file);
*/
char *find_execable(const char *filename)
{
- char *path, *p, *n;
-
- p = path = strdup(getenv("PATH"));
- while (p) {
- n = strchr(p, ':');
- if (n)
- *n++ = '\0';
- if (*p != '\0') { /* it's not a PATH="foo::bar" situation */
- p = concat_path_file(p, filename);
- if (execable_file(p)) {
- free(path);
- return p;
- }
- free(p);
- }
- p = n;
- }
- free(path);
- return NULL;
+ return find_path(getenv("PATH"), filename, execable_file);
}
EXPORT_SYMBOL(find_execable);
diff --git a/lib/libfile.c b/lib/libfile.c
index 4ab8db11ad..40b1d8bb27 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -100,6 +100,29 @@ int read_full(int fd, void *buf, size_t size)
}
EXPORT_SYMBOL(read_full);
+int copy_fd(int in, int out)
+{
+ int bs = 4096, ret;
+ void *buf = malloc(bs);
+
+ if (!buf)
+ return -ENOMEM;
+
+ while (1) {
+ ret = read(in, buf, bs);
+ if (ret <= 0)
+ break;
+
+ ret = write_full(out, buf, ret);
+ if (ret < 0)
+ break;
+ }
+
+ free(buf);
+
+ return ret;
+}
+
/*
* read_file_line - read a line from a file
*