Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c
- Timestamp:
- Jun 29, 2009, 7:19:18 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-devices.c
r2241 r2242 1359 1359 /*@ buffers ********************************************************* */ 1360 1360 char *tmp; 1361 char *mds = NULL; 1361 1362 char *request; 1362 1363 … … 1410 1411 log_msg(3, "Currently, we hold %d but we want %d", res, 1411 1412 cd_number_i_want); 1412 sprintf(tmp, "Insisting on %s #%d", 1413 media_descriptor_string(bkpinfo->backup_media_type), 1414 cd_number_i_want); 1415 sprintf(request, "Please insert %s #%d and press Enter.", 1416 media_descriptor_string(bkpinfo->backup_media_type), 1417 cd_number_i_want); 1413 mds = media_descriptor_string(bkpinfo->backup_media_type); 1414 sprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want); 1415 sprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want); 1416 mr_free(mds); 1418 1417 log_msg(3, tmp); 1419 1418 while (what_number_cd_is_this() != cd_number_i_want) { … … 1470 1469 { 1471 1470 char *tmp = NULL; 1471 char *mds = NULL; 1472 1472 char *sz_size; 1473 1473 char *command; … … 1534 1534 finish(1); 1535 1535 } 1536 sprintf(comment, "What speed is your %s (re)writer?",1537 media_descriptor_string(bkpinfo->backup_media_type));1536 mds = media_descriptor_string(bkpinfo->backup_media_type); 1537 sprintf(comment, "What speed is your %s (re)writer?", mds); 1538 1538 if (bkpinfo->backup_media_type == dvd) { 1539 1539 find_dvd_device(bkpinfo->media_device, FALSE); … … 1557 1557 1558 1558 sprintf(comment, 1559 "How much data (in Megabytes) will each %s store?", 1560 media_descriptor_string(bkpinfo->backup_media_type));1559 "How much data (in Megabytes) will each %s store?", mds); 1560 mr_free(mds); 1561 1561 if (!popup_and_get_string("Size", comment, sz_size, 5)) { 1562 1562 log_to_screen("User has chosen not to backup the PC"); … … 1573 1573 /* No break because we continue even for usb */ 1574 1574 case cdstream: 1575 mds = media_descriptor_string(bkpinfo->backup_media_type); 1576 1575 1577 if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) { 1576 1578 strcpy(bkpinfo->media_device, "/dev/cdrom"); … … 1589 1591 bkpinfo->media_device); 1590 1592 sprintf(comment, 1591 "Please specify your %s drive's /dev entry", 1592 media_descriptor_string(bkpinfo->backup_media_type)); 1593 "Please specify your %s drive's /dev entry", mds); 1593 1594 if (!popup_and_get_string 1594 1595 ("Device?", comment, bkpinfo->media_device, … … 1598 1599 } 1599 1600 } 1600 log_msg(2, "%s device found at %s", 1601 media_descriptor_string(bkpinfo->backup_media_type), 1602 bkpinfo->media_device); 1601 log_msg(2, "%s device found at %s", mds, bkpinfo->media_device); 1603 1602 } else { 1604 1603 if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) { … … 1608 1607 if (bkpinfo->backup_media_type == usb) { 1609 1608 mr_asprintf(&tmp, 1610 "I think your %s media corresponds to %s. Is this correct?", 1611 media_descriptor_string(bkpinfo->backup_media_type), 1609 "I think your %s media corresponds to %s. Is this correct?", mds, 1612 1610 bkpinfo->media_device); 1613 1611 } else { 1614 1612 mr_asprintf(&tmp, 1615 "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", 1616 media_descriptor_string(bkpinfo->backup_media_type), 1613 "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, 1617 1614 bkpinfo->media_device); 1618 1615 } … … 1647 1644 } 1648 1645 } 1646 mr_free(mds); 1647 1649 1648 if (bkpinfo->backup_media_type == cdstream) { 1650 1649 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
Note:
See TracChangeset
for help on using the changeset viewer.