diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-27 16:32:53 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-27 16:32:53 +0000 |
| commit | f3c5e8bc316af658260369fc2d4d1270c1f609b4 (patch) | |
| tree | a97ee827a5add7772c7ef41c4a5e13d47b43d467 | |
| parent | 96c104a61c9a75c478eb6e830653a830d72fe8fb (diff) | |
| download | busybox-w32-FRP-4621-gf3c5e8bc3.tar.gz busybox-w32-FRP-4621-gf3c5e8bc3.tar.bz2 busybox-w32-FRP-4621-gf3c5e8bc3.zip | |
Fix POSIX buildFRP-4621-gf3c5e8bc3
Commit e6238530e (cpio: code shrink with !FEATURE_EXTRA_FILE_DATA)
broke the POSIX build by incorrectly excluding chunks of code.
| -rw-r--r-- | archival/cpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/cpio.c b/archival/cpio.c index d6564de59..a642bbc35 100644 --- a/archival/cpio.c +++ b/archival/cpio.c | |||
| @@ -275,7 +275,7 @@ static NOINLINE int cpio_o(void) | |||
| 275 | if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode))) | 275 | if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode))) |
| 276 | st.st_size = 0; /* paranoia */ | 276 | st.st_size = 0; /* paranoia */ |
| 277 | 277 | ||
| 278 | #if ENABLE_FEATURE_EXTRA_FILE_DATA | 278 | #if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA |
| 279 | /* Store hardlinks for later processing, dont output them */ | 279 | /* Store hardlinks for later processing, dont output them */ |
| 280 | if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { | 280 | if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { |
| 281 | struct name_s *n; | 281 | struct name_s *n; |
| @@ -347,7 +347,7 @@ static NOINLINE int cpio_o(void) | |||
| 347 | } | 347 | } |
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | #if ENABLE_FEATURE_EXTRA_FILE_DATA | 350 | #if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA |
| 351 | #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO | 351 | #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO |
| 352 | if (option_mask32 & OPT_IGNORE_DEVNO) | 352 | if (option_mask32 & OPT_IGNORE_DEVNO) |
| 353 | st.st_dev = st.st_rdev = 0; | 353 | st.st_dev = st.st_rdev = 0; |