diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/appletlib.c | 2 | ||||
| -rw-r--r-- | libbb/lineedit.c | 4 | ||||
| -rw-r--r-- | libbb/login.c | 2 | ||||
| -rw-r--r-- | libbb/parse_config.c | 20 | ||||
| -rw-r--r-- | libbb/procps.c | 2 | ||||
| -rw-r--r-- | libbb/rtc.c | 2 | ||||
| -rw-r--r-- | libbb/wfopen.c | 20 |
7 files changed, 41 insertions, 11 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 8c35450f8..beb1d6fcb 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -316,7 +316,7 @@ static void parse_config_file(void) || !S_ISREG(st.st_mode) /* Not a regular file? */ || (st.st_uid != 0) /* Not owned by root? */ || (st.st_mode & (S_IWGRP | S_IWOTH)) /* Writable by non-root? */ - || !(f = fopen(config_file, "r")) /* Cannot open? */ + || !(f = fopen_for_read(config_file)) /* Cannot open? */ ) { return; } diff --git a/libbb/lineedit.c b/libbb/lineedit.c index a46b5d2c4..2e16e6a0a 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -989,7 +989,7 @@ static void load_history(const char *fromfile) /* NB: do not trash old history if file can't be opened */ - fp = fopen(fromfile, "r"); + fp = fopen_for_read(fromfile); if (fp) { /* clean up old history */ for (hi = state->cnt_history; hi > 0;) { @@ -1022,7 +1022,7 @@ static void save_history(const char *tofile) { FILE *fp; - fp = fopen(tofile, "w"); + fp = fopen_for_write(tofile); if (fp) { int i; diff --git a/libbb/login.c b/libbb/login.c index 1703a2eb7..b3e199ce4 100644 --- a/libbb/login.c +++ b/libbb/login.c @@ -32,7 +32,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty) puts("\r"); /* start a new line */ - fp = fopen(issue_file, "r"); + fp = fopen_for_read(issue_file); if (!fp) return; while ((c = fgetc(fp)) != EOF) { diff --git a/libbb/parse_config.c b/libbb/parse_config.c index 3174a649e..5109066d8 100644 --- a/libbb/parse_config.c +++ b/libbb/parse_config.c @@ -59,11 +59,11 @@ Typical usage: */ -parser_t* FAST_FUNC config_open(const char *filename) +parser_t* FAST_FUNC config_open2(const char *filename, FILE* FAST_FUNC (*fopen_func)(const char *path)) { parser_t *parser = xzalloc(sizeof(parser_t)); /* empty file configures nothing */ - parser->fp = fopen_or_warn_stdin(filename); + parser->fp = fopen_func(filename); if (parser->fp) return parser; if (ENABLE_FEATURE_CLEAN_UP) @@ -71,6 +71,11 @@ parser_t* FAST_FUNC config_open(const char *filename) return NULL; } +parser_t* FAST_FUNC config_open(const char *filename) +{ + return config_open2(filename, fopen_or_warn_stdin); +} + static void config_free_data(parser_t *const parser) { free(parser->line); @@ -114,6 +119,7 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const int ntokens = flags & 0xFF; int mintokens = (flags & 0xFF00) >> 8; + again: // N.B. this could only be used in read-in-one-go version, or when tokens use xstrdup(). TODO //if (!parser->lineno || !(flags & PARSE_DONT_NULL)) memset(tokens, 0, sizeof(tokens[0]) * ntokens); @@ -211,9 +217,13 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const //bb_info_msg("A[%s]", line); } - if (ii < mintokens) - bb_error_msg_and_die("bad line %u: %d tokens found, %d needed", - parser->lineno, ii, mintokens); + if (ii < mintokens) { + bb_error_msg("bad line %u: %d tokens found, %d needed", + parser->lineno, ii, mintokens); + if (flags & PARSE_MIN_DIE) + xfunc_die(); + goto again; + } return ii; } diff --git a/libbb/procps.c b/libbb/procps.c index f799099fd..ba3d25050 100644 --- a/libbb/procps.c +++ b/libbb/procps.c @@ -308,7 +308,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) FILE *file; strcpy(filename_tail, "/smaps"); - file = fopen(filename, "r"); + file = fopen_for_read(filename); if (!file) break; while (fgets(buf, sizeof(buf), file)) { diff --git a/libbb/rtc.c b/libbb/rtc.c index 1fdeee80f..222d977ca 100644 --- a/libbb/rtc.c +++ b/libbb/rtc.c @@ -14,7 +14,7 @@ int FAST_FUNC rtc_adjtime_is_utc(void) { int utc = 0; - FILE *f = fopen(ADJTIME_PATH, "r"); + FILE *f = fopen_for_read(ADJTIME_PATH); if (f) { RESERVE_CONFIG_BUFFER(buffer, 128); diff --git a/libbb/wfopen.c b/libbb/wfopen.c index ac365c2a0..4c84b3ba9 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -18,3 +18,23 @@ FILE* FAST_FUNC fopen_or_warn(const char *path, const char *mode) } return fp; } + +FILE* FAST_FUNC fopen_for_read(const char *path) +{ + return fopen(path, "r"); +} + +FILE* FAST_FUNC xfopen_for_read(const char *path) +{ + return xfopen(path, "r"); +} + +FILE* FAST_FUNC fopen_for_write(const char *path) +{ + return fopen(path, "w"); +} + +FILE* FAST_FUNC xfopen_for_write(const char *path) +{ + return xfopen(path, "w"); +} |