X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fbuckettool.c;h=f22f17f90691e53ab164dfb97970f99710fc570b;hb=3b44cc5e0858a329f647bee0617fbab117ea5ea9;hp=a79005221ed9c51c62747ac8e956a29fe17fd640;hpb=39a57bc42d4e51b98f4028ccd1cd5adc8299792e;p=libucw.git

diff --git a/lib/buckettool.c b/lib/buckettool.c
index a7900522..f22f17f9 100644
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -1,7 +1,7 @@
 /*
  *	Sherlock Library -- Bucket Manipulation Tool
  *
- *	(c) 2001 Martin Mares <mj@ucw.cz>
+ *	(c) 2001--2004 Martin Mares <mj@ucw.cz>
  *	(c) 2004 Robert Spalek <robert@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
@@ -15,10 +15,9 @@
 #include "lib/conf.h"
 #include "lib/pools.h"
 #include "lib/object.h"
-#include "lib/buck2obj.h"
-#include "lib/obj2buck.h"
 #include "lib/lizard.h"
-#include "charset/unistream.h"
+#include "lib/bbuf.h"
+#include "lib/ff-utf8.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,9 +47,9 @@ 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\
--r\t\tdo not parse V33 buckets, but print the raw content\n\
 ");
   exit(1);
 }
@@ -93,37 +92,27 @@ delete(char *id)
 }
 
 static inline void
-dump_oattr(struct fastbuf *out, struct oattr *oa)
+dump_oattrs(struct fastbuf *out, struct oattr *a)
 {
-  for (struct oattr *a = oa; a; a = a->same)
+  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 = obj_read_bucket(buck_buf, pool, h->type, h->length, b, NULL);
-  if (!o)
-    bprintf(out, "Cannot parse bucket %x of type %x and length %d: %m\n", h->oid, h->type, h->length);
+  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
-  {
-    if (h->type < BUCKET_TYPE_V30)
-    {
-      for (struct oattr *oa = o->attrs; oa; oa = oa->next)
-	dump_oattr(out, oa);
-    }
-    else
     {
-#define	IS_HEADER(x) (x=='O' || x=='U')
-      for (struct oattr *oa = o->attrs; oa; oa = oa->next)
-	if (IS_HEADER(oa->attr))
-	  dump_oattr(out, oa);
+      dump_oattrs(out, o_hdr->attrs);
       bputc(out, '\n');
-      for (struct oattr *oa = o->attrs; oa; oa = oa->next)
-	if (!IS_HEADER(oa->attr))
-	  dump_oattr(out, oa);
+      dump_oattrs(out, o_body->attrs);
     }
-  }
 }
 
 static void
@@ -151,10 +140,6 @@ extract(char *id)
   obuck_cleanup();
 }
 
-#define	GBUF_TYPE	byte
-#define	GBUF_PREFIX(x)	bb_##x
-#include "lib/gbuf.h"
-
 static void
 insert(byte *arg)
 {
@@ -171,6 +156,7 @@ insert(byte *arg)
     type = BUCKET_TYPE_PLAIN;
   else if (sscanf(arg, "%x", &type) != 1)
     die("Type `%s' is not a hexadecimal number");
+  attr_set_type(type);
 
   in = bfdopen_shared(0, 4096);
   obuck_init(1);
@@ -189,26 +175,22 @@ insert(byte *arg)
 	  }
 	  if (!b)
 	    b = obuck_create(type);
-	  if (type < BUCKET_TYPE_V33)
-	  {
-	    *e++ = '\n';
-	    bwrite(b, buf, e-buf);
-	  }
-	  else if (in_body == 1)
+	  if (in_body == 1)
 	  {
 	    bputc(b, 0);
 	    in_body = 2;
 	  }
-	  else if (type == BUCKET_TYPE_V33 || !in_body)
+	  else if (type <= BUCKET_TYPE_V33 || !in_body)
 	  {
-	    bwrite_v33(b, buf[0], buf+1, e-buf-1);
+	    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;
-	    WRITE_V33(ptr, buf[0], buf+1, e-buf-1);
+	    ptr = put_attr(ptr, buf[0], buf+1, e-buf-1);
 	    lizard_filled = ptr - lizard_buf.ptr;
 	  }
 	}
@@ -398,7 +380,7 @@ main(int argc, char **argv)
 
   log_init(NULL);
   op = 0;
-  while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:i::cfFqsvr", 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')