From 74ddda664b9d7e843da3ec8254716c11016007e5 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 22 Jan 2020 09:26:39 -0500 Subject: Change fstree signature Change strstr_array return type to char* Re-add and reorder a few prototypes in spm.h --- include/spm.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/spm.h b/include/spm.h index bf04fd3..c011e34 100644 --- a/include/spm.h +++ b/include/spm.h @@ -214,6 +214,12 @@ void strsort(char **arr); int find_in_file(const char *filename, const char *pattern); int isrelational(char ch); void print_banner(const char *s, int len); +char *strstr_array(char **arr, const char *str); +char **strdeldup(char **arr); +char *lstrip(char *sptr); +char *strip(char *sptr); +int isempty(char *sptr); +int isquoted(char *sptr); // find.c char *find_executable(const char *program); @@ -233,7 +239,7 @@ int rpath_set(const char *filename, const char *rpath); // fs.c int _fstree_compare(const FTSENT **a, const FTSENT **b); void fstree_free(FSTree *fsdata); -FSTree *fstree(const char *_path); +FSTree *fstree(const char *_path, char **filter_by); int rmdirs(const char *_path); long int get_file_size(const char *filename); int mkdirs(const char *_path, mode_t mode); @@ -261,10 +267,6 @@ int install(const char *destroot, const char *_package); // config.c #define CONFIG_BUFFER_SIZE 1024 -char *lstrip(char *sptr); -char *strip(char *sptr); -int isempty(char *sptr); -int isquoted(char *sptr); ConfigItem **config_read(const char *filename); ConfigItem *config_get(ConfigItem **item, const char *key); void config_free(ConfigItem **item); -- cgit