diff options
| -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 { #if ENABLE_FEATURE_AR_CREATE const char *ar__name; struct archive_handle_t *ar__out; -# if ENABLE_FEATURE_AR_LONG_FILENAMES +#endif +#if ENABLE_FEATURE_AR_LONG_FILENAMES char *ar__long_names; unsigned ar__long_name_size; -# endif #endif } archive_handle_t; /* 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 # endif end_ch &= (DOUBLE_CLOSE_CHAR_FLAG - 1); +#if ENABLE_HUSH_INTERACTIVE G.promptmode = 1; /* PS2 */ +#endif debug_printf_prompt("%s promptmode=%d\n", __func__, G.promptmode); 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) //STORE_LE(boot_blk->reserved2[3], 0,0,0); STORE_LE(boot_blk->vi.ext_boot_sign, 0x29); STORE_LE(boot_blk->vi.volume_id32, volume_id); - strncpy(boot_blk->vi.fs_type, "FAT32 ", sizeof(boot_blk->vi.fs_type)); + memcpy(boot_blk->vi.fs_type, "FAT32 ", sizeof(boot_blk->vi.fs_type)); strncpy(boot_blk->vi.volume_label, volume_label, sizeof(boot_blk->vi.volume_label)); memcpy(boot_blk->boot_code, boot_code, sizeof(boot_code)); STORE_LE(boot_blk->boot_sign, BOOT_SIGN); |