v1.5 branch refresh based upon upstream master @ c8677ca89e53e3be7988d54280fce166cc894a7e

[librecmc/librecmc.git] / package / utils / busybox / patches / 250-date-k-flag.patch

diff --git a/package/utils/busybox/patches/250-date-k-flag.patch b/package/utils/busybox/patches/250-date-k-flag.patch
index b2681a17f995325c44b313536d1529ccb62cb37a..3a85312e2f19fc66369b66b0688df66f1e6587cc 100644 (file)
--- a/package/utils/busybox/patches/250-date-k-flag.patch
+++ b/package/utils/busybox/patches/250-date-k-flag.patch
@@ -31,8 +31,8 @@
 +      OPT_HINT      = (1 << 7) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
  };
  
- static void maybe_set_utc(int opt)
-@@ -168,12 +169,15 @@ static const char date_longopts[] ALIGN1
+ #if ENABLE_LONG_OPTS
+@@ -162,6 +163,7 @@ static const char date_longopts[] ALIGN1
        /*      "universal\0" No_argument       "u" */
                "date\0"      Required_argument "d"
                "reference\0" Required_argument "r"
@@ -40,6 +40,7 @@
                ;
  #endif
  
+@@ -181,6 +183,8 @@ static void maybe_set_utc(int opt)
  int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int date_main(int argc UNUSED_PARAM, char **argv)
  {
@@ -48,16 +49,16 @@
        struct timespec ts;
        struct tm tm_time;
        char buf_fmt_dt2str[64];
-@@ -188,7 +192,7 @@ int date_main(int argc UNUSED_PARAM, cha
-       opt_complementary = "d--s:s--d"
-               IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
-       IF_LONG_OPTS(applet_long_options = date_longopts;)
--      opt = getopt32(argv, "Rs:ud:r:"
-+      opt = getopt32(argv, "Rs:ud:r:k"
-                       IF_FEATURE_DATE_ISOFMT("I::D:"),
-                       &date_str, &date_str, &filename
-                       IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
-@@ -245,6 +249,31 @@ int date_main(int argc UNUSED_PARAM, cha
+@@ -193,7 +197,7 @@ int date_main(int argc UNUSED_PARAM, cha
+       char *isofmt_arg = NULL;
+ 
+       opt = getopt32long(argv, "^"
+-                      "Rs:ud:r:"
++                      "Rs:ud:r:k"
+                       IF_FEATURE_DATE_ISOFMT("I::D:")
+                       "\0"
+                       "d--s:s--d"
+@@ -256,6 +260,31 @@ int date_main(int argc UNUSED_PARAM, cha
        if (*argv)
                bb_show_usage();