- Fix ANSI labels to put EOF1 and EOF2 after each file mark.

[bacula/bacula] / bacula / src / filed / verify_vol.c

diff --git a/bacula/src/filed/verify_vol.c b/bacula/src/filed/verify_vol.c
index 99e296d09b7ebbee582a44d30396c651630c4820..23940b0920a905a5e43ad1fc20f80533bd6dcac7 100644 (file)
--- a/bacula/src/filed/verify_vol.c
+++ b/bacula/src/filed/verify_vol.c
@@ -87,7 +87,7 @@ void do_verify_volume(JCR *jcr)
        */
       if (sscanf(sd->msg, rec_header, &VolSessionId, &VolSessionTime, &file_index,
          &stream, &size) != 5) {
-        Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg);
+         Jmsg1(jcr, M_FATAL, 0, _("Record header scan error: %s\n"), sd->msg);
         goto bail_out;
       }
       Dmsg2(30, "Got hdr: FilInx=%d Stream=%d.\n", file_index, stream);
@@ -96,11 +96,11 @@ void do_verify_volume(JCR *jcr)
        * Now we expect the Stream Data
        */
       if (bget_msg(sd) < 0) {
-        Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd));
+         Jmsg1(jcr, M_FATAL, 0, _("Data record error. ERR=%s\n"), bnet_strerror(sd));
         goto bail_out;
       }
       if (size != ((uint32_t)sd->msglen)) {
-        Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size);
+         Jmsg2(jcr, M_FATAL, 0, _("Actual data size %d not same as header %d\n"), sd->msglen, size);
         goto bail_out;
       }
       Dmsg1(30, "Got stream data, len=%d\n", sd->msglen);
@@ -111,7 +111,7 @@ void do_verify_volume(JCR *jcr)
       case STREAM_UNIX_ATTRIBUTES_EX:
         char *ap, *lp, *fp;
 
-        Dmsg0(400, "Stream=Unix Attributes.\n");
+         Dmsg0(400, "Stream=Unix Attributes.\n");
 
         if ((int)sizeof_pool_memory(fname) < sd->msglen) {
            fname = realloc_pool_memory(fname, sd->msglen + 1);
@@ -132,22 +132,22 @@ void do_verify_volume(JCR *jcr)
          *    Link name (if file linked i.e. FT_LNK)
          *    Extended Attributes (if Win32)
          */
-        if (sscanf(sd->msg, "%d %d", &record_file_index, &type) != 2) {
-           Jmsg(jcr, M_FATAL, 0, _("Error scanning record header: %s\n"), sd->msg);
-           Dmsg0(0, "\nError scanning header\n");
+         if (sscanf(sd->msg, "%d %d", &record_file_index, &type) != 2) {
+            Jmsg(jcr, M_FATAL, 0, _("Error scanning record header: %s\n"), sd->msg);
+            Dmsg0(0, "\nError scanning header\n");
            goto bail_out;
         }
-        Dmsg2(30, "Got Attr: FilInx=%d type=%d\n", record_file_index, type);
+         Dmsg2(30, "Got Attr: FilInx=%d type=%d\n", record_file_index, type);
         if (record_file_index != file_index) {
-           Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"),
+            Jmsg(jcr, M_FATAL, 0, _("Record header file index %ld not equal record index %ld\n"),
               file_index, record_file_index);
-           Dmsg0(0, "File index error\n");
+            Dmsg0(0, "File index error\n");
            goto bail_out;
         }
         ap = sd->msg;
-        while (*ap++ != ' ')         /* skip record file index */
+         while (*ap++ != ' ')         /* skip record file index */
            ;
-        while (*ap++ != ' ')         /* skip type */
+         while (*ap++ != ' ')         /* skip type */
            ;
         /* Save filename and position to attributes */
         fp = fname;
@@ -156,21 +156,21 @@ void do_verify_volume(JCR *jcr)
         }
         *fp = *ap++;                 /* terminate filename & point to attribs */
 
-        Dmsg1(200, "Attr=%s\n", ap);
+         Dmsg1(200, "Attr=%s\n", ap);
         /* Skip to Link name */
         if (type == FT_LNK || type == FT_LNKSAVED) {
            lp = ap;
            while (*lp++ != 0) {
               ;
            }
-           strcat(lname, lp);        /* "save" link name */
+            pm_strcat(lname, lp);        /* "save" link name */
         } else {
            *lname = 0;
         }
         P(jcr->mutex);
         jcr->JobFiles++;
         jcr->num_files_examined++;
-        pm_strcpy(&jcr->last_fname, fname); /* last file examined */
+        pm_strcpy(jcr->last_fname, fname); /* last file examined */
         V(jcr->mutex);
 
         /*
@@ -185,19 +185,19 @@ void do_verify_volume(JCR *jcr)
          * slash. For a linked file, link is the link.
          */
         /* Send file attributes to Director */
-        Dmsg2(200, "send ATTR inx=%d fname=%s\n", jcr->JobFiles, fname);
+         Dmsg2(200, "send ATTR inx=%d fname=%s\n", jcr->JobFiles, fname);
         if (type == FT_LNK || type == FT_LNKSAVED) {
-           stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
-                         STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
+            stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
+                          STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
                          0, ap, 0, lname, 0);
         } else {
-           stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles,
-                         STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
+            stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles,
+                          STREAM_UNIX_ATTRIBUTES, "pinsug5", fname,
                          0, ap, 0, 0);
         }
-        Dmsg2(200, "bfiled>bdird: attribs len=%d: msg=%s\n", dir->msglen, dir->msg);
+         Dmsg2(200, "bfiled>bdird: attribs len=%d: msg=%s\n", dir->msglen, dir->msg);
         if (!stat) {
-           Jmsg(jcr, M_FATAL, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir));
+            Jmsg(jcr, M_FATAL, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir));
            goto bail_out;
         }
         break;
@@ -216,23 +216,23 @@ void do_verify_volume(JCR *jcr)
       case STREAM_MD5_SIGNATURE:
         char MD5buf[30];
         bin_to_base64(MD5buf, (char *)sd->msg, 16); /* encode 16 bytes */
-        Dmsg2(400, "send inx=%d MD5=%s\n", jcr->JobFiles, MD5buf);
-        bnet_fsend(dir, "%d %d %s *MD5-%d*", jcr->JobFiles, STREAM_MD5_SIGNATURE, MD5buf,
+         Dmsg2(400, "send inx=%d MD5=%s\n", jcr->JobFiles, MD5buf);
+         bnet_fsend(dir, "%d %d %s *MD5-%d*", jcr->JobFiles, STREAM_MD5_SIGNATURE, MD5buf,
            jcr->JobFiles);
-        Dmsg2(20, "bfiled>bdird: MD5 len=%d: msg=%s\n", dir->msglen, dir->msg);
+         Dmsg2(20, "bfiled>bdird: MD5 len=%d: msg=%s\n", dir->msglen, dir->msg);
         break;
 
       case STREAM_SHA1_SIGNATURE:
         char SHA1buf[30];
         bin_to_base64(SHA1buf, (char *)sd->msg, 20); /* encode 20 bytes */
-        Dmsg2(400, "send inx=%d SHA1=%s\n", jcr->JobFiles, SHA1buf);
-        bnet_fsend(dir, "%d %d %s *SHA1-%d*", jcr->JobFiles, STREAM_SHA1_SIGNATURE,
+         Dmsg2(400, "send inx=%d SHA1=%s\n", jcr->JobFiles, SHA1buf);
+         bnet_fsend(dir, "%d %d %s *SHA1-%d*", jcr->JobFiles, STREAM_SHA1_SIGNATURE,
            SHA1buf, jcr->JobFiles);
-        Dmsg2(20, "bfiled>bdird: SHA1 len=%d: msg=%s\n", dir->msglen, dir->msg);
+         Dmsg2(20, "bfiled>bdird: SHA1 len=%d: msg=%s\n", dir->msglen, dir->msg);
         break;
 
       default:
-        Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg);
+         Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg);
         break;
       } /* end switch */
    } /* end while bnet_get */