diff options
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/devname.c | 6 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/save.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 4 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/test_io.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/mke2fs.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/devname.c b/e2fsprogs/old_e2fsprogs/blkid/devname.c index 97d1c3548..5b9e48f13 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/devname.c +++ b/e2fsprogs/old_e2fsprogs/blkid/devname.c @@ -152,7 +152,7 @@ static dev_t lvm_get_devno(const char *lvm_device) dev_t ret = 0; DBG(DEBUG_DEVNAME, printf("opening %s\n", lvm_device)); - if ((lvf = fopen(lvm_device, "r")) == NULL) { + if ((lvf = fopen_for_read(lvm_device)) == NULL) { DBG(DEBUG_DEVNAME, printf("%s: (%d) %s\n", lvm_device, errno, strerror(errno))); return 0; @@ -233,7 +233,7 @@ evms_probe_all(blkid_cache cache) FILE *procpt; char device[110]; - procpt = fopen(PROC_EVMS_VOLUMES, "r"); + procpt = fopen_for_read(PROC_EVMS_VOLUMES); if (!procpt) return 0; while (fgets(line, sizeof(line), procpt)) { @@ -282,7 +282,7 @@ int blkid_probe_all(blkid_cache cache) lvm_probe_all(cache); #endif - proc = fopen(PROC_PARTITIONS, "r"); + proc = fopen_for_read(PROC_PARTITIONS); if (!proc) return -BLKID_ERR_PROC; diff --git a/e2fsprogs/old_e2fsprogs/blkid/save.c b/e2fsprogs/old_e2fsprogs/blkid/save.c index cdbaabcb1..3600260e2 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/save.c +++ b/e2fsprogs/old_e2fsprogs/blkid/save.c @@ -102,7 +102,7 @@ int blkid_flush_cache(blkid_cache cache) } if (!file) { - file = fopen(filename, "w"); + file = fopen_for_write(filename); opened = filename; } diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index 4887a57d7..7cb1227db 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c @@ -12672,7 +12672,7 @@ static int is_on_batt(void) unsigned int acflag; struct dirent* de; - f = fopen("/proc/apm", "r"); + f = fopen_for_read("/proc/apm"); if (f) { if (fscanf(f, "%s %s %s %x", tmp, tmp, tmp, &acflag) != 4) acflag = 1; @@ -12686,7 +12686,7 @@ static int is_on_batt(void) continue; snprintf(fname, 80, "/proc/acpi/ac_adapter/%s/state", de->d_name); - f = fopen(fname, "r"); + f = fopen_for_read(fname); if (!f) continue; if (fscanf(f, "%s %s", tmp2, tmp) != 2) diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c b/e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c index d943f1185..7f24f9ba8 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ismounted.c @@ -249,7 +249,7 @@ static int is_swap_device(const char *file) file_dev = st_buf.st_rdev; #endif /* __GNU__ */ - if (!(f = fopen("/proc/swaps", "r"))) + if (!(f = fopen_for_read("/proc/swaps"))) return 0; /* Skip the first line */ fgets(buf, sizeof(buf), f); diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/test_io.c b/e2fsprogs/old_e2fsprogs/ext2fs/test_io.c index bd74225c0..3d40d9a97 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/test_io.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/test_io.c @@ -180,7 +180,7 @@ static errcode_t test_open(const char *name, int flags, io_channel *channel) data->outfile = NULL; if ((value = getenv("TEST_IO_LOGFILE")) != NULL) - data->outfile = fopen(value, "w"); + data->outfile = fopen_for_write(value); if (!data->outfile) data->outfile = stderr; diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c index e16fe93e8..852c249b1 100644 --- a/e2fsprogs/old_e2fsprogs/mke2fs.c +++ b/e2fsprogs/old_e2fsprogs/mke2fs.c @@ -225,7 +225,7 @@ static void read_bb_file(ext2_filsys fs, badblocks_list *bb_list, FILE *f; errcode_t retval; - f = xfopen(bad_blocks_file, "r"); + f = xfopen_for_read(bad_blocks_file); retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); fclose (f); mke2fs_error_msg_and_die(retval, "read bad blocks from list"); |