add PostgreSQL support

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

diff --git a/bacula/src/stored/bcopy.c b/bacula/src/stored/bcopy.c
index 11b55215323e45df140c5d724807d349bd05577b..9efa2a796503d7b98dee654daa37afe120b821fe 100644 (file)
--- a/bacula/src/stored/bcopy.c
+++ b/bacula/src/stored/bcopy.c
@@ -31,7 +31,7 @@
 #include "stored.h"
 
 /* Forward referenced functions */
-static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
+static int record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
 
 
 /* Global variables */
@@ -57,11 +57,11 @@ static void usage()
 "Usage: bcopy [-d debug_level] <input-archive> <output-archive>\n"
 "       -b bootstrap      specify a bootstrap file\n"
 "       -c <file>         specify configuration file\n"
-"       -dnn              set debug level to nn\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"
-"       -w dir            specify working directory (default /tmp)\n"
+"       -w <dir>          specify working directory (default /tmp)\n"
 "       -?                print this message\n\n"));
    exit(1);
 }
@@ -179,7 +179,7 @@ int main (int argc, char *argv[])
   
 
 
-static void record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
+static int record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
 {
    if (list_records) {
       Pmsg5(000, _("Record: SessId=%u SessTim=%u FileIndex=%d Stream=%d len=%u\n"),
@@ -196,41 +196,41 @@ static void record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *re
         dump_label_record(dev, rec, 1);
       }
       switch (rec->FileIndex) {
-        case PRE_LABEL:
-            Pmsg0(000, "Volume is prelabeled. This volume cannot be copied.\n");
-           return;
-        case VOL_LABEL:
-            Pmsg0(000, "Volume label not copied.\n");
-           return;
-        case SOS_LABEL:
-           jobs++;
-           break;
-        case EOS_LABEL:
-           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)) {
-                  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));
-              }
-           }
+      case PRE_LABEL:
+         Pmsg0(000, "Volume is prelabeled. This volume cannot be copied.\n");
+        return 1;
+      case VOL_LABEL:
+         Pmsg0(000, "Volume label not copied.\n");
+        return 1;
+      case SOS_LABEL:
+        jobs++;
+        break;
+      case EOS_LABEL:
+        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)) {
                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));
            }
-           break;
-        case EOM_LABEL:
-            Pmsg0(000, "EOM label not copied.\n");
-           return;
-        case EOT_LABEL:              /* end of all tapes */
-            Pmsg0(000, "EOT label not copied.\n");
-           return;
-        default:
-           break;
+        }
+        if (!write_block_to_device(out_jcr, out_dev, 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));
+        }
+        break;
+      case EOM_LABEL:
+         Pmsg0(000, "EOM label not copied.\n");
+        return 1;
+      case EOT_LABEL:             /* end of all tapes */
+         Pmsg0(000, "EOT label not copied.\n");
+        return 1;
+      default:
+        break;
       }
    }
 
@@ -247,14 +247,14 @@ static void record_cb(JCR *in_jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *re
         break;
       }
    }
-   return;
+   return 1;
 }
 
 
 /* Dummies to replace askdir.c */
-int    dir_get_volume_info(JCR *jcr, int writing) { return 1;}
+int    dir_get_volume_info(JCR *jcr, enum get_vol_info_rw  writing) { return 1;}
 int    dir_find_next_appendable_volume(JCR *jcr) { return 1;}
-int    dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel) { return 1; }
+int    dir_update_volume_info(JCR *jcr, DEVICE *dev, int relabel) { return 1; }
 int    dir_create_jobmedia_record(JCR *jcr) { return 1; }
 int    dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev) { return 1; }
 int    dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;}