From 7f22b32e6359bb1381fc2336b9ec876036eb72a6 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@gmx.de>
Date: Sat, 1 Sep 2012 14:12:29 +0200
Subject: isodate in libc? revert every commit for great justice!

---
 sys/src/cmd/date.c        | 25 ++++++++-----------------
 sys/src/libc/9sys/ctime.c | 47 -----------------------------------------------
 2 files changed, 8 insertions(+), 64 deletions(-)

(limited to 'sys/src')

diff --git a/sys/src/cmd/date.c b/sys/src/cmd/date.c
index 9d6504b3f..fc2ec5af5 100644
--- a/sys/src/cmd/date.c
+++ b/sys/src/cmd/date.c
@@ -1,19 +1,17 @@
 #include <u.h>
 #include <libc.h>
 
-int uflg, nflg, iflg, tflg;
+int uflg, nflg;
 
 void
 main(int argc, char *argv[])
 {
 	ulong now;
-	Tm *tm;
+
 	ARGBEGIN{
 	case 'n':	nflg = 1; break;
 	case 'u':	uflg = 1; break;
-	case 't':	tflg = 1; /* implies -i */
-	case 'i':	iflg = 1; break;
-	default:	fprint(2, "usage: date [-itun] [seconds]\n"); exits("usage");
+	default:	fprint(2, "usage: date [-un] [seconds]\n"); exits("usage");
 	}ARGEND
 
 	if(argc == 1)
@@ -23,17 +21,10 @@ main(int argc, char *argv[])
 
 	if(nflg)
 		print("%ld\n", now);
-	else if(iflg) {
-		tm = uflg ? gmtime(now) : localtime(now);
-		if(tflg)
-			print("%s\n", isotime(tm));
-		else
-			print("%s\n", isodate(tm));
-	} else {
-		if(uflg)
-			print("%s", asctime(gmtime(now)));
-		else
-			print("%s", ctime(now));
-	}
+	else if(uflg)
+		print("%s", asctime(gmtime(now)));
+	else
+		print("%s", ctime(now));
+	
 	exits(0);
 }
diff --git a/sys/src/libc/9sys/ctime.c b/sys/src/libc/9sys/ctime.c
index a99727225..11340ea41 100644
--- a/sys/src/libc/9sys/ctime.c
+++ b/sys/src/libc/9sys/ctime.c
@@ -299,50 +299,3 @@ rd_long(char **f, long *p)
 	*p = l;
 	return 0;
 }
-
-char*
-isodate(Tm *t)
-{
-	static char c[10+14+1]; /* leave room to append isotime */
-
-	ct_numb(c, t->year / 100 + 119);
-	ct_numb(c+2, t->year % 100 + 100);
-	c[4] = '-';
-	ct_numb(c+5, t->mon + 101);
-	c[7] = '-';
-	ct_numb(c+8, t->mday + 100);
-	c[10] = 0;
-	return c;
-}
-
-char*
-isotime(Tm *t)
-{
-	int tz;
-	char *c, *d;
-	d = isodate(t);
-	c = d + 10; /* append to isodate */
-	c[0] = 'T';
-	ct_numb(c+1, t->hour+100);
-	c[3] = ':';
-	ct_numb(c+4, t->min+100);
-	c[6] = ':';
-	ct_numb(c+7, t->sec+100);
-	tz = t->tzoff / 60;
-	if(t->tzoff) {
-		/* localtime */
-		if (t->tzoff > 0) {
-			c[9] = '+';
-		} else {
-			c[9] = '-';
-			tz = -tz;
-		}
-		ct_numb(c+10, tz / 60 + 100);
-		ct_numb(c+12, tz % 60 + 100);
-		c[14] = 0;
-	} else {
-		c[9] = 'Z';
-		c[10] = 0;
-	}
-	return d;
-}
-- 
cgit v1.2.3