Add -p option to SD => forge on + fix Makefile for gnome files

[bacula/bacula] / bacula / src / stored / bcopy.c

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index 94b544bd388bb5ca405ea845fdb678c82408ac97..7f26e79d6d7c34286009d3b71fde0a2fced6205d 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -48,6 +48,7 @@ static DEV_BLOCK *out_block;
 
 #define CONFIG_FILE "bacula-sd.conf"
 char *configfile;
+bool forge_on = true;
 
 
 static void usage()
@@ -58,9 +59,10 @@ static void usage()
 "       -b bootstrap      specify a bootstrap file\n"
 "       -c <file>         specify configuration file\n"
 "       -d <nn>           set debug level to nn\n"
-"       -v                verbose\n"
 "       -i                specify input Volume names (separated by |)\n"
 "       -o                specify output Volume names (separated by |)\n"
+"       -p                proceed inspite of errors\n"
+"       -v                verbose\n"
 "       -w <dir>          specify working directory (default /tmp)\n"
 "       -?                print this message\n\n"));
    exit(1);
@@ -71,11 +73,12 @@ int main (int argc, char *argv[])
    int ch;
    char *iVolumeName = NULL;
    char *oVolumeName = NULL;
+   bool ignore_label_errors = false;
 
-   my_name_is(argc, argv, "bscan");
+   my_name_is(argc, argv, "bcopy");
    init_msg(NULL, NULL);
 
-   while ((ch = getopt(argc, argv, "b:c:d:mn:p:rsu:vV:w:?")) != -1) {
+   while ((ch = getopt(argc, argv, "b:c:d:i:o:pvw:?")) != -1) {
       switch (ch) {
       case 'b':
         bsr = parse_bsr(NULL, optarg);
@@ -94,10 +97,6 @@ int main (int argc, char *argv[])
            debug_level = 1; 
         break;
 
-      case 'v':
-        verbose++;
-        break;
-
       case 'i':                    /* input Volume name */
         iVolumeName = optarg;
         break;
@@ -106,6 +105,14 @@ int main (int argc, char *argv[])
         oVolumeName = optarg;
         break;
 
+      case 'p':
+        ignore_label_errors = true;
+        forge_on = true;
+        break;
+  
+      case 'v':
+        verbose++;
+        break;
 
       case 'w':
         wd = optarg;
@@ -135,6 +142,7 @@ int main (int argc, char *argv[])
 
    /* Setup and acquire input device for reading */
    in_jcr = setup_jcr("bcopy", argv[0], bsr, iVolumeName);
+   in_jcr->ignore_label_errors = ignore_label_errors;
    in_dev = setup_to_access_device(in_jcr, 1);  /* read device */
    if (!in_dev) { 
       exit(1);
@@ -147,29 +155,26 @@ int main (int argc, char *argv[])
       exit(1);     
    }
    /* For we must now acquire the device for writing */
-   out_block = new_block(out_dev);
    lock_device(out_dev);
-   if (open_dev(out_dev, out_jcr->VolumeName, READ_WRITE) < 0) {
+   if (open_dev(out_dev, out_jcr->VolumeName, OPEN_READ_WRITE) < 0) {
       Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), out_dev->errmsg);
       unlock_device(out_dev);
-      free_block(out_block);
       exit(1);
    }
    unlock_device(out_dev);
-   if (!(out_dev=acquire_device_for_append(out_jcr, out_dev, out_block))) {
-      free_block(out_block);
+   if (!acquire_device_for_append(out_jcr)) {
       free_jcr(in_jcr);
       exit(1);
    }
+   out_block = out_jcr->dcr->block;
 
    read_records(in_jcr, in_dev, record_cb, mount_next_read_volume);
-   if (!write_block_to_device(out_jcr, out_dev, out_block)) {
+   if (!write_block_to_device(out_jcr->dcr, out_block)) {
       Pmsg0(000, _("Write of last block failed.\n"));
    }
 
    Pmsg2(000, _("%u Jobs copied. %u records copied.\n"), jobs, records);
 
-   free_block(out_block);
    term_dev(in_dev);
    term_dev(out_dev);
    free_jcr(in_jcr);
@@ -178,7 +183,9 @@ int main (int argc, char *argv[])
 }
   
 
-
+/*
+ * read_records() calls back here for each record it gets
+ */
 static int record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
 {
    if (list_records) {
@@ -209,14 +216,14 @@ static int record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec
         while (!write_record_to_block(out_block, rec)) {
             Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
                       rec->remainder);
-           if (!write_block_to_device(out_jcr, out_dev, out_block)) {
+           if (!write_block_to_device(out_jcr->dcr, out_block)) {
                Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
                  dev_name(out_dev), strerror_dev(out_dev));
                Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
                     strerror_dev(out_dev));
            }
         }
-        if (!write_block_to_device(out_jcr, out_dev, out_block)) {
+        if (!write_block_to_device(out_jcr->dcr, out_block)) {
             Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
               dev_name(out_dev), strerror_dev(out_dev));
             Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
@@ -239,7 +246,7 @@ static int record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec
    while (!write_record_to_block(out_block, rec)) {
       Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec->data_len,
                 rec->remainder);
-      if (!write_block_to_device(out_jcr, out_dev, out_block)) {
+      if (!write_block_to_device(out_jcr->dcr, out_block)) {
          Dmsg2(90, "Got write_block_to_dev error on device %s. %s\n",
            dev_name(out_dev), strerror_dev(out_dev));
          Jmsg(out_jcr, M_FATAL, 0, _("Cannot fixup device error. %s\n"),
@@ -263,7 +270,7 @@ int dir_send_job_status(JCR *jcr) {return 1;}
 
 int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
 {
-   fprintf(stderr, "Mount Volume %s on device %s and press return when ready: ",
+   fprintf(stderr, "Mount Volume \"%s\" on device \"%s\" and press return when ready: ",
       in_jcr->VolumeName, dev_name(dev));
    getchar();  
    return 1;