summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-07-24 14:23:16 +0300
committerTimo Teras <timo.teras@iki.fi>2009-07-24 14:23:33 +0300
commit6092865d85cb915b61a64f1eae4da760343d61fd (patch)
tree2367596ff59d7f1c614717f8ea9f4c51f0107386
parent1c92602172790bbcb75f6083cf53ce7fea25b33a (diff)
downloadapk-tools-6092865d85cb915b61a64f1eae4da760343d61fd.tar.gz
apk-tools-6092865d85cb915b61a64f1eae4da760343d61fd.tar.bz2
apk-tools-6092865d85cb915b61a64f1eae4da760343d61fd.tar.xz
apk-tools-6092865d85cb915b61a64f1eae4da760343d61fd.zip
add, fetch: make handling of special options more logical
-rw-r--r--src/add.c41
-rw-r--r--src/fetch.c44
2 files changed, 44 insertions, 41 deletions
diff --git a/src/add.c b/src/add.c
index c916a2f..003fcfc 100644
--- a/src/add.c
+++ b/src/add.c
@@ -11,7 +11,6 @@
#include <errno.h>
#include <stdio.h>
-#include <zlib.h>
#include "apk_applet.h"
#include "apk_database.h"
#include "apk_state.h"
@@ -41,42 +40,6 @@ static int add_parse(void *ctx, int optch, int optindex, const char *optarg)
return 0;
}
-static int cup(void)
-{
- /* compressed/uncompressed size is 259/1213 */
- static unsigned char z[] = {
- 0x78,0x9c,0x9d,0x94,0x3d,0x8e,0xc4,0x20,0x0c,0x85,0xfb,0x9c,
- 0xc2,0x72,0x43,0x46,0x8a,0x4d,0x3f,0x67,0x89,0x64,0x77,0x2b,
- 0x6d,0xbb,0x6d,0x0e,0x3f,0xc6,0x84,0x4d,0x08,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,0x0e,0x61,0x42,0x3c,0x8b,0xcf,0xc7,0x12,
- 0x22,0x71,0x8b,0x31,0x05,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,0x06,0x8b,0xde,0x6c,0x61,
- 0x70,0xde,0x0e,0xb6,0xed,0xc4,0x43,0x0c,0x56,0x6f,0x8f,0x31,
- 0xd0,0x35,0xb5,0xc7,0x58,0x06,0xff,0x81,0x49,0x84,0xb8,0x0e,
- 0xb1,0xd8,0xc1,0x66,0x31,0x0e,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,0x0c,0x57,0x3b,
- 0xce,0x7c,0x5e,0xe5,0x48,0xd0,0x48,0x01,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,0x09,0x7c,0x7f,
- 0xfd,0xc0,0x8a,0x4e,0xc8,0x55,0xe8,0x12,0xe2,0x9f,0x1a,0xb1,
- 0xb9,0x82,0x52,0x02,0x7a,0xe5,0xf9,0xd9,0x88,0x47,0x79,0x3b,
- 0x46,0x61,0x27,0xf9,0x51,0xb1,0x17,0xb0,0x2c,0x0e,0xd5,0x39,
- 0x2d,0x96,0x25,0x27,0xd6,0xd1,0x3f,0xa5,0x08,0xe1,0x9e,0x4e,
- 0xa7,0xe9,0x03,0xb1,0x0a,0xb6,0x75
- };
- unsigned char buf[1213];
- unsigned long len = sizeof(buf);
-
- uncompress(buf, &len, z, sizeof(z));
- write(STDOUT_FILENO, buf, len);
-
- return 0;
-}
-
static int non_repository_check(struct apk_database *db)
{
if (apk_flags & APK_FORCE)
@@ -104,10 +67,6 @@ static int add_main(void *ctx, int argc, char **argv)
struct apk_dependency virtdep;
int i, r;
- if ((argc > 0) && (apk_verbosity > 1) &&
- (strcmp(argv[0], "coffee") == 0))
- return cup();
-
r = apk_db_open(&db, apk_root, actx->open_flags | APK_OPENF_WRITE);
if (r != 0)
return r;
diff --git a/src/fetch.c b/src/fetch.c
index 8e53b2c..c64590e 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -13,6 +13,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
+#include <zlib.h>
#include "apk_applet.h"
#include "apk_database.h"
@@ -28,6 +29,42 @@ struct fetch_ctx {
const char *outdir;
};
+static int cup(void)
+{
+ /* compressed/uncompressed size is 259/1213 */
+ static unsigned char z[] = {
+ 0x78,0x9c,0x9d,0x94,0x3d,0x8e,0xc4,0x20,0x0c,0x85,0xfb,0x9c,
+ 0xc2,0x72,0x43,0x46,0x8a,0x4d,0x3f,0x67,0x89,0x64,0x77,0x2b,
+ 0x6d,0xbb,0x6d,0x0e,0x3f,0xc6,0x84,0x4d,0x08,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,0x0e,0x61,0x42,0x3c,0x8b,0xcf,0xc7,0x12,
+ 0x22,0x71,0x8b,0x31,0x05,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,0x06,0x8b,0xde,0x6c,0x61,
+ 0x70,0xde,0x0e,0xb6,0xed,0xc4,0x43,0x0c,0x56,0x6f,0x8f,0x31,
+ 0xd0,0x35,0xb5,0xc7,0x58,0x06,0xff,0x81,0x49,0x84,0xb8,0x0e,
+ 0xb1,0xd8,0xc1,0x66,0x31,0x0e,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,0x0c,0x57,0x3b,
+ 0xce,0x7c,0x5e,0xe5,0x48,0xd0,0x48,0x01,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,0x09,0x7c,0x7f,
+ 0xfd,0xc0,0x8a,0x4e,0xc8,0x55,0xe8,0x12,0xe2,0x9f,0x1a,0xb1,
+ 0xb9,0x82,0x52,0x02,0x7a,0xe5,0xf9,0xd9,0x88,0x47,0x79,0x3b,
+ 0x46,0x61,0x27,0xf9,0x51,0xb1,0x17,0xb0,0x2c,0x0e,0xd5,0x39,
+ 0x2d,0x96,0x25,0x27,0xd6,0xd1,0x3f,0xa5,0x08,0xe1,0x9e,0x4e,
+ 0xa7,0xe9,0x03,0xb1,0x0a,0xb6,0x75
+ };
+ unsigned char buf[1213];
+ unsigned long len = sizeof(buf);
+
+ uncompress(buf, &len, z, sizeof(z));
+ write(STDOUT_FILENO, buf, len);
+
+ return 0;
+}
+
static int fetch_parse(void *ctx, int optch, int optindex, const char *optarg)
{
struct fetch_ctx *fctx = (struct fetch_ctx *) ctx;
@@ -132,6 +169,13 @@ static int fetch_main(void *ctx, int argc, char **argv)
struct apk_database db;
int i, j, r;
+ if ((argc > 0) && (strcmp(argv[0], "coffee") == 0)) {
+ if (apk_flags & APK_FORCE)
+ return cup();
+ apk_message("Go and fetch your own coffee.");
+ return 0;
+ }
+
r = apk_db_open(&db, apk_root, APK_OPENF_NO_STATE);
if (r != 0)
return r;