diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | include/find.h | 12 | ||||
| -rw-r--r-- | include/fs.h | 2 | ||||
| -rw-r--r-- | include/spm.h | 2 | ||||
| -rw-r--r-- | include/str.h | 1 |
5 files changed, 2 insertions, 16 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 1009b96..1e1a019 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -7,7 +7,6 @@ install( conf.h environment.h error_handler.h - find.h fs.h install.h internal_cmd.h diff --git a/include/find.h b/include/find.h deleted file mode 100644 index 34c471c..0000000 --- a/include/find.h +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @file find.h - */ -#ifndef SPM_FIND_H -#define SPM_FIND_H - -char *find_executable(const char *program); -char *find_file(const char *root, const char *filename); -char *find_package(const char *filename); -int errglob(const char *epath, int eerrno); - -#endif //SPM_FIND_H diff --git a/include/fs.h b/include/fs.h index 0698871..9f706b2 100644 --- a/include/fs.h +++ b/include/fs.h @@ -47,4 +47,6 @@ char *expandpath(const char *_path); char *spm_mkdtemp(const char *base, const char *name, const char *extended_path); int touch(const char *path); char **file_readlines(const char *filename, size_t start, size_t limit, ReaderFn *readerFn); +char *find_executable(const char *program); +int find_in_file(const char *filename, const char *pattern); #endif //SPM_FSTREE_H diff --git a/include/spm.h b/include/spm.h index e0e713f..a026ebf 100644 --- a/include/spm.h +++ b/include/spm.h @@ -44,7 +44,6 @@ #if !OS_WINDOWS #include <fts.h> -#include <glob.h> #include <unistd.h> #include <sys/utsname.h> #include <utime.h> @@ -70,7 +69,6 @@ extern spm_vars SPM_GLOBAL; #include "shell.h" #include "relocation.h" #include "archive.h" -#include "find.h" #include "rpath.h" #include "mime.h" #include "mirrors.h" diff --git a/include/str.h b/include/str.h index ae54997..5a94bd0 100644 --- a/include/str.h +++ b/include/str.h @@ -22,7 +22,6 @@ char *join(char **arr, const char *separator); char *join_ex(char *separator, ...); char *substring_between(char *sptr, const char *delims); void strsort(char **arr, unsigned int sort_mode); -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); |