Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/mondorestore
- Timestamp:
- Jun 29, 2009, 7:19:18 PM (16 years ago)
- Location:
- branches/2.2.9/mondo/src/mondorestore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c
r2230 r2242 382 382 383 383 char *tarball_fname, *progress_str, *tmp; 384 char *mds = NULL; 384 385 long max_val; 385 386 … … 393 394 394 395 max_val = atol(tmp); 395 sprintf(progress_str, "Comparing with %s #%d ", 396 media_descriptor_string(bkpinfo->backup_media_type), 397 g_current_media_number); 396 mds = media_descriptor_string(bkpinfo->backup_media_type); 397 sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number); 398 398 399 399 open_progress_form("Comparing files", … … 440 440 log_msg(2, "OK, I think it's time for another CD..."); 441 441 g_current_media_number++; 442 sprintf(progress_str, "Comparing with %s #%d ", 443 media_descriptor_string(bkpinfo->backup_media_type), 444 g_current_media_number); 442 sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number); 445 443 log_to_screen(progress_str); 446 444 } else { … … 451 449 } 452 450 } 451 mr_free(mds); 452 453 453 close_progress_form(); 454 454 if (retval) { -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c
r2230 r2242 279 279 char *mount_isodir_command = NULL; 280 280 char *tmp, *command; 281 char *mds = NULL; 281 282 int retval = 0, i; 282 283 bool already_mounted = FALSE; … … 331 332 } 332 333 i = what_number_cd_is_this(); /* has the side-effect of calling mount_media() */ 333 sprintf(tmp, "%s #%d has been mounted via loopback mount", 334 media_descriptor_string(bkpinfo->backup_media_type), i); 334 mds = media_descriptor_string(bkpinfo->backup_media_type); 335 sprintf(tmp, "%s #%d has been mounted via loopback mount", mds, i); 336 mr_free(mds); 337 335 338 log_msg(1, tmp); 336 339 if (i < 0) { -
branches/2.2.9/mondo/src/mondorestore/mondorestore.c
r2230 r2242 1075 1075 char *bigblk; 1076 1076 char *p; 1077 char *mds = NULL; 1077 1078 int retval = 0; 1078 1079 int finished = FALSE; … … 1242 1243 g_current_media_number); 1243 1244 g_current_media_number++; 1245 mds = media_descriptor_string(bkpinfo->backup_media_type); 1244 1246 sprintf(tmp, 1245 "Asking for %s #%d so that I may read slice #%ld\n", 1246 media_descriptor_string(bkpinfo->backup_media_type), 1247 "Asking for %s #%d so that I may read slice #%ld\n", mds, 1247 1248 g_current_media_number, sliceno); 1248 1249 log_msg(2, tmp); 1249 sprintf(tmp, "Restoring from %s #%d", 1250 media_descriptor_string(bkpinfo->backup_media_type),1251 g_current_media_number); 1250 sprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number); 1251 mr_free(mds); 1252 1252 1253 log_to_screen(tmp); 1253 1254 insist_on_this_cd_number(g_current_media_number); … … 1301 1302 suffix), MONDO_LOGFILE); 1302 1303 } 1303 sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld ",1304 media_descriptor_string(bkpinfo->backup_media_type),1304 mds = media_descriptor_string(bkpinfo->backup_media_type); 1305 sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld ", mds, 1305 1306 g_current_media_number, bigfileno + 1, sliceno); 1307 mr_free(mds); 1306 1308 log_msg(2, tmp); 1307 1309 … … 1912 1914 /** malloc add ***/ 1913 1915 char *tmp; 1916 char *mds = NULL; 1914 1917 char *command; 1915 1918 char *afio_fname; … … 1932 1935 /* to do it with a file... */ 1933 1936 use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE; 1937 mds = media_descriptor_string(bkpinfo->backup_media_type); 1934 1938 sprintf(tmp, 1935 1939 "Restoring from fileset #%ld (%ld KB) on %s #%d", 1936 current_tarball_number, (long) size >> 10, 1937 media_descriptor_string(bkpinfo->backup_media_type),1938 g_current_media_number); 1940 current_tarball_number, (long) size >> 10, mds, g_current_media_number); 1941 mr_free(mds); 1942 1939 1943 log_msg(2, tmp); 1940 1944 run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE); … … 2101 2105 /** malloc **/ 2102 2106 char *tmp; 2107 char *mds = NULL; 2103 2108 bool just_changed_cds = FALSE; 2104 2109 char *xattr_fname; … … 2149 2154 log_msg(3, 2150 2155 "...but its first slice isn't on this CD. Perhaps this was a selective restore?"); 2156 mds = media_descriptor_string(bkpinfo->backup_media_type); 2151 2157 log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", 2152 bigfileno + 1, 2153 media_descriptor_string(bkpinfo->backup_media_type), 2158 bigfileno + 1, mds, 2154 2159 g_current_media_number); 2155 2160 log_msg(3, "Slicename would have been %s", … … 2162 2167 } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) { 2163 2168 insist_on_this_cd_number(++g_current_media_number); 2164 sprintf(tmp, "Restoring from %s #%d", 2165 media_descriptor_string(bkpinfo->backup_media_type), 2169 sprintf(tmp, "Restoring from %s #%d", mds, 2166 2170 g_current_media_number); 2167 2171 log_to_screen(tmp); … … 2176 2180 bigfileno++; 2177 2181 } 2182 mr_free(mds); 2178 2183 } else { 2179 2184 just_changed_cds = FALSE; … … 2251 2256 /**malloc ***/ 2252 2257 char *tmp = NULL; 2258 char *mds = NULL; 2253 2259 char *tmp1 = NULL; 2254 2260 char *tarball_fname; … … 2275 2281 paranoid_free(tmp); 2276 2282 2277 sprintf(progress_str, "Restoring from %s #%d",2278 media_descriptor_string(bkpinfo->backup_media_type),2279 g_current_media_number); 2283 mds = media_descriptor_string(bkpinfo->backup_media_type); 2284 sprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number); 2285 2280 2286 log_to_screen(progress_str); 2281 2287 open_progress_form("Restoring from archives", … … 2327 2333 } else { 2328 2334 sprintf(progress_str, "Restoring from fileset #%ld on %s #%d", 2329 current_tarball_number, 2330 media_descriptor_string(bkpinfo->backup_media_type), 2331 g_current_media_number); 2335 current_tarball_number, mds, g_current_media_number); 2332 2336 // log_msg(3, "progress_str = %s", progress_str); 2333 2337 for (res = 999, attempts = 0; attempts < 3 && res != 0; … … 2339 2343 } 2340 2344 mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ", 2341 media_descriptor_string(bkpinfo->backup_media_type), 2342 g_current_media_number, current_tarball_number); 2345 mds, g_current_media_number, current_tarball_number); 2343 2346 if (res) { 2344 2347 mr_strcat(tmp1, "reported errors"); … … 2362 2365 } 2363 2366 } 2367 mr_free(mds); 2368 2364 2369 close_progress_form(); 2365 2370 if (retval) { … … 2576 2581 /** malloc **/ 2577 2582 char *tmp; 2583 char *mds = NULL; 2578 2584 char *progress_str; 2579 2585 char *tmp_fname; … … 2661 2667 current_afioball_number++; 2662 2668 g_current_progress++; 2669 mds = media_descriptor_string(bkpinfo->backup_media_type), 2663 2670 sprintf(progress_str, "Restoring from fileset #%ld on %s #%d", 2664 current_afioball_number, 2665 media_descriptor_string(bkpinfo->backup_media_type), 2671 current_afioball_number, mds, 2666 2672 g_current_media_number); 2673 mr_free(mds); 2667 2674 res = 2668 2675 read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
Note:
See TracChangeset
for help on using the changeset viewer.