X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbuckettool.c;h=eaf376c76da98c22a95bcbee56541add479dfd2e;hb=c982330d65a5ff8930682b250612ea135db2d4f6;hp=c46cf425023a9e724352306459ff5381dc41aa22;hpb=358365e678cf9494ba55ef1fd1bf46a8e3b5cd44;p=libucw.git

diff --git a/lib/buckettool.c b/lib/buckettool.c
index c46cf425..eaf376c7 100644
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -16,21 +16,27 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+static int verbose;
+
 static void
 help(void)
 {
   fprintf(stderr, "\
-Usage: buckettool <command>\n\
+Usage: buckettool [<options>] <command>\n\
 \n\
-Commands:\n\
+Options:\n"
+CF_USAGE
+"\nCommands:\n\
 -l\t\tlist all buckets\n\
 -L\t\tlist all buckets including deleted ones\n\
 -d <obj>\tdelete bucket\n\
 -x <obj>\textract bucket\n\
--i\t\tinsert bucket\n\
+-i\t\tinsert buckets separated by blank lines\n\
 -c\t\tconcatenate and dump all buckets\n\
 -f\t\taudit bucket file structure\n\
 -F\t\taudit and fix bucket file structure\n\
+-s\t\tshake down bucket file (without updating other structures!!!)\n\
+-v\t\tbe verbose\n\
 ");
   exit(1);
 }
@@ -93,18 +99,27 @@ extract(char *id)
 static void
 insert(void)
 {
-  struct fastbuf *b;
-  byte buf[1024];
-  int l;
+  struct fastbuf *b, *in;
+  byte buf[4096];
   struct obuck_header h;
+  byte *e;
 
+  in = bfdopen(0, 4096);
   obuck_init(1);
-  b = obuck_create();
-  while ((l = fread(buf, 1, sizeof(buf), stdin)))
-    bwrite(b, buf, l);
-  obuck_create_end(b, &h);
+  do
+    {
+      b = obuck_create();
+      while ((e = bgets(in, buf, sizeof(buf))) && buf[0])
+	{
+	  *e++ = '\n';
+	  bwrite(b, buf, e-buf);
+	}
+      obuck_create_end(b, &h);
+      printf("%08x %d %d\n", h.oid, h.length, h.orig_length);
+    }
+  while (e);
   obuck_cleanup();
-  printf("%08x %d %d\n", h.oid, h.length, h.orig_length);
+  /* bclose(in) not done, we don't want fd 0 closed */
 }
 
 static void
@@ -192,7 +207,7 @@ fsck(int fix)
 	      if (fix)
 		{
 		  printf("*** truncating file\n");
-		  ftruncate(fd, pos);
+		  sh_ftruncate(fd, pos);
 		}
 	      else
 		printf("*** would truncate the file here\n");
@@ -220,6 +235,28 @@ fsck(int fix)
     exit(1);
 }
 
+static int
+shake_kibitz(struct obuck_header *old, oid_t new, byte *buck UNUSED)
+{
+  if (verbose)
+    {
+      printf("%08x -> ", old->oid);
+      if (new == OBUCK_OID_DELETED)
+	puts("DELETED");
+      else
+	printf("%08x\n", new);
+    }
+  return 1;
+}
+
+static void
+shake(void)
+{
+  obuck_init(1);
+  obuck_shakedown(shake_kibitz);
+  obuck_cleanup();
+}
+
 int
 main(int argc, char **argv)
 {
@@ -228,9 +265,11 @@ main(int argc, char **argv)
 
   log_init(NULL);
   op = 0;
-  while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:icfF", CF_NO_LONG_OPTS, NULL)) != -1)
+  while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:icfFsv", CF_NO_LONG_OPTS, NULL)) != -1)
     if (i == '?' || op)
       help();
+    else if (i == 'v')
+      verbose++;
     else
       {
 	op = i;
@@ -265,6 +304,9 @@ main(int argc, char **argv)
     case 'F':
       fsck(1);
       break;
+    case 's':
+      shake();
+      break;
     default:
       help();
     }