aboutsummaryrefslogtreecommitdiff
path: root/bin/gensquashfs/src
diff options
context:
space:
mode:
Diffstat (limited to 'bin/gensquashfs/src')
-rw-r--r--bin/gensquashfs/src/filemap_xattr.c8
-rw-r--r--bin/gensquashfs/src/fstree_from_file.c6
-rw-r--r--bin/gensquashfs/src/mkfs.c6
3 files changed, 14 insertions, 6 deletions
diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c
index 89624f4..8843c46 100644
--- a/bin/gensquashfs/src/filemap_xattr.c
+++ b/bin/gensquashfs/src/filemap_xattr.c
@@ -159,8 +159,12 @@ xattr_open_map_file(const char *path) {
struct XattrMap *map;
size_t line_num = 1;
char *p = NULL;
- sqfs_istream_t *file = istream_open_file(path);
- if (file == NULL) {
+ sqfs_istream_t *file = NULL;
+ int ret;
+
+ ret = istream_open_file(&file, path);
+ if (ret) {
+ sqfs_perror(path, NULL, ret);
return NULL;
}
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index efb5d43..f392b34 100644
--- a/bin/gensquashfs/src/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
@@ -313,9 +313,11 @@ int fstree_from_file(fstree_t *fs, const char *filename, const char *basepath)
sqfs_istream_t *fp;
int ret;
- fp = istream_open_file(filename);
- if (fp == NULL)
+ ret = istream_open_file(&fp, filename);
+ if (ret) {
+ sqfs_perror(filename, NULL, ret);
return -1;
+ }
ret = fstree_from_file_stream(fs, fp, basepath);
diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c
index cdef359..de291fa 100644
--- a/bin/gensquashfs/src/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
@@ -160,9 +160,11 @@ int main(int argc, char **argv)
}
if (opt.sortfile != NULL) {
- sortfile = istream_open_file(opt.sortfile);
- if (sortfile == NULL)
+ int ret = istream_open_file(&sortfile, opt.sortfile);
+ if (ret) {
+ sqfs_perror(opt.sortfile, NULL, ret);
goto out;
+ }
}
if (opt.infile == NULL) {