X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbuckettool.c;h=76b8fc37c21f5586074490981ecee352eefbf23a;hb=e828732528e0ed88973dd18f2dee97a42c0b4e59;hp=179e3d98ea67e10844be6dfe4b33a8f94ed7d844;hpb=2cbdeacdc8f0fb3f4252c72a24407afba5788a6b;p=libucw.git diff --git a/lib/buckettool.c b/lib/buckettool.c index 179e3d98..76b8fc37 100644 --- a/lib/buckettool.c +++ b/lib/buckettool.c @@ -1,7 +1,8 @@ /* * Sherlock Library -- Bucket Manipulation Tool * - * (c) 2001 Martin Mares + * (c) 2001--2004 Martin Mares + * (c) 2004 Robert Spalek * * This software may be freely distributed and used according to the terms * of the GNU Lesser General Public License. @@ -12,6 +13,11 @@ #include "lib/fastbuf.h" #include "lib/lfs.h" #include "lib/conf.h" +#include "lib/mempool.h" +#include "lib/object.h" +#include "lib/lizard.h" +#include "lib/bbuf.h" +#include "lib/ff-utf8.h" #include #include @@ -20,6 +26,8 @@ #include static int verbose; +static struct mempool *pool; +static struct buck2obj_buf *buck_buf; static void help(void) @@ -39,6 +47,7 @@ CF_USAGE -f\t\taudit bucket file structure\n\ -F\t\taudit and fix bucket file structure\n\ -q\t\tquick check of bucket file consistency\n\ +-r\t\tdo not parse V33 buckets, but print the raw content\n\ -s\t\tshake down bucket file (without updating other structures!!!)\n\ -v\t\tbe verbose\n\ "); @@ -82,10 +91,34 @@ delete(char *id) obuck_cleanup(); } +static inline void +dump_oattrs(struct fastbuf *out, struct oattr *a) +{ + for (; a; a = a->same) + bprintf(out, "%c%s\n", a->attr, a->val); +} + +static void +dump_parsed_bucket(struct fastbuf *out, struct obuck_header *h, struct fastbuf *b) +{ + struct odes *o_hdr, *o_body; + mp_flush(pool); + o_hdr = obj_new(pool); + o_body = obj_new(pool); + if (buck2obj_parse(buck_buf, h->type, h->length, b, o_hdr, NULL, o_body) < 0) + bprintf(out, ".Cannot parse bucket %x of type %x and length %d: %m\n", h->oid, h->type, h->length); + else + { + dump_oattrs(out, o_hdr->attrs); + bputc(out, '\n'); + dump_oattrs(out, o_body->attrs); + } +} + static void extract(char *id) { - struct fastbuf *b; + struct fastbuf *b, *out; byte buf[1024]; int l; struct obuck_header h; @@ -93,10 +126,17 @@ extract(char *id) h.oid = parse_id(id); obuck_init(0); obuck_find_by_oid(&h); + out = bfdopen_shared(1, 65536); b = obuck_fetch(); - while ((l = bread(b, buf, sizeof(buf)))) - fwrite(buf, 1, l, stdout); + if (h.type < BUCKET_TYPE_V33 || !buck_buf) + { + while ((l = bread(b, buf, sizeof(buf)))) + bwrite(out, buf, l); + } + else + dump_parsed_bucket(out, &h, b); bclose(b); + bclose(out); obuck_cleanup(); } @@ -108,24 +148,74 @@ insert(byte *arg) struct obuck_header h; byte *e; u32 type; + bb_t lizard_buf, compressed_buf; + bb_init(&lizard_buf); + bb_init(&compressed_buf); if (!arg) type = BUCKET_TYPE_PLAIN; else if (sscanf(arg, "%x", &type) != 1) die("Type `%s' is not a hexadecimal number"); + if (type < 10) + type += BUCKET_TYPE_PLAIN; + attr_set_type(type); in = bfdopen_shared(0, 4096); obuck_init(1); do { + uns lizard_filled = 0; + uns in_body = 0; b = NULL; - while ((e = bgets(in, buf, sizeof(buf))) && buf[0]) + while ((e = bgets(in, buf, sizeof(buf)))) { - *e++ = '\n'; + if (!buf[0]) + { + if (in_body || type < BUCKET_TYPE_V30) + break; + in_body = 1; + } if (!b) b = obuck_create(type); - bwrite(b, buf, e-buf); + if (in_body == 1) + { + bputc(b, 0); + in_body = 2; + } + else if (type <= BUCKET_TYPE_V33 || !in_body) + { + bput_attr(b, buf[0], buf+1, e-buf-1); + } + else + { + ASSERT(BUCKET_TYPE_V33_LIZARD); + uns want_len = lizard_filled + (e-buf) + 6 + LIZARD_NEEDS_CHARS; // +6 is the maximum UTF-8 length + bb_grow(&lizard_buf, want_len); + byte *ptr = lizard_buf.ptr + lizard_filled; + ptr = put_attr(ptr, buf[0], buf+1, e-buf-1); + lizard_filled = ptr - lizard_buf.ptr; + } } + if (in_body && type == BUCKET_TYPE_V33_LIZARD) + { + bputl(b, lizard_filled +#if 0 //TEST error resilience: write wrong length + +1 +#endif + ); + bputl(b, adler32(lizard_buf.ptr, lizard_filled) +#if 0 //TEST error resilience: write wrong checksum + +1 +#endif + ); + uns want_len = lizard_filled * LIZARD_MAX_MULTIPLY + LIZARD_MAX_ADD; + bb_grow(&compressed_buf, want_len); + want_len = lizard_compress(lizard_buf.ptr, lizard_filled, compressed_buf.ptr); +#if 0 //TEST error resilience: tamper the compressed data by removing EOF + compressed_buf[want_len-1] = 1; +#endif + bwrite(b, compressed_buf.ptr, want_len); + } if (b) { obuck_create_end(b, &h); @@ -133,6 +223,8 @@ insert(byte *arg) } } while (e); + bb_done(&lizard_buf); + bb_done(&compressed_buf); obuck_cleanup(); bclose(in); } @@ -143,21 +235,26 @@ cat(void) struct obuck_header h; struct fastbuf *b, *out; byte buf[1024]; - int l, lf; obuck_init(0); out = bfdopen_shared(1, 65536); while (b = obuck_slurp_pool(&h)) { bprintf(out, "### %08x %6d %08x\n", h.oid, h.length, h.type); - lf = 1; - while ((l = bread(b, buf, sizeof(buf)))) + if (h.type < BUCKET_TYPE_V33 || !buck_buf) + { + int lf = 1, l; + while ((l = bread(b, buf, sizeof(buf)))) { bwrite(out, buf, l); lf = (buf[l-1] == '\n'); } - if (!lf) - bprintf(out, "\n# \n"); + if (!lf) + bprintf(out, "\n# \n"); + } + else + dump_parsed_bucket(out, &h, b); + bputc(out, '\n'); } bclose(out); obuck_cleanup(); @@ -287,14 +384,17 @@ main(int argc, char **argv) { int i, op; char *arg = NULL; + uns raw = 0; log_init(NULL); op = 0; - while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:i::cfFqsv", CF_NO_LONG_OPTS, NULL)) != -1) + while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:i::cfFqrsv", CF_NO_LONG_OPTS, NULL)) != -1) if (i == '?' || op) help(); else if (i == 'v') verbose++; + else if (i == 'r') + raw++; else { op = i; @@ -303,6 +403,11 @@ main(int argc, char **argv) if (optind < argc) help(); + if (!raw) + { + pool = mp_new(1<<14); + buck_buf = buck2obj_alloc(); + } switch (op) { case 'l': @@ -338,6 +443,11 @@ main(int argc, char **argv) default: help(); } + if (buck_buf) + { + buck2obj_free(buck_buf); + mp_delete(pool); + } return 0; }