From 6292c699248d3dfa6271ae0961e63436615653f2 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 18 Feb 2020 09:12:13 -0500 Subject: Rework dependency scanning: * Stop resolving dependencies during manifest creation * Resolve dependencies by path * Die on failure to resolve * Fixed an off-by-one error in manifest_read * Add CLI argument -M|--override-manifest to disable default manifest(s) * Clean up expandpath() a bit --- include/deps.h | 2 +- include/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/deps.h b/include/deps.h index b9a07fd..ad9adac 100644 --- a/include/deps.h +++ b/include/deps.h @@ -14,7 +14,7 @@ int dep_init(Dependencies **deps); void dep_free(Dependencies **deps); int dep_append(Dependencies **deps, char *name); int dep_solve(Dependencies **deps, const char *filename); -int dep_all(Dependencies **deps, const char *_package); +int dep_all(Dependencies **deps, const char *root, const char *_package); void dep_show(Dependencies **deps); #endif //SPM_DEPS_H diff --git a/include/fs.h b/include/fs.h index 5e41011..7e8ef12 100644 --- a/include/fs.h +++ b/include/fs.h @@ -25,6 +25,6 @@ char *dirname(const char *_path); char *basename(char *path); int rsync(const char *_args, const char *_source, const char *_destination); char *human_readable_size(uint64_t n); - +char *expandpath(const char *_path); #endif //SPM_FSTREE_H -- cgit