tls: in AES-GCM decoding, avoid memmove

[oweals/busybox.git] / util-linux / fsck_minix.c

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 0eaac17c0f1871562485e3613c6d174d45110b9d..c4612f251a6b049e2e138503c1a32c79218aec67 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -89,12 +89,12 @@
 //config:      bool "fsck_minix"
 //config:      default y
 //config:      help
-//config:        The minix filesystem is a nice, small, compact, read-write filesystem
-//config:        with little overhead. It is not a journaling filesystem however and
-//config:        can experience corruption if it is not properly unmounted or if the
-//config:        power goes off in the middle of a write. This utility allows you to
-//config:        check for and attempt to repair any corruption that occurs to a minix
-//config:        filesystem.
+//config:      The minix filesystem is a nice, small, compact, read-write filesystem
+//config:      with little overhead. It is not a journaling filesystem however and
+//config:      can experience corruption if it is not properly unmounted or if the
+//config:      power goes off in the middle of a write. This utility allows you to
+//config:      check for and attempt to repair any corruption that occurs to a minix
+//config:      filesystem.
 
 //applet:IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
 
@@ -173,7 +173,10 @@ struct globals {
 
        /* Bigger stuff */
        struct termios sv_termios;
-       char superblock_buffer[BLOCK_SIZE];
+       union {
+               char superblock_buffer[BLOCK_SIZE];
+               struct minix_superblock Super;
+       } u;
        char add_zone_ind_blk[BLOCK_SIZE];
        char add_zone_dind_blk[BLOCK_SIZE];
        IF_FEATURE_MINIX2(char add_zone_tind_blk[BLOCK_SIZE];)
@@ -207,7 +210,7 @@ struct globals {
 #define name_depth         (G.name_depth         )
 #define name_component     (G.name_component     )
 #define sv_termios         (G.sv_termios         )
-#define superblock_buffer  (G.superblock_buffer )
+#define superblock_buffer  (G.u.superblock_buffer)
 #define add_zone_ind_blk   (G.add_zone_ind_blk   )
 #define add_zone_dind_blk  (G.add_zone_dind_blk  )
 #define add_zone_tind_blk  (G.add_zone_tind_blk  )
@@ -247,7 +250,7 @@ enum {
 #define Inode1 (((struct minix1_inode *) inode_buffer)-1)
 #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
 
-#define Super (*(struct minix_superblock *)(superblock_buffer))
+#define Super (G.u.Super)
 
 #if ENABLE_FEATURE_MINIX2
 # define ZONES    ((unsigned)(version2 ? Super.s_zones : Super.s_nzones))
@@ -1226,15 +1229,13 @@ void check2(void);
 int fsck_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
 {
-       struct termios tmp;
        int retcode = 0;
 
        xfunc_error_retval = 8;
 
        INIT_G();
 
-       opt_complementary = "=1:ar"; /* one argument; -a assumes -r */
-       getopt32(argv, OPTION_STR);
+       getopt32(argv, "^" OPTION_STR "\0" "=1:ar" /* one arg; -a assumes -r */);
        argv += optind;
        device_name = argv[0];
 
@@ -1271,10 +1272,7 @@ int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
        read_tables();
 
        if (OPT_manual) {
-               tcgetattr(0, &sv_termios);
-               tmp = sv_termios;
-               tmp.c_lflag &= ~(ICANON | ECHO);
-               tcsetattr_stdin_TCSANOW(&tmp);
+               set_termios_to_raw(STDIN_FILENO, &sv_termios, 0);
                termios_set = 1;
        }