diff options
author | Ron Yorston <rmy@pobox.com> | 2018-04-02 09:24:14 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-04-02 09:24:14 +0100 |
commit | 34a68d327b42c3c700e84cd475496985782290b1 (patch) | |
tree | 99bfe59cca420d26f01e81a7f41763f71b44d22c /archival/libarchive | |
parent | aff3c5bd7b6bdcfb97f63153ab839c5f55f16a12 (diff) | |
parent | e84212f8346741a2d4a04b40639c44fe519cf5a7 (diff) | |
download | busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.tar.gz busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.tar.bz2 busybox-w32-34a68d327b42c3c700e84cd475496985782290b1.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'archival/libarchive')
-rw-r--r-- | archival/libarchive/data_extract_to_command.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c index 1114a95cb..0fcabb4a9 100644 --- a/archival/libarchive/data_extract_to_command.c +++ b/archival/libarchive/data_extract_to_command.c | |||
@@ -37,7 +37,7 @@ static const char *const tar_var[] = { | |||
37 | static void xputenv(char *str) | 37 | static void xputenv(char *str) |
38 | { | 38 | { |
39 | if (putenv(str)) | 39 | if (putenv(str)) |
40 | bb_error_msg_and_die(bb_msg_memory_exhausted); | 40 | bb_die_memory_exhausted(); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void str2env(char *env[], int idx, const char *str) | 43 | static void str2env(char *env[], int idx, const char *str) |