/*
* 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
#include "lib/fastbuf.h"
#include "lib/lfs.h"
#include "lib/conf.h"
-#include "lib/pools.h"
+#include "lib/mempool.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>
-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);
}
}
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);
}
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);
- return;
- }
+ bprintf(out, ".Cannot parse bucket %x of type %x and length %d: %m\n", h->oid, h->type, h->length);
else
- {
- for (struct oattr *oa = o_hdr->attrs; oa; oa = oa->next)
- dump_oattr(out, oa);
- bputc(out, '\n');
- for (struct oattr *oa = o_body->attrs; oa; oa = oa->next)
- dump_oattr(out, oa);
- }
+ {
+ dump_oattrs(out, o_hdr->attrs);
+ bputc(out, '\n');
+ dump_oattrs(out, o_body->attrs);
+ }
}
static void
obuck_cleanup();
}
-#define GBUF_TYPE byte
-#define GBUF_PREFIX(x) bb_##x
-#include "lib/gbuf.h"
-
static void
insert(byte *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);
}
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;
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;
}
else
dump_parsed_bucket(out, &h, b);
+ bputc(out, '\n');
}
bclose(out);
obuck_cleanup();
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')