ntpd: remove some code which is at best unneeded and at worst wrong

[oweals/busybox.git] / networking / ping.c

diff --git a/networking/ping.c b/networking/ping.c
index 0ca41b9fab450c931b65f94f33ac1019f5a8d291..4e770bdbdf5bc26c5fa82b30052a9a811d69080f 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -690,7 +690,8 @@ static void ping6(len_and_sockaddr *lsa)
                         /* don't check len - we trust the kernel: */
                         /* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */
                        ) {
-                               hoplimit = *(int*)CMSG_DATA(mp);
+                               /*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */
+                               move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
                        }
                }
                unpack6(packet, c, /*&from,*/ hoplimit);
@@ -726,7 +727,7 @@ static int common_ping_main(int opt, char **argv)
 
        /* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
        opt_complementary = "=1:q--v:v--q:c+:w+:W+";
-       opt = getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+       opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
        if (opt & OPT_s)
                datalen = xatou16(str_s); // -s
        if (opt & OPT_I) { // -I