Add new files

[bacula/bacula] / bacula / src / dird / recycle.c

diff --git a/bacula/src/dird/recycle.c b/bacula/src/dird/recycle.c
index 0093eeaf681f3b3e6a3374057881d4c99c781834..fcfaf2e8ffa60693627919d4a36cf14f448d5723 100644 (file)
--- a/bacula/src/dird/recycle.c
+++ b/bacula/src/dird/recycle.c
@@ -47,7 +47,7 @@ static int oldest_handler(void *ctx, int num_fields, char **row)
    /* Find oldest Media record */
    if (row[1] && strcmp(row[1], oldest->LastWritten) < 0) {
       oldest->MediaId = atoi(row[0]);
-      strcpy(oldest->LastWritten, row[1]);
+      bstrncpy(oldest->LastWritten, row[1], sizeof(oldest->LastWritten));
       Dmsg1(100, "New oldest %s\n", row[1]);
    }
    return 1;
@@ -61,7 +61,7 @@ int find_recycled_volume(JCR *jcr, MEDIA_DBR *mr)
    if (db_find_next_volume(jcr, jcr->db, 1, mr)) {
       jcr->MediaId = mr->MediaId;
       Dmsg1(20, "Find_next_vol MediaId=%d\n", jcr->MediaId);
-      strcpy(jcr->VolumeName, mr->VolumeName);
+      pm_strcpy(&jcr->VolumeName, mr->VolumeName);
       return 1;
    }
    return 0;
@@ -71,22 +71,22 @@ int find_recycled_volume(JCR *jcr, MEDIA_DBR *mr)
 /*
  *   Look for oldest Purged volume
  */
-int recycle_a_volume(JCR *jcr, MEDIA_DBR *mr)
+int recycle_oldest_purged_volume(JCR *jcr, MEDIA_DBR *mr)
 {
    struct s_oldest_ctx oldest;
    POOLMEM *query = get_pool_memory(PM_EMSG);
    char *select =
-"SELECT MediaId, LastWritten FROM Media "
-"WHERE PoolId=%d AND Recycle=1 AND VolStatus=\"Purged\" "
-"AND MediaType=\"%s\"";
+          "SELECT MediaId, LastWritten FROM Media "
+          "WHERE PoolId=%u AND Recycle=1 AND VolStatus=\"Purged\" "
+          "AND MediaType=\"%s\"";
 
-   Dmsg0(100, "Enter recycle_a_volume\n");
+   Dmsg0(100, "Enter recycle_oldest_purged_volume\n");
    oldest.MediaId = 0;
    strcpy(oldest.LastWritten, "9999-99-99 99:99:99");
    Mmsg(&query, select, mr->PoolId, mr->MediaType);
    if (!db_sql_query(jcr->db, query, oldest_handler, (void *)&oldest)) {
       Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
-      Dmsg0(100, "Exit 0  recycle_a_volume query\n");
+      Dmsg0(100, "Exit 0  recycle_oldest_purged_volume query\n");
       free_pool_memory(query);
       return 0;
    }
@@ -96,14 +96,17 @@ int recycle_a_volume(JCR *jcr, MEDIA_DBR *mr)
       mr->MediaId = oldest.MediaId;
       if (db_get_media_record(jcr, jcr->db, mr)) {
          strcpy(mr->VolStatus, "Recycle");
+        mr->VolJobs = mr->VolFiles = mr->VolBlocks = mr->VolErrors = 0;
+        mr->VolBytes = 0;
+        mr->FirstWritten = mr->LastWritten = 0;
         if (db_update_media_record(jcr, jcr->db, mr)) {
-            Jmsg(jcr, M_INFO, 0, "Recycled volume %s\n", mr->VolumeName);
-            Dmsg1(100, "Exit 1  recycle_a_volume Vol=%s\n", mr->VolumeName);
+            Jmsg(jcr, M_INFO, 0, "Recycled volume \"%s\"\n", mr->VolumeName);
+            Dmsg1(100, "Exit 1  recycle_oldest_purged_volume Vol=%s\n", mr->VolumeName);
            return 1;
         }
       }
       Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
    }
-   Dmsg0(100, "Exit 0  recycle_a_volume end\n");
+   Dmsg0(100, "Exit 0  recycle_oldest_purged_volume end\n");
    return 0;   
 }