Changeset 38752

Timestamp:

Sep 17, 2015, 8:26:20 PM (11 years ago)

Author:

eugene

Message:

add a suffice to dvo_catalog_backup

Location:

branches/eam_branches/ipp-20150625/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (11 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvo.h

@@ -970 +970 @@
 void dvo_catalog_test (Catalog *catalog, int halt);
 
-int dvo_catalog_backup (Catalog *catalog, int primary);
-int dvo_catalog_unlink_backup (Catalog *catalog, int primary);
+int dvo_catalog_backup (Catalog *catalog, char *suffix, int primary);
+int dvo_catalog_unlink_backup (Catalog *catalog, char *suffix, int primary);
 
 /* catmode-specific APIs */

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dvo_catalog.c

@@ -1045 +1045 @@
 
 // make a backup of this catalog (including the measure, secfilt, and missing tables as needed)
-int dvo_catalog_backup (Catalog *catalog, int primary) {
+int dvo_catalog_backup (Catalog *catalog, char *suffix, int primary) {
 
   // skip empty cpt files
@@ -1053 +1053 @@
 
   char tmpfilename[DVO_MAX_PATH];
-  int status = snprintf (tmpfilename, DVO_MAX_PATH, "%s~", catalog->filename);
+  int status = snprintf (tmpfilename, DVO_MAX_PATH, "%s%s", catalog->filename, suffix);
   if (status >= DVO_MAX_PATH) {
     fprintf (stderr, "path name too long: %s\n", catalog->filename);
@@ -1068 +1068 @@
   }
 
+  // play it safe: do not overwrite an existing backup file
+  struct stat fileStats;
+  status = stat (tmpfilename, &fileStats);
+  if (!status) {
+    fprintf (stderr, "ERROR: backup file %s already exists, exiting\n", tmpfilename);
+    return FALSE;
+  }
+  
+  // some error accessing the file.  there is only one acceptable error: file not found
+  if (status && (errno != ENOENT)) {
+    perror ("problem with output target");
+    return FALSE;
+  }
+
   status = rename (catalog->filename, tmpfilename);
   if (status) {
@@ -1086 +1100 @@
   if (catalog[0].catmode == DVO_MODE_SPLIT) {
     if (catalog[0].measure_catalog != NULL) {
-      if (!dvo_catalog_backup (catalog[0].measure_catalog, FALSE)) {
+      if (!dvo_catalog_backup (catalog[0].measure_catalog, suffix, FALSE)) {
         return FALSE;
       }
     }
     if (catalog[0].missing_catalog != NULL) {
-      if (!dvo_catalog_backup (catalog[0].missing_catalog, FALSE)) {
+      if (!dvo_catalog_backup (catalog[0].missing_catalog, suffix, FALSE)) {
         return FALSE;
       }
     }
     if (catalog[0].secfilt_catalog != NULL) {
-      if (!dvo_catalog_backup (catalog[0].secfilt_catalog, FALSE)) {
+      if (!dvo_catalog_backup (catalog[0].secfilt_catalog, suffix, FALSE)) {
         return FALSE;
       }
@@ -1105 +1119 @@
         status = dvo_catalog_lock (catalog[0].lensing_catalog, lockmode);
       } else {
-        if (!dvo_catalog_backup (catalog[0].lensing_catalog, FALSE)) {
+        if (!dvo_catalog_backup (catalog[0].lensing_catalog, suffix, FALSE)) {
           return FALSE;
         }
@@ -1115 +1129 @@
         status = dvo_catalog_lock (catalog[0].lensobj_catalog, lockmode);
       } else {
-        if (!dvo_catalog_backup (catalog[0].lensobj_catalog, FALSE)) {
+        if (!dvo_catalog_backup (catalog[0].lensobj_catalog, suffix, FALSE)) {
           return FALSE;
         }
@@ -1125 +1139 @@
         status = dvo_catalog_lock (catalog[0].starpar_catalog, lockmode);
       } else {
-        if (!dvo_catalog_backup (catalog[0].starpar_catalog, FALSE)) {
+        if (!dvo_catalog_backup (catalog[0].starpar_catalog, suffix, FALSE)) {
           return FALSE;
         }
@@ -1135 +1149 @@
         status = dvo_catalog_lock (catalog[0].galphot_catalog, lockmode);
       } else {
-        if (!dvo_catalog_backup (catalog[0].galphot_catalog, FALSE)) {
+        if (!dvo_catalog_backup (catalog[0].galphot_catalog, suffix, FALSE)) {
           return FALSE;
         }
@@ -1145 +1159 @@
 
 // make a backup of this catalog (including the measure, secfilt, and missing tables as needed)
-int dvo_catalog_unlink_backup (Catalog *catalog, int primary) {
+int dvo_catalog_unlink_backup (Catalog *catalog, char *suffix, int primary) {
 
   if (primary && !catalog->Naverage_disk) {
@@ -1153 +1167 @@
 
   char tmpfilename[DVO_MAX_PATH];
-  int status = snprintf (tmpfilename, DVO_MAX_PATH, "%s~", catalog->filename);
+  int status = snprintf (tmpfilename, DVO_MAX_PATH, "%s%s", catalog->filename, suffix);
   if (status >= DVO_MAX_PATH) {
     fprintf (stderr, "path name too long: %s\n", catalog->filename);
@@ -1169 +1183 @@
   if (catalog[0].catmode == DVO_MODE_SPLIT) {
     if (catalog[0].measure_catalog != NULL) {
-      if (!dvo_catalog_unlink_backup (catalog[0].measure_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].measure_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if (catalog[0].missing_catalog != NULL) {
-      if (!dvo_catalog_unlink_backup (catalog[0].missing_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].missing_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if (catalog[0].secfilt_catalog != NULL) {
-      if (!dvo_catalog_unlink_backup (catalog[0].secfilt_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].secfilt_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if ((catalog[0].lensing_catalog != NULL) && (catalog[0].Nlensing_disk > 0)) {
-      if (!dvo_catalog_unlink_backup (catalog[0].lensing_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].lensing_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if ((catalog[0].lensobj_catalog != NULL) && (catalog[0].Nlensobj_disk > 0)) {
-      if (!dvo_catalog_unlink_backup (catalog[0].lensobj_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].lensobj_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if ((catalog[0].starpar_catalog != NULL) && (catalog[0].Nstarpar_disk > 0)) {
-      if (!dvo_catalog_unlink_backup (catalog[0].starpar_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].starpar_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }
     }
     if ((catalog[0].galphot_catalog != NULL) && (catalog[0].Ngalphot_disk > 0)) {
-      if (!dvo_catalog_unlink_backup (catalog[0].galphot_catalog, FALSE)) {
+      if (!dvo_catalog_unlink_backup (catalog[0].galphot_catalog, suffix, FALSE)) {
         outStatus = FALSE;
       }