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 761a7d2d7f4e555083553f5c579aa228be3a8c89..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()
@@ -106,6 +107,7 @@ int main (int argc, char *argv[])
 
       case 'p':
         ignore_label_errors = true;
+        forge_on = true;
         break;
   
       case 'v':
@@ -153,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);
@@ -217,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"),
@@ -247,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"),