Merge branch 'busybox' into merge

1 files changed, 7 insertions, 3 deletions

diff --git a/coreutils/sort.c b/coreutils/sort.c
index a1625fc9c..1cb4c3e3f 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -225,7 +225,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                 y = *(char **)yarg;
 #endif
                 /* Perform actual comparison */
-                switch (flags & 7) {
+                switch (flags & (FLAG_n | FLAG_M | FLAG_g)) {
                 default:
                         bb_error_msg_and_die("unknown sort type");
                         break;
@@ -302,10 +302,14 @@ static int compare_keys(const void *xarg, const void *yarg)
         } /* for */
 
         /* Perform fallback sort if necessary */
-        if (!retval && !(option_mask32 & FLAG_s))
+        if (!retval && !(option_mask32 & FLAG_s)) {
                 retval = strcmp(*(char **)xarg, *(char **)yarg);
+                flags = option_mask32;
+        }
+
+        if (flags & FLAG_r)
+                return -retval;
 
-        if (flags & FLAG_r) return -retval;
         return retval;
 }