summaryrefslogtreecommitdiff
path: root/modutils/modprobe-small.c
diff options
context:
space:
mode:
authorDenys Vlasenko2011-01-16 20:00:24 +0100
committerDenys Vlasenko2011-01-16 20:00:24 +0100
commit12d97b66805f87e535962963e858fc2422ffdbc7 (patch)
tree10836c6158a05a505d8a7cb83313cc908e837a50 /modutils/modprobe-small.c
parent2a1571bfa003233470140a17be4ae4f0239f5a24 (diff)
downloadbusybox-12d97b66805f87e535962963e858fc2422ffdbc7.zip
busybox-12d97b66805f87e535962963e858fc2422ffdbc7.tar.gz
apply post-1.18.1 patches, bump version to 1.18.21_18_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/modprobe-small.c')
-rw-r--r--modutils/modprobe-small.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index ec3ddfb..f4f17e7 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -844,13 +844,15 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
void *map;
len = MAXINT(ssize_t);
- map = xmalloc_xopen_read_close(*argv, &len);
+ map = xmalloc_open_zipped_read_close(*argv, &len);
if (init_module(map, len,
IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
- ) != 0)
+ ) != 0
+ ) {
bb_error_msg_and_die("can't insert '%s': %s",
*argv, moderror(errno));
+ }
return 0;
}