diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/depmod.c | 2 | ||||
| -rw-r--r-- | modutils/insmod.c | 6 | ||||
| -rw-r--r-- | modutils/lsmod.c | 4 | ||||
| -rw-r--r-- | modutils/modprobe-small.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/modutils/depmod.c b/modutils/depmod.c index d128ac0ff..b6a914eb0 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -150,7 +150,7 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) if (!(option_mask32 & ARG_n)) { /* --dry-run */ chp = concat_path_file(moddir, CONFIG_DEFAULT_DEPMOD_FILE); - filedes = xfopen(chp, "w"); + filedes = xfopen_for_write(chp); if (ENABLE_FEATURE_CLEAN_UP) free(chp); } diff --git a/modutils/insmod.c b/modutils/insmod.c index 97f4a87e2..9dcc5b02d 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -3992,7 +3992,7 @@ int insmod_main(int argc, char **argv) /* Get a filedesc for the module. Check that we have a complete path */ if (stat(arg1, &st) < 0 || !S_ISREG(st.st_mode) - || (fp = fopen(arg1, "r")) == NULL + || (fp = fopen_for_read(arg1)) == NULL ) { /* Hmm. Could not open it. First search under /lib/modules/`uname -r`, * but do not error out yet if we fail to find it... */ @@ -4016,7 +4016,7 @@ int insmod_main(int argc, char **argv) } /* Check if we have found anything yet */ - if (!m_filename || ((fp = fopen(m_filename, "r")) == NULL)) { + if (!m_filename || ((fp = fopen_for_read(m_filename)) == NULL)) { int r; char *module_dir; @@ -4033,7 +4033,7 @@ int insmod_main(int argc, char **argv) bb_error_msg_and_die("%s: module not found", m_fullName); free(module_dir); if (m_filename == NULL - || ((fp = fopen(m_filename, "r")) == NULL) + || ((fp = fopen_for_read(m_filename)) == NULL) ) { bb_error_msg_and_die("%s: module not found", m_fullName); } diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 5e37923a9..3f237039e 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -28,7 +28,7 @@ static void check_tainted(void) FILE *f; tainted = 0; - f = fopen(TAINT_FILENAME, "r"); + f = fopen_for_read(TAINT_FILENAME); if (f) { fscanf(f, "%d", &tainted); fclose(f); @@ -145,7 +145,7 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) { - FILE *file = xfopen("/proc/modules", "r"); + FILE *file = xfopen_for_read("/proc/modules"); printf("Module Size Used by"); check_tainted(); diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index ae7c29cd1..f75dae8a3 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -299,7 +299,7 @@ static FAST_FUNC int fileAction(const char *pathname, static int load_dep_bb(void) { char *line; - FILE *fp = fopen(DEPFILE_BB, "r"); + FILE *fp = fopen_for_read(DEPFILE_BB); if (!fp) return 0; @@ -492,7 +492,7 @@ static int already_loaded(const char *name) char *line; FILE* modules; - modules = xfopen("/proc/modules", "r"); + modules = xfopen_for_read("/proc/modules"); while ((line = xmalloc_fgets(modules)) != NULL) { if (strncmp(line, name, len) == 0 && line[len] == ' ') { free(line); @@ -688,7 +688,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) /* are we lsmod? -> just dump /proc/modules */ if ('l' == applet0) { - xprint_and_close_file(xfopen("/proc/modules", "r")); + xprint_and_close_file(xfopen_for_read("/proc/modules")); return EXIT_SUCCESS; } |