mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 22:35:35 +00:00
Code Issues Releases Wiki Activity

parser: Remove exits from features code

Browse Source 
This is done in preparation for moving the features code to a library.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Tyler Hicks
2015-03-25 17:09:26 -05:00
parent 45ac621f26
commit f896a64152
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parser/features.c
View File

@@ -102,6 +102,7 @@ static int features_dir_cb(DIR *dir, const char *name, struct stat *st,
PDEBUG("Opened features \"%s\"\n", name);
if (st->st_size > remaining) {
PDEBUG("Feature buffer full.");
errno = ENOBUFS;
return -1;
}
@@ -128,17 +129,17 @@ static int features_dir_cb(DIR *dir, const char *name, struct stat *st,
return 0;
}
static char *handle_features_dir(const char *filename, char *buffer, int size,
char *pos)
static int handle_features_dir(const char *filename, char *buffer, int size,
char *pos)
{
struct features_struct fst = { buffer, size, pos };
if (dirat_for_each(NULL, filename, &fst, features_dir_cb)) {
PDEBUG("Failed evaluating %s\n", filename);
exit(1);
return -1;
}
return fst.pos;
return 0;
}
static int load_features_file(const char *name, char *buffer, size_t size)
@@ -175,6 +176,7 @@ int aa_features_new(aa_features **features, const char *path)
{
struct stat stat_file;
aa_features *f;
int retval;
*features = NULL;
@@ -188,9 +190,10 @@ int aa_features_new(aa_features **features, const char *path)
}
aa_features_ref(f);
if (S_ISDIR(stat_file.st_mode)) {
handle_features_dir(path, f->string, STRING_SIZE, f->string);
} else if (load_features_file(path, f->string, STRING_SIZE)) {
retval = S_ISDIR(stat_file.st_mode) ?
handle_features_dir(path, f->string, STRING_SIZE, f->string) :
load_features_file(path, f->string, STRING_SIZE);
if (retval) {
int save = errno;
aa_features_unref(f);