From 9b0c0a20539d7a4a084ab4e27597783d0f12e0f1 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Mon, 25 May 2009 16:55:51 +0300
Subject: Revert "add: replace coffe-cup with starwars"

This reverts commit 0906a1c7de37ba54f29e9dbabbbd5ea069258cef.

Conflicts:

	src/add.c
---
 src/add.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/apk.c |  2 +-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/add.c b/src/add.c
index f75a4b7..d5dfb23 100644
--- a/src/add.c
+++ b/src/add.c
@@ -11,7 +11,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <zlib.h>
 #include "apk_applet.h"
 #include "apk_database.h"
 #include "apk_state.h"
@@ -49,6 +49,50 @@ static void md5_str(const char *str, md5sum_t csum)
 	md5_finish(&ctx, csum);
 }
 
+static int cup(void)
+{
+/* compressed/uncompressed size is 259/1213 */
+	static unsigned char z[] =  {
+	0x78,0x9c,0x9d,0x94,0x3d,0x8e,0xc4,0x20,
+	0xc,0x85,0xfb,0x9c,0xc2,0x72,0x43,0x46,
+	0x8a,0x4d,0x3f,0x67,0x89,0x64,0x77,0x2b,
+	0x6d,0xbb,0x6d,0xe,0x3f,0xc6,0x84,0x4d,
+	0x8,0x84,0x55,0xd6,0xa2,0xe0,0xef,0x7b,
+	0x36,0xe1,0x11,0x80,0x6e,0xcc,0x53,0x7f,
+	0x3e,0xc5,0xeb,0xcf,0x1d,0x20,0x22,0xcc,
+	0x3c,0x53,0x8e,0x17,0xd9,0x80,0x6d,0xee,
+	0xe,0x61,0x42,0x3c,0x8b,0xcf,0xc7,0x12,
+	0x22,0x71,0x8b,0x31,0x5,0xd5,0xb0,0x11,
+	0x4b,0xa7,0x32,0x2f,0x80,0x69,0x6b,0xb0,
+	0x98,0x40,0xe2,0xcd,0xba,0x6a,0xba,0xe4,
+	0x65,0xed,0x61,0x23,0x44,0xb5,0x95,0x6,
+	0x8b,0xde,0x6c,0x61,0x70,0xde,0xe,0xb6,
+	0xed,0xc4,0x43,0xc,0x56,0x6f,0x8f,0x31,
+	0xd0,0x35,0xb5,0xc7,0x58,0x6,0xff,0x81,
+	0x49,0x84,0xb8,0xe,0xb1,0xd8,0xc1,0x66,
+	0x31,0xe,0x46,0x5c,0x43,0xc9,0xef,0xe5,
+	0xdc,0x63,0xb1,0xdc,0x67,0x6d,0x31,0xb3,
+	0xc9,0x69,0x74,0x87,0xc7,0xa3,0x1b,0x6a,
+	0xb3,0xbd,0x2f,0x3b,0xd5,0xc,0x57,0x3b,
+	0xce,0x7c,0x5e,0xe5,0x48,0xd0,0x48,0x1,
+	0x92,0x49,0x8b,0xf7,0xfc,0x58,0x67,0xb3,
+	0xf7,0x14,0x20,0x5c,0x4c,0x9e,0xcc,0xeb,
+	0x78,0x7e,0x64,0xa6,0xa1,0xf5,0xb2,0x70,
+	0x38,0x9,0x7c,0x7f,0xfd,0xc0,0x8a,0x4e,
+	0xc8,0x55,0xe8,0x12,0xe2,0x9f,0x1a,0xb1,
+	0xb9,0x82,0x52,0x2,0x7a,0xe5,0xf9,0xd9,
+	0x88,0x47,0x79,0x3b,0x46,0x61,0x27,0xf9,
+	0x51,0xb1,0x17,0xb0,0x2c,0xe,0xd5,0x39,
+	0x2d,0x96,0x25,0x27,0xd6,0xd1,0x3f,0xa5,
+	0x8,0xe1,0x9e,0x4e,0xa7,0xe9,0x3,0xb1,
+	0xa,0xb6,0x75,};
+	unsigned char buf[1213];
+	unsigned long len = 1213; //sizeof(buf);
+	uncompress(buf, &len, z, sizeof(z));
+	write(STDOUT_FILENO, buf, len);
+	return 0;
+}
+
 	
 static int add_main(void *ctx, int argc, char **argv)
 {
@@ -61,8 +105,8 @@ static int add_main(void *ctx, int argc, char **argv)
 	int i, r;
 
 	if ((argc > 0) && (apk_verbosity > 1) && 
-	    (strcmp(argv[0], "starwars") == 0))
-		return system("telnet towel.blinkenlights.nl");
+	    (strcmp(argv[0], "coffee") == 0))
+		return cup();
 
 	r = apk_db_open(&db, apk_root, actx->open_flags | APK_OPENF_WRITE);
 	if (r != 0)
diff --git a/src/apk.c b/src/apk.c
index bbee041..d52e3a2 100644
--- a/src/apk.c
+++ b/src/apk.c
@@ -55,7 +55,7 @@ int usage(void)
 		printf("    apk %s %s\n",
 		       applet->name, applet->usage);
 	}
-	printf("\n");
+	printf("\nThis apk has coffee making abilities.\n\n");
 
 	return 1;
 }
-- 
cgit v1.2.3