Merge branch 'busybox' into merge

2 files changed, 20 insertions, 4 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index a3c9ababf..a704ca99b 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -203,6 +203,7 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
 }
 
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
 static int clear_O_DIRECT(int fd)
 {
         if (errno == EINVAL) {
@@ -214,6 +215,7 @@ static int clear_O_DIRECT(int fd)
         }
         return 0;
 }
+# endif
 #endif
 
 static ssize_t dd_read(void *ibuf, size_t ibs)
@@ -228,8 +230,10 @@ static ssize_t dd_read(void *ibuf, size_t ibs)
 #endif
                 n = safe_read(ifd, ibuf, ibs);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
         if (n < 0 && (G.flags & FLAG_IDIRECT) && clear_O_DIRECT(ifd))
                 goto read_again;
+# endif
 #endif
         return n;
 }
@@ -242,8 +246,10 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
  IF_FEATURE_DD_IBS_OBS(write_again:)
         n = full_write(ofd, buf, len);
 #if ENABLE_FEATURE_DD_IBS_OBS
+# ifdef O_DIRECT
         if (n < 0 && (G.flags & FLAG_ODIRECT) && clear_O_DIRECT(ofd))
                 goto write_again;
+# endif
 #endif
 
 #if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
@@ -506,8 +512,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         if (infile) {
                 int iflag = O_RDONLY;
 #if ENABLE_FEATURE_DD_IBS_OBS
-                if (G.flags & FLAG_IDIRECT)
+                if (G.flags & FLAG_IDIRECT) {
+# ifdef O_DIRECT
                         iflag |= O_DIRECT;
+# else
+                        bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+                }
 #endif
                 xmove_fd(MINGW_SPECIAL(xopen)(infile, iflag), ifd);
 #if ENABLE_PLATFORM_MINGW32
@@ -524,8 +535,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 if (G.flags & FLAG_APPEND)
                         oflag |= O_APPEND;
 #if ENABLE_FEATURE_DD_IBS_OBS
-                if (G.flags & FLAG_ODIRECT)
+                if (G.flags & FLAG_ODIRECT) {
+# ifdef O_DIRECT
                         oflag |= O_DIRECT;
+# else
+                        bb_error_msg_and_die("O_DIRECT not supported on this platform");
+# endif
+                }
 #endif
                 xmove_fd(xopen(outfile, oflag), ofd);
 
diff --git a/coreutils/mv.c b/coreutils/mv.c
index fd2422683..cf6169a1e 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -71,9 +71,9 @@ int mv_main(int argc, char **argv)
                         "no-target-directory\0" No_argument "T"
                         "target-directory\0" Required_argument "t"
                         IF_FEATURE_VERBOSE(
-                        "verbose\0"     No_argument "v",
-                        &last
+                        "verbose\0"     No_argument "v"
                         )
+                        , &last
         );
         argc -= optind;
         argv += optind;