Define setproctitle() and use it for gatherer thread status reporting.

[libucw.git] / lib / buckettool.c

diff --git a/lib/buckettool.c b/lib/buckettool.c
index c93aaf51d2f3c75c053b65f613f2a44dce2ad2f7..f64da2da821ecd715fe86633d0c7ea75ca4354b5 100644 (file)
--- a/lib/buckettool.c
+++ b/lib/buckettool.c
@@ -8,6 +8,7 @@
 #include "lib/bucket.h"
 #include "lib/fastbuf.h"
 #include "lib/lfs.h"
+#include "lib/conf.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,7 +20,7 @@ static void
 help(void)
 {
   fprintf(stderr, "\
-Usage: buckettool <commands>\n\
+Usage: buckettool <command>\n\
 \n\
 Commands:\n\
 -l\t\tlist all buckets\n\
@@ -143,8 +144,10 @@ fsck(int fix)
   sh_off_t end;
   oid_t oid;
   u32 chk;
+  int errors = 0;
+  int fatal_errors = 0;
 
-  fd = open(obuck_name, O_RDWR);
+  fd = sh_open(obuck_name, O_RDWR);
   if (fd < 0)
     die("Unable to open the bucket file %s: %m", obuck_name);
   for(;;)
@@ -172,12 +175,14 @@ fsck(int fix)
          pos = end;
          continue;
        }
+      errors++;
       end = pos;
       do
        {
          if (pos - end > 0x10000000)
            {
              printf("*** skipped for too long, giving up\n");
+             fatal_errors++;
              goto finish;
            }
          end += OBUCK_ALIGN;
@@ -187,7 +192,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");
@@ -196,7 +201,7 @@ fsck(int fix)
        }
       while (nh.magic != OBUCK_MAGIC ||
             (nh.oid != (oid_t)(end >> OBUCK_SHIFT) && nh.oid != OBUCK_OID_DELETED));
-      printf("*** match at oid %08x\n", end >> OBUCK_SHIFT);
+      printf("*** match at oid %08x\n", (uns)(end >> OBUCK_SHIFT));
       if (fix)
        {
          h.magic = OBUCK_MAGIC;
@@ -205,60 +210,64 @@ fsck(int fix)
          sh_pwrite(fd, &h, sizeof(h), pos);
          chk = OBUCK_TRAILER;
          sh_pwrite(fd, &chk, 4, end-4);
-         printf("*** replaced the invalid chunk by a DELETED bucket of size %d\n", end - pos);
+         printf("*** replaced the invalid chunk by a DELETED bucket of size %d\n", (uns)(end - pos));
        }
       pos = end;
     }
  finish:
   close(fd);
+  if (!fix && errors || fatal_errors)
+    exit(1);
 }
 
 int
 main(int argc, char **argv)
 {
   int i, op;
+  char *arg = NULL;
 
+  log_init(NULL);
   op = 0;
-  while ((i = getopt(argc, argv, "lLd:x:icfF")) != -1)
-    switch (i)
+  while ((i = cf_getopt(argc, argv, CF_SHORT_OPTS "lLd:x:icfF", CF_NO_LONG_OPTS, NULL)) != -1)
+    if (i == '?' || op)
+      help();
+    else
       {
-      case 'l':
-       list(0);
-       op++;
-       break;
-      case 'L':
-       list(1);
-       op++;
-       break;
-      case 'd':
-       delete(optarg);
-       op++;
-       break;
-      case 'x':
-       extract(optarg);
-       op++;
-       break;
-      case 'i':
-       insert();
-       op++;
-       break;
-      case 'c':
-       cat();
-       op++;
-       break;
-      case 'f':
-       fsck(0);
-       op++;
-       break;
-      case 'F':
-       fsck(1);
-       op++;
-       break;
-      default:
-       help();
+       op = i;
+       arg = optarg;
       }
-  if (optind < argc || !op)
+  if (optind < argc)
     help();
 
+  switch (op)
+    {
+    case 'l':
+      list(0);
+      break;
+    case 'L':
+      list(1);
+      break;
+    case 'd':
+      delete(arg);
+      break;
+    case 'x':
+      extract(arg);
+      break;
+    case 'i':
+      insert();
+      break;
+    case 'c':
+      cat();
+      break;
+    case 'f':
+      fsck(0);
+      break;
+    case 'F':
+      fsck(1);
+      break;
+    default:
+      help();
+    }
+
   return 0;
 }