Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c
- Timestamp:
- Aug 18, 2009, 3:05:43 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c
r2316 r2323 472 472 char *prompt = NULL; 473 473 474 mr_asprintf( &prompt, "Please enter the RAID level you want. (concat, striped, raid5)");474 mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)"); 475 475 if (raidrec->raidlevel == -1) { 476 mr_asprintf( &tmp, "concat");476 mr_asprintf(tmp, "concat"); 477 477 } else if (raidrec->raidlevel == 0) { 478 mr_asprintf( &tmp, "striped");478 mr_asprintf(tmp, "striped"); 479 479 } else { 480 mr_asprintf( &tmp, "raid%i", raidrec->raidlevel);480 mr_asprintf(tmp, "raid%i", raidrec->raidlevel); 481 481 } 482 482 for (out = 999; out == 999;) { … … 538 538 539 539 system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null"); 540 mr_asprintf( &personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));541 mr_asprintf( &prompt, "Please enter the RAID level you want. %s", personalities);540 mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt")); 541 mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities); 542 542 mr_free(personalities); 543 543 544 544 if (raidrec->raid_level == -1) { 545 mr_asprintf( &tmp, "linear");545 mr_asprintf(tmp, "linear"); 546 546 } else { 547 mr_asprintf( &tmp, "%d", raidrec->raid_level);547 mr_asprintf(tmp, "%d", raidrec->raid_level); 548 548 } 549 549 for (out = 999; … … 1850 1850 char *tmp = NULL; 1851 1851 1852 mr_asprintf( &tmp, "%i", raidrec->stripesize);1852 mr_asprintf(tmp, "%i", raidrec->stripesize); 1853 1853 p = popup_and_get_string("Stripe size", "Please enter the stripe size in kilobytes.", tmp); 1854 1854 mr_free(tmp); … … 1899 1899 assert(lino >= 0); 1900 1900 1901 mr_asprintf( &sz_out, "%s", raidrec->additional_vars.el[lino].value);1902 mr_asprintf( &header, "Edit %s", raidrec->additional_vars.el[lino].label);1903 mr_asprintf( &comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);1901 mr_asprintf(sz_out, "%s", raidrec->additional_vars.el[lino].value); 1902 mr_asprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label); 1903 mr_asprintf(comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out); 1904 1904 p = popup_and_get_string(header, comment, sz_out); 1905 1905 if (p != NULL) { … … 1957 1957 assert(raidlist != NULL); 1958 1958 1959 mr_asprintf( &flaws_str_A, "%s", " ");1960 mr_asprintf( &flaws_str_B, "%s", " ");1961 mr_asprintf( &flaws_str_C, "%s", " ");1959 mr_asprintf(flaws_str_A, "%s", " "); 1960 mr_asprintf(flaws_str_B, "%s", " "); 1961 mr_asprintf(flaws_str_C, "%s", " "); 1962 1962 if (mountlist->entries > ARBITRARY_MAXIMUM) { 1963 1963 log_to_screen("Arbitrary limits suck, man!"); … … 2283 2283 log_it("isodir_path = %s", isodir_path); 2284 2284 if (isodir_device[0] == '\0') { 2285 mr_asprintf( &idev, "/dev/");2285 mr_asprintf(idev, "/dev/"); 2286 2286 } else { 2287 mr_asprintf(&idev, "%s", isodir_device); 2288 } 2289 2290 if (isodir_path[0] == '\0') { 2291 strcpy(isodir_path, "/"); 2292 } 2287 mr_asprintf(idev, "%s", isodir_device); 2288 } 2289 2293 2290 if (does_file_exist("/tmp/NFS-SERVER-PATH")) { 2294 2291 mr_free(idev); 2295 mr_asprintf(&idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT")); 2296 mr_asprintf(&isodir_format, "nfs"); 2297 strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH")); 2292 mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT")); 2293 mr_asprintf(isodir_format, "nfs"); 2294 mr_free(isodir_path); 2295 mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH")); 2298 2296 } 2299 2297 … … 2319 2317 /* modify for the caller */ 2320 2318 strcpy(isodir_device, p); 2321 strcpy(isodir_path, r); 2319 mr_free(isodir_path); 2320 isodir_path = r; 2322 2321 log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path); 2323 mr_free(r);2324 2322 2325 2323 ret = TRUE; … … 2770 2768 2771 2769 log_it("Post-malloc"); 2772 mr_asprintf( &help_text, " Edit this RAID device's list of partitions. Choose OK or Cancel when done.");2773 mr_asprintf( &header_text, "%-24s %s", "Device", "Index");2774 mr_asprintf( &title_of_window, "%s contains...", raidrec->raid_device);2770 mr_asprintf(help_text, " Edit this RAID device's list of partitions. Choose OK or Cancel when done."); 2771 mr_asprintf(header_text, "%-24s %s", "Device", "Index"); 2772 mr_asprintf(title_of_window, "%s contains...", raidrec->raid_device); 2775 2773 newtPushHelpLine(help_text); 2776 2774 for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) { … … 2827 2825 redraw_disklist(disklist, keylist, partitionsListbox); 2828 2826 } else { 2829 mr_asprintf( &tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);2830 mr_asprintf( &sz_res, "%d", disklist->el[currline].index);2827 mr_asprintf(tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index); 2828 mr_asprintf(sz_res, "%d", disklist->el[currline].index); 2831 2829 p = popup_and_get_string("Set index", tmp, sz_res); 2832 2830 mr_free(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.