Make btape fill/unfill work

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

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index c185e03cca5b7d7f7e50b98a017216f710b53142..99b9f23be93fe32e156956e84fefbf19628665a5 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -54,7 +54,9 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type);
 
 
 /* Global variables */
-static STORES *me;
+STORES *me;
+
+/* Local variables */
 static DEVICE *dev = NULL;
 static B_DB *db;
 static JCR *bjcr;                    /* jcr for bscan */
@@ -81,7 +83,6 @@ static char *db_name = "bacula";
 static char *db_user = "bacula";
 static char *db_password = "";
 static char *wd = NULL;
-static int verbose = 0;
 static int update_db = 0;
 static int update_vol_info = 0;
 static int list_records = 0;
@@ -353,7 +354,7 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
            }
            /* Reset some JCR variables */
            for (mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) {
-              mjcr->VolFirstFile = mjcr->FileIndex = 0;
+              mjcr->VolFirstIndex = mjcr->FileIndex = 0;
               mjcr->StartBlock = mjcr->EndBlock = 0;
               mjcr->StartFile = mjcr->EndFile = 0;
            }
@@ -625,6 +626,35 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
       mjcr->JobBytes += rec->data_len - sizeof(uint64_t); /* No correct, we should expand it */
       free_jcr(mjcr);                /* done using JCR */
 
+   /* Win32 Data stream */
+   } else if (rec->Stream == STREAM_WIN32_DATA) {
+      mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
+      if (!mjcr) {
+        if (mr.VolJobs > 0) {
+            Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Win32 Data record.\n"),
+                        rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
+        }
+        return;
+      }
+      mjcr->JobBytes += rec->data_len;
+      free_jcr(mjcr);                /* done using JCR */
+
+   /* Win32 GZIP stream */
+   } else if (rec->Stream == STREAM_WIN32_GZIP_DATA) {
+      mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
+      if (!mjcr) {
+        if (mr.VolJobs > 0) {
+            Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Win32 GZIP Data record.\n"),
+                        rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
+        }
+        return;
+      }
+      mjcr->JobBytes += rec->data_len;
+      free_jcr(mjcr);                /* done using JCR */
 
    } else if (rec->Stream == STREAM_MD5_SIGNATURE) {
       char MD5buf[50];
@@ -696,8 +726,8 @@ static int create_file_attributes_record(B_DB *db, JCR *mjcr,
    ar.Stream = rec->Stream;
    ar.FileIndex = rec->FileIndex;
    ar.attr = ap;
-   if (mjcr->VolFirstFile == 0) {
-      mjcr->VolFirstFile = rec->FileIndex;
+   if (mjcr->VolFirstIndex == 0) {
+      mjcr->VolFirstIndex = rec->FileIndex;
    }
    mjcr->FileIndex = rec->FileIndex;
    mjcr->JobFiles++;
@@ -972,8 +1002,8 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel,
       case JS_ErrorTerminated:
          term_msg = _("*** Backup Error ***");
         break;
-      case JS_Cancelled:
-         term_msg = _("Backup Cancelled");
+      case JS_Canceled:
+         term_msg = _("Backup Canceled");
         break;
       default:
         term_msg = term_code;
@@ -1030,7 +1060,7 @@ static int create_jobmedia_record(B_DB *db, JCR *mjcr)
    memset(&jmr, 0, sizeof(jmr));
    jmr.JobId = mjcr->JobId;
    jmr.MediaId = mr.MediaId;
-   jmr.FirstIndex = mjcr->VolFirstFile;
+   jmr.FirstIndex = mjcr->VolFirstIndex;
    jmr.LastIndex = mjcr->FileIndex;
    jmr.StartFile = mjcr->StartFile;
    jmr.EndFile = mjcr->EndFile;