commit 7e58dc9f6401420832aae2bf2b1101b3df877821
author Allan Zhang <allanzhang@google.com> Mon Jun 22 18:36:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 22 18:36:34 2015 +0000
tree 6f9bd5869405cb60483f469f52ab1b7440b0d8d0
parent e31de102902b4cf298121fe91e916bc498a6442e
parent 449b5133797a30d51f13a7a216a350d51f578204

Merge "Patch ifconfig from toolbox"

ioctl.c

diff --git a/ioctl.c b/ioctl.c
index be0bbd4..c765287 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -86,12 +86,23 @@
         ioctl_argp_save = ioctl_argp = ioctl_args;
         rem = length;
         while(optind < argc) {
-            uint64_t tmp = strtoull(argv[optind], NULL, 0);
+            uint64_t tmp_64 = strtoull(argv[optind], NULL, 0);
+            uint32_t tmp_32 = tmp_64;
             if(rem < arg_size) {
                 fprintf(stderr, "%s: too many arguments\n", argv[0]);
                 exit(1);
             }
-            memcpy(ioctl_argp, &tmp, arg_size);
+            switch (arg_size) {
+            case sizeof(tmp_64):
+              memcpy(ioctl_argp, &tmp_64, sizeof(tmp_64));
+              break;
+            case sizeof(tmp_32):
+              memcpy(ioctl_argp, &tmp_32, sizeof(tmp_32));
+              break;
+            default:
+              fprintf(stderr, "%s: unhandled arg_size\n", argv[0]);
+              exit(1);
+            }
             ioctl_argp += arg_size;
             rem -= arg_size;
             optind++;