Update doc, default working directory bscan

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

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 075505db5aa4ea736eb7dfc5db701ceb032b2491..8f3fe3185a8ea96c752f458a45baf52d27dd1be8 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -54,6 +54,7 @@ static int update_MD5_record(B_DB *db, char *MD5buf, DEV_RECORD *rec);
 
 
 /* Global variables */
+static STORES *me;
 static DEVICE *dev = NULL;
 static B_DB *db;
 static JCR *bjcr;                    /* jcr for bscan */
@@ -79,16 +80,18 @@ static time_t lasttime = 0;
 static char *db_name = "bacula";
 static char *db_user = "bacula";
 static char *db_password = "";
-static char *wd = "/tmp";
+static char *wd = NULL;
 static int verbose = 0;
 static int update_db = 0;
 static int update_vol_info = 0;
 static int list_records = 0;
+static int ignored_msgs = 0;
 
 #define CONFIG_FILE "bacula-sd.conf"
 char *configfile;
 
 
+
 static void usage()
 {
    fprintf(stderr, _(
@@ -104,7 +107,7 @@ static void usage()
 "       -r                list records\n"
 "       -s                synchronize or store in database\n"
 "       -v                verbose\n"
-"       -w dir            specify working directory (default /tmp)\n"
+"       -w dir            specify working directory (default from conf file)\n"
 "       -?                print this message\n\n"));
    exit(1);
 }
@@ -112,6 +115,7 @@ static void usage()
 int main (int argc, char *argv[])
 {
    int ch;
+   struct stat stat_buf;
 
    my_name_is(argc, argv, "bscan");
    init_msg(NULL, NULL);
@@ -182,13 +186,38 @@ int main (int argc, char *argv[])
       usage();
    }
 
-   working_directory = wd;
-
    if (configfile == NULL) {
       configfile = bstrdup(CONFIG_FILE);
    }
 
    parse_config(configfile);
+   LockRes();
+   me = (STORES *)GetNextRes(R_STORAGE, NULL);
+   if (!me) {
+      UnlockRes();
+      Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"), 
+        configfile);
+   }
+   UnlockRes();
+   /* Check if -w option given, otherwise use resource for working directory */
+   if (wd) { 
+      working_directory = wd;
+   } else if (!me->working_directory) {
+      Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
+        configfile);
+   } else {
+      working_directory = me->working_directory;
+   }
+
+   /* Check that working directory is good */
+   if (stat(working_directory, &stat_buf) != 0) {
+      Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"),
+        working_directory);
+   }
+   if (!S_ISDIR(stat_buf.st_mode)) {
+      Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
+        working_directory);
+   }
 
    bjcr = setup_jcr("bscan", argv[0], bsr);
    dev = setup_to_access_device(bjcr, 1);   /* read device */
@@ -327,6 +356,11 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
            break;
         case SOS_LABEL:
            mr.VolJobs++;
+           if (ignored_msgs > 0) {
+               Pmsg1(000, _("%d \"errors\" ignored before first Start of Session record.\n"), 
+                    ignored_msgs);
+              ignored_msgs = 0;
+           }
            unser_session_label(&label, rec);
            memset(&jr, 0, sizeof(jr));
            jr.JobId = label.JobId;
@@ -511,6 +545,8 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (mr.VolJobs > 0) {
             Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Attributes record.\n"),
                         rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
         }
         return;
       }
@@ -532,6 +568,8 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (mr.VolJobs > 0) {
             Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for File Data record.\n"),
                         rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
         }
         return;
       }
@@ -544,6 +582,8 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (mr.VolJobs > 0) {
             Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Sparse Data record.\n"),
                         rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
         }
         return;
       }
@@ -556,6 +596,8 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (mr.VolJobs > 0) {
             Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for GZIP Data record.\n"),
                         rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
         }
         return;
       }
@@ -568,6 +610,8 @@ static void record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (mr.VolJobs > 0) {
             Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Sparse GZIP Data record.\n"),
                         rec->VolSessionId, rec->VolSessionTime);
+        } else {
+           ignored_msgs++;
         }
         return;
       }
@@ -960,8 +1004,8 @@ static int create_jobmedia_record(B_DB *db, JCR *mjcr)
    JOBMEDIA_DBR jmr;
 
    if (dev->state & ST_TAPE) {
-      mjcr->EndBlock = dev->block_num;
-      mjcr->EndFile = dev->file;
+      mjcr->EndBlock = dev->EndBlock;
+      mjcr->EndFile  = dev->EndFile;
    } else {
       mjcr->EndBlock = (uint32_t)dev->file_addr;
       mjcr->EndFile = (uint32_t)(dev->file_addr >> 32);
@@ -1005,6 +1049,8 @@ static int update_MD5_record(B_DB *db, char *MD5buf, DEV_RECORD *rec)
       if (mr.VolJobs > 0) {
          Pmsg2(000, _("Could not find SessId=%d SessTime=%d for MD5 record.\n"),
                      rec->VolSessionId, rec->VolSessionTime);
+      } else {
+        ignored_msgs++;
       }
       return 0;
    }
@@ -1075,8 +1121,8 @@ int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
          Pmsg1(000, "create JobMedia for Job %s\n", mjcr->Job);
       }
       if (dev->state & ST_TAPE) {
-        mjcr->EndBlock = dev->block_num;
-        mjcr->EndFile = dev->file;
+        mjcr->EndBlock = dev->EndBlock;
+        mjcr->EndFile = dev->EndFile;
       } else {
         mjcr->EndBlock = (uint32_t)dev->file_addr;
         mjcr->StartBlock = (uint32_t)(dev->file_addr >> 32);