Changeset 38741

Timestamp:

Sep 16, 2015, 7:45:38 AM (11 years ago)

Author:

eugene

Message:

pass the ignore-sorted-state option to dvoverify_client

File:

• branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_catalogs.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_catalogs.c

@@ -117 +117 @@
 
     // options / arguments that can affect relastro_client -update-objects:
-    char command[DVO_MAX_PATH];
-    snprintf (command, DVO_MAX_PATH, "dvoverify_client %s -results %s -hostID %d -hostdir %s -region %f %f %f %f", 
-              abscatdir, table->hosts[i].results, table->hosts[i].hostID, table->hosts[i].pathname, 
-              UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax
-      );
+    char *command = NULL;
+    strextend (&command, "dvoverify_client %s -results %s -hostID %d -hostdir %s -region %f %f %f %f", 
+               abscatdir, table->hosts[i].results, table->hosts[i].hostID, table->hosts[i].pathname, 
+               UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
 
-    char tmpline[DVO_MAX_PATH];
-    if (VERBOSE)         { snprintf (tmpline, DVO_MAX_PATH, "%s -v", command); strcpy (command, tmpline); }
-    if (CHECKSORTED)     { snprintf (tmpline, DVO_MAX_PATH, "%s -s", command); strcpy (command, tmpline); }
-    if (!CHECK_IMAGE_ID) { snprintf (tmpline, DVO_MAX_PATH, "%s -skip-image-ids", command); strcpy (command, tmpline); }
-    if (LIST_MISSING)    { snprintf (tmpline, DVO_MAX_PATH, "%s -list-missing", command); strcpy (command, tmpline); }
+    if (VERBOSE)             { strextend (&command, "-v"); }
+    if (CHECKSORTED)         { strextend (&command, "-s"); }
+    if (IGNORE_SORTED_STATE) { strextend (&command, "-ignore-sorted-state"); }
+    if (!CHECK_IMAGE_ID)     { strextend (&command, "-skip-image-ids"); }
+    if (LIST_MISSING)        { strextend (&command, "-list-missing"); }
 
     fprintf (stderr, "command: %s\n", command);
@@ -150 +149 @@
     }
   }
+  free (command);
 
   if (PARALLEL_MANUAL) {