scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-26 01:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

- New utility onlp_file_find()

Browse Source 
Finds the requested file starting at the given root directory.

- Support implicit directory searching for filenames
  If a filename passed to any of the file APIs contains
  an asterisk then it is considered a search request rather than
  an absolute path. Preceding the asterisk is the root directory
  and following the asterisk is the filename to search.
This commit is contained in:
Jeffrey Townsend
2016-12-25 13:19:17 -08:00
parent a3ce592594
commit 05363d9ba2
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/base/any/onlp/src/onlplib/module/inc/onlplib/file.h
View File

@@ -141,6 +141,9 @@ int onlp_file_open(int flags, int log, const char* fmt, ...);
int onlp_file_vopen(int flags, int log, const char* fmt, va_list vargs);
/**
* @brief Search a directory tree for the given file.
*/
int onlp_file_find(char* root, char* fname, char** rpath);
#endif /* __ONLPLIB_FILE_H__ */

55
packages/base/any/onlp/src/onlplib/module/src/file.c
View File

@@ -23,6 +23,7 @@
*
***********************************************************/
#include <onlplib/onlplib_config.h>
#include "onlplib_log.h"
#include <onlplib/file.h>
#include <limits.h>
#include <unistd.h>
@@ -74,8 +75,25 @@ vopen__(char** dst, int flags, const char* fmt, va_list vargs)
int fd;
struct stat sb;
char fname[PATH_MAX];
char* asterisk;
ONLPLIB_VSNPRINTF(fname, sizeof(fname)-1, fmt, vargs);
/**
* An asterisk in the filename separates a search root
* directory from a filename.
*/
if( (asterisk = strchr(fname, '*')) ) {
char* root = fname;
char* rpath = NULL;
*asterisk = 0;
if(onlp_file_find(root, asterisk+1, &rpath) < 0) {
return ONLP_STATUS_E_MISSING;
}
strcpy(fname, rpath);
aim_free(rpath);
}
if(dst) {
*dst = aim_strdup(fname);
}
@@ -282,3 +300,40 @@ onlp_file_vopen(int flags, int log, const char* fmt, va_list vargs)
aim_free(fname);
return rv;
}
#include <sys/types.h>
#include <sys/stat.h>
#include <err.h>
#include <fts.h>
int
onlp_file_find(char* root, char* fname, char** rpath)
{
FTS *fs;
FTSENT *ent;
char* argv[] = { NULL, NULL };
argv[0] = root;
if ((fs = fts_open(argv, FTS_PHYSICAL | FTS_NOCHDIR | FTS_COMFOLLOW,
NULL)) == NULL) {
AIM_LOG_ERROR("fts_open(%s): %{errno}", argv[0], errno);
return ONLP_STATUS_E_INTERNAL;
}
while ((ent = fts_read(fs)) != NULL) {
switch (ent->fts_info)
{
case FTS_F:
{
if(!strcmp(fname, ent->fts_name)) {
*rpath = realpath(ent->fts_path, NULL);
fts_close(fs);
return ONLP_STATUS_OK;
}
}
break;
}
}
fts_close(fs);
return ONLP_STATUS_E_MISSING;
}