diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
| commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
| tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /e2fsprogs | |
| parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
| parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
| download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/e2fs_lib.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/fsck.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c index 3b776bc97..d0cacf14c 100644 --- a/e2fsprogs/e2fs_lib.c +++ b/e2fsprogs/e2fs_lib.c | |||
| @@ -159,7 +159,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f | |||
| 159 | 159 | ||
| 160 | #if !ENABLE_PLATFORM_MINGW32 | 160 | #if !ENABLE_PLATFORM_MINGW32 |
| 161 | /* Print file attributes on an ext2 file system */ | 161 | /* Print file attributes on an ext2 file system */ |
| 162 | const uint32_t e2attr_flags_value[] = { | 162 | const uint32_t e2attr_flags_value[] ALIGN4 = { |
| 163 | #ifdef ENABLE_COMPRESSION | 163 | #ifdef ENABLE_COMPRESSION |
| 164 | EXT2_COMPRBLK_FL, | 164 | EXT2_COMPRBLK_FL, |
| 165 | EXT2_DIRTY_FL, | 165 | EXT2_DIRTY_FL, |
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index fc53a9043..96c1e51e0 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c | |||
| @@ -480,7 +480,7 @@ static int wait_one(int flags) | |||
| 480 | * time to set up the signal handler | 480 | * time to set up the signal handler |
| 481 | */ | 481 | */ |
| 482 | if (inst2->start_time >= time(NULL) - 1) | 482 | if (inst2->start_time >= time(NULL) - 1) |
| 483 | sleep(1); | 483 | sleep1(); |
| 484 | kill(inst2->pid, SIGUSR1); | 484 | kill(inst2->pid, SIGUSR1); |
| 485 | inst2->flags |= FLAG_PROGRESS; | 485 | inst2->flags |= FLAG_PROGRESS; |
| 486 | break; | 486 | break; |