diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-06-26 15:35:17 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-06-26 15:35:17 +0200 |
commit | 817a20296fd9e4e8eed095836d7dc28183794247 (patch) | |
tree | 600cc8f51d3d41ae4e893a452d222a7abc504d87 | |
parent | 5cb4f9081f3f6575da052b03cb227a7a488b0a8b (diff) | |
download | busybox-w32-817a20296fd9e4e8eed095836d7dc28183794247.tar.gz busybox-w32-817a20296fd9e4e8eed095836d7dc28183794247.tar.bz2 busybox-w32-817a20296fd9e4e8eed095836d7dc28183794247.zip |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/bb_archive.h | 4 | ||||
-rw-r--r-- | shell/hush.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_vfat.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/bb_archive.h b/include/bb_archive.h index 2ee30f794..d2022336b 100644 --- a/include/bb_archive.h +++ b/include/bb_archive.h | |||
@@ -116,10 +116,10 @@ typedef struct archive_handle_t { | |||
116 | #if ENABLE_FEATURE_AR_CREATE | 116 | #if ENABLE_FEATURE_AR_CREATE |
117 | const char *ar__name; | 117 | const char *ar__name; |
118 | struct archive_handle_t *ar__out; | 118 | struct archive_handle_t *ar__out; |
119 | # if ENABLE_FEATURE_AR_LONG_FILENAMES | 119 | #endif |
120 | #if ENABLE_FEATURE_AR_LONG_FILENAMES | ||
120 | char *ar__long_names; | 121 | char *ar__long_names; |
121 | unsigned ar__long_name_size; | 122 | unsigned ar__long_name_size; |
122 | # endif | ||
123 | #endif | 123 | #endif |
124 | } archive_handle_t; | 124 | } archive_handle_t; |
125 | /* bits in ah_flags */ | 125 | /* bits in ah_flags */ |
diff --git a/shell/hush.c b/shell/hush.c index c77700175..0b36dad80 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -4577,7 +4577,9 @@ static int add_till_closing_bracket(o_string *dest, struct in_str *input, unsign | |||
4577 | # endif | 4577 | # endif |
4578 | end_ch &= (DOUBLE_CLOSE_CHAR_FLAG - 1); | 4578 | end_ch &= (DOUBLE_CLOSE_CHAR_FLAG - 1); |
4579 | 4579 | ||
4580 | #if ENABLE_HUSH_INTERACTIVE | ||
4580 | G.promptmode = 1; /* PS2 */ | 4581 | G.promptmode = 1; /* PS2 */ |
4582 | #endif | ||
4581 | debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode); | 4583 | debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode); |
4582 | 4584 | ||
4583 | while (1) { | 4585 | while (1) { |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 26a919536..92f0e3b1a 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -522,7 +522,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv) | |||
522 | //STORE_LE(boot_blk->reserved2[3], 0,0,0); | 522 | //STORE_LE(boot_blk->reserved2[3], 0,0,0); |
523 | STORE_LE(boot_blk->vi.ext_boot_sign, 0x29); | 523 | STORE_LE(boot_blk->vi.ext_boot_sign, 0x29); |
524 | STORE_LE(boot_blk->vi.volume_id32, volume_id); | 524 | STORE_LE(boot_blk->vi.volume_id32, volume_id); |
525 | strncpy(boot_blk->vi.fs_type, "FAT32 ", sizeof(boot_blk->vi.fs_type)); | 525 | memcpy(boot_blk->vi.fs_type, "FAT32 ", sizeof(boot_blk->vi.fs_type)); |
526 | strncpy(boot_blk->vi.volume_label, volume_label, sizeof(boot_blk->vi.volume_label)); | 526 | strncpy(boot_blk->vi.volume_label, volume_label, sizeof(boot_blk->vi.volume_label)); |
527 | memcpy(boot_blk->boot_code, boot_code, sizeof(boot_code)); | 527 | memcpy(boot_blk->boot_code, boot_code, sizeof(boot_code)); |
528 | STORE_LE(boot_blk->boot_sign, BOOT_SIGN); | 528 | STORE_LE(boot_blk->boot_sign, BOOT_SIGN); |