diff options
Diffstat (limited to 'main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch')
| -rw-r--r-- | main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch b/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch index 72518fd514..aa2846a083 100644 --- a/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch +++ b/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch @@ -1,34 +1,32 @@ -From 414005993f9b015b5feb28fa8f823112331f89a3 Mon Sep 17 00:00:00 2001 +From 76997894e631affe0742f380eda7de3898e0556c Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Tue, 1 May 2012 15:09:28 +0200 Subject: [PATCH] unzip: ignore chmod errors so unzipping on FAT works --- - archival/unzip.c | 4 ++-- + archival/unzip.c | 2 +- include/libbb.h | 1 + libbb/make_directory.c | 7 ++++++- - 3 files changed, 9 insertions(+), 3 deletions(-) + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/archival/unzip.c b/archival/unzip.c -index 4fa7293..e60bc82 100644 +index 3c76cda..c1b945a 100644 --- a/archival/unzip.c +++ b/archival/unzip.c -@@ -594,8 +594,8 @@ int unzip_main(int argc, char **argv) +@@ -596,7 +596,7 @@ int unzip_main(int argc, char **argv) printf(" creating: %s\n", dst_fn); } unzip_create_leading_dirs(dst_fn); - if (bb_make_directory(dst_fn, dir_mode, 0)) { -- bb_error_msg_and_die("exiting"); + if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) { -+ xfunc_die(); + xfunc_die(); } } else { - if (!S_ISDIR(stat_buf.st_mode)) { diff --git a/include/libbb.h b/include/libbb.h -index 63d0419..83a1a4d 100644 +index f12800f..5e5c8c7 100644 --- a/include/libbb.h +++ b/include/libbb.h -@@ -331,6 +331,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ +@@ -333,6 +333,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */ FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10, #endif @@ -63,5 +61,5 @@ index 72303e7..7826b90 100644 ret0: flags = 0; -- -1.7.10 +1.7.10.2 |