More cleanup

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

diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c
index e7c9147b780aaf4d8a5a8e0d1153629c51cfeaf4..410eaaa58c67ca0294548c5fa7cff597bb8415d7 100644 (file)
--- a/bacula/src/filed/verify.c
+++ b/bacula/src/filed/verify.c
@@ -7,7 +7,7 @@
  *
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -42,12 +42,12 @@ void do_verify(JCR *jcr)
    
    jcr->buf_size = MAX_NETWORK_BUFFER_SIZE;
    if ((jcr->big_buf = (char *) malloc(jcr->buf_size)) == NULL) {
-      Emsg1(M_ABORT, 0, _("Cannot malloc %d network read buffer\n"), MAX_NETWORK_BUFFER_SIZE);
+      Jmsg1(jcr, M_ABORT, 0, _("Cannot malloc %d network read buffer\n"), MAX_NETWORK_BUFFER_SIZE);
    }
-   set_find_options(jcr->ff, jcr->incremental, jcr->mtime);
+   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
    Dmsg0(10, "Start find files\n");
    /* Subroutine verify_file() is called for each file */
-   find_files(jcr->ff, verify_file, (void *)jcr);  
+   find_files(jcr, (FF_PKT *)jcr->ff, verify_file, (void *)jcr);  
    Dmsg0(10, "End find files\n");
 
    bnet_sig(dir, BNET_EOD);          /* signal end of data */
@@ -60,9 +60,6 @@ void do_verify(JCR *jcr)
 
 /* 
  * Called here by find() for each file.
-
-    *****FIXME*****   add FSMs File System Modules
- 
  *
  *  Find the file, compute the MD5 and send it back to the Director
  */
@@ -70,9 +67,9 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
 {
    char attribs[MAXSTRING];
    int32_t n;
-   int fid, stat, len;
+   int fid, stat;
    struct MD5Context md5c;
-   unsigned char signature[16];
+   unsigned char signature[20];
    BSOCK *dir;
    JCR *jcr = (JCR *)pkt;
 
@@ -85,6 +82,7 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
 
    switch (ff_pkt->type) {
    case FT_LNKSAVED:                 /* Hard linked, file already saved */
+      Dmsg2(30, "FT_LNKSAVED saving: %s => %s\n", ff_pkt->fname, ff_pkt->link);
       break;
    case FT_REGE:
       Dmsg1(30, "FT_REGE saving: %s\n", ff_pkt->fname);
@@ -101,14 +99,20 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
    case FT_SPEC:
       Dmsg1(30, "FT_SPEC saving: %s\n", ff_pkt->fname);
       break;
+   case FT_RAW:
+      Dmsg1(30, "FT_RAW saving: %s\n", ff_pkt->fname);
+      break;
+   case FT_FIFO:
+      Dmsg1(30, "FT_FIFO saving: %s\n", ff_pkt->fname);
+      break;
    case FT_NOACCESS:
-      Jmsg(jcr, M_ERROR, -1, _("     Could not access %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+      Jmsg(jcr, M_NOTSAVED, -1, _("     Could not access %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
       return 1;
    case FT_NOFOLLOW:
-      Jmsg(jcr, M_ERROR, -1, _("     Could not follow link %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+      Jmsg(jcr, M_NOTSAVED, -1, _("     Could not follow link %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
       return 1;
    case FT_NOSTAT:
-      Jmsg(jcr, M_ERROR, -1, _("      Could not stat %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+      Jmsg(jcr, M_NOTSAVED, -1, _("     Could not stat %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
       return 1;
    case FT_DIRNOCHG:
    case FT_NOCHG:
@@ -124,19 +128,20 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
       Jmsg(jcr, M_SKIPPED, -1, _("     File system change prohibited. Directory skipped: %s\n"), ff_pkt->fname);
       return 1;
    case FT_NOOPEN:
-      Jmsg(jcr, M_ERROR, -1, _("     Could not open directory %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+      Jmsg(jcr, M_NOTSAVED, -1, _("     Could not open directory %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
       return 1;
    default:
-      Jmsg(jcr, M_ERROR, 0, _("Unknown file type %d: %s\n"), ff_pkt->type, ff_pkt->fname);
+      Jmsg(jcr, M_NOTSAVED, 0, _("     Unknown file type %d: %s\n"), ff_pkt->type, ff_pkt->fname);
       return 1;
    }
 
 
-   if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode) && 
-        ff_pkt->statp.st_size > 0) {
+   if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) && 
+        ff_pkt->statp.st_size > 0) || 
+        ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) {
       if ((fid = open(ff_pkt->fname, O_RDONLY | O_BINARY)) < 0) {
         ff_pkt->ff_errno = errno;
-         Jmsg(jcr, M_NOTSAVED, -1, _("Cannot open %s: ERR=%s.\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+         Jmsg(jcr, M_NOTSAVED, -1, _("     Cannot open %s: ERR=%s.\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
         return 1;
       }
    } else {
@@ -145,16 +150,10 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
 
    encode_stat(attribs, &ff_pkt->statp);
      
+   P(jcr->mutex);
    jcr->JobFiles++;                 /* increment number of files sent */
-   len = strlen(ff_pkt->fname);
-   jcr->last_fname = check_pool_memory_size(jcr->last_fname, len + 1);
-   jcr->last_fname[len] = 0;         /* terminate properly before copy */
-   strcpy(jcr->last_fname, ff_pkt->fname);
-    
-   if (ff_pkt->VerifyOpts[0] == 0) {
-      ff_pkt->VerifyOpts[0] = 'V';
-      ff_pkt->VerifyOpts[1] = 0;
-   }
+   pm_strcpy(&jcr->last_fname, ff_pkt->fname);
+   V(jcr->mutex);
 
 
    /* 
@@ -170,7 +169,7 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
     */
    /* Send file attributes to Director (note different format than for Storage) */
    Dmsg2(400, "send ATTR inx=%d fname=%s\n", jcr->JobFiles, ff_pkt->fname);
-   if (ff_pkt->type == FT_LNK) {
+   if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) {
       stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
                    STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->fname, 
                    0, attribs, 0, ff_pkt->link, 0);
@@ -199,7 +198,8 @@ static int verify_file(FF_PKT *ff_pkt, void *pkt)
         jcr->JobBytes += n;
       }
       if (n < 0) {
-         Jmsg(jcr, M_WARNING, -1, _("  Error reading file %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+         Jmsg(jcr, M_WARNING, -1, _("Error reading file %s: ERR=%s\n"), 
+             ff_pkt->fname, strerror(errno));
       }
 
       MD5Final(signature, &md5c);