X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F911-date-k-flag.patch;h=c55ee233697dfe33147e60a73c79fcb03fb9be80;hp=71f2af5c9b257924c7d632dd93e4f80519334198;hb=44b1688e6c7b4f16f7165fbd560e1183aef69090;hpb=bc8fe9b40fdd0817bad2b7ec7664e8eeaa97e1f5

diff --git a/package/busybox/patches/911-date-k-flag.patch b/package/busybox/patches/911-date-k-flag.patch
index 71f2af5c9b..c55ee23369 100644
--- a/package/busybox/patches/911-date-k-flag.patch
+++ b/package/busybox/patches/911-date-k-flag.patch
@@ -1,6 +1,5 @@
-diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
---- busybox-1.19.4/coreutils/date.c	2012-02-04 20:24:55.000000000 +0100
-+++ busybox-1.19.4.new/coreutils/date.c	2012-11-23 16:48:21.945200539 +0100
+--- a/coreutils/date.c
++++ b/coreutils/date.c
 @@ -123,6 +123,7 @@
  //usage:	IF_FEATURE_DATE_ISOFMT(
  //usage:     "\n	-D FMT		Use FMT for -d TIME conversion"
@@ -17,7 +16,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
  #if ENABLE_FEATURE_DATE_NANO
  # include <sys/syscall.h>
  #endif
-@@ -145,8 +147,9 @@
+@@ -145,8 +147,9 @@ enum {
  	OPT_UTC       = (1 << 2), /* u */
  	OPT_DATE      = (1 << 3), /* d */
  	OPT_REFERENCE = (1 << 4), /* r */
@@ -29,7 +28,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
  };
  
  static void maybe_set_utc(int opt)
-@@ -164,12 +167,15 @@
+@@ -164,12 +167,15 @@ static const char date_longopts[] ALIGN1
  	/*	"universal\0" No_argument       "u" */
  		"date\0"      Required_argument "d"
  		"reference\0" Required_argument "r"
@@ -45,7 +44,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
  	struct timespec ts;
  	struct tm tm_time;
  	char buf_fmt_dt2str[64];
-@@ -184,7 +190,7 @@
+@@ -184,7 +190,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;)
@@ -54,7 +53,7 @@ diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
  			IF_FEATURE_DATE_ISOFMT("I::D:"),
  			&date_str, &date_str, &filename
  			IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
-@@ -241,6 +247,31 @@
+@@ -241,6 +247,31 @@ int date_main(int argc UNUSED_PARAM, cha
  	if (*argv)
  		bb_show_usage();