diff options
| author | Serge Hallyn <serge@hallyn.com> | 2023-05-19 14:42:04 -0500 |
|---|---|---|
| committer | Iker Pedrosa <ikerpedrosam@gmail.com> | 2023-05-22 10:23:12 +0200 |
| commit | 9e854f525d2965e45b0bb2bcfa6761a990d0c751 (patch) | |
| tree | daa41087db0a3cdf101b96f93b312de822be8311 | |
| parent | 8175b1532e4bb1951264e8a6ee5f484137e5306c (diff) | |
def_load: split the econf from non-econf definition
The function is completely different based on USE_CONF. Either copy
will be easier to read if we just keep them completely separate.
Signed-off-by: Serge Hallyn <serge@hallyn.com>
| -rw-r--r-- | lib/getdef.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/getdef.c b/lib/getdef.c index 763d847a..39cd62d5 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -472,18 +472,13 @@ void setdef_config_file (const char* file) * Loads the user-configured options from the default configuration file */ +#ifdef USE_ECONF static void def_load (void) { -#ifdef USE_ECONF econf_file *defs_file = NULL; econf_err error; char **keys; size_t key_number; -#else - int i; - FILE *fp; - char buf[1024], *name, *value, *s; -#endif /* * Set the initialized flag. @@ -491,8 +486,6 @@ static void def_load (void) */ def_loaded = true; -#ifdef USE_ECONF - error = econf_readDirs (&defs_file, vendordir, sysconfdir, "login", "defs", " \t", "#"); if (error) { if (error == ECONF_NOFILE) @@ -528,7 +521,20 @@ static void def_load (void) econf_free (keys); econf_free (defs_file); -#else +} +#else /* USE_ECONF */ +static void def_load (void) +{ + int i; + FILE *fp; + char buf[1024], *name, *value, *s; + + /* + * Set the initialized flag. + * (do it early to prevent recursion in putdef_str()) + */ + def_loaded = true; + /* * Open the configuration definitions file. */ @@ -592,8 +598,8 @@ static void def_load (void) } (void) fclose (fp); -#endif } +#endif /* USE_ECONF */ #ifdef CKDEFS |