Changeset 3148 in MondoRescue for branches/3.1/mondo
- Timestamp:
- Jun 19, 2013, 8:50:28 AM (11 years ago)
- Location:
- branches/3.1/mondo/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.1/mondo/src/common/libmondo-archive.c
r3147 r3148 721 721 } 722 722 log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device); 723 if (bootldr_ver != NULL) { 724 mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver); 725 log_to_screen(tmp); 726 mr_free(tmp); 727 } 723 728 if (bootldr_ver != NULL) { 724 729 mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver); … … 1880 1885 FILE *fin = NULL; 1881 1886 char *q; 1887 char *q; 1882 1888 1883 1889 /*@ buffers ******************************************** */ -
branches/3.1/mondo/src/common/libmondo-cli.c
r3147 r3148 508 508 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 509 509 sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user); 510 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 511 sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user); 510 512 } else if (strstr(bkpinfo->netfs_proto, "nfs")) { 511 513 mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount); … … 517 519 if (strstr(bkpinfo->netfs_proto, "sshfs")) { 518 520 mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount); 521 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 522 sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount); 519 523 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) { 520 524 sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount); -
branches/3.1/mondo/src/common/libmondo-devices.c
r3147 r3148 332 332 char *tmp = NULL; 333 333 char *p; 334 char *p; 334 335 335 336 /*@ ints ******************************************************* */ … … 983 984 char *command = NULL; 984 985 char *format_sz = NULL; 986 char *p; 985 987 char *p; 986 988 -
branches/3.1/mondo/src/common/libmondo-filelist.c
r3147 r3148 398 398 FILE *pattr = NULL; 399 399 char *tmp = NULL; 400 401 char *p; 400 402 401 403 char *p; -
branches/3.1/mondo/src/common/libmondo-files.c
r3147 r3148 51 51 /*@ pointers **************************************************** */ 52 52 char *p = NULL; 53 char *q; 53 54 char *q; 54 55 FILE *fin; … … 128 129 char *incoming = NULL; 129 130 char *q; 131 char *q; 130 132 131 133 /*@ long ******************************************************** */ … … 206 208 char *tmp = NULL; 207 209 char *incoming = NULL; 210 char *q; 208 211 char *q; 209 212 … … 475 478 char *command = NULL; 476 479 char *p = NULL; 480 char *p = NULL; 477 481 478 482 /*@ pointers **************************************************** */ … … 544 548 char *curr_cksum = NULL; 545 549 char *tmp = NULL; 550 char *q; 546 551 char *q; 547 552 … … 684 689 /*@ buffers **************************************************** */ 685 690 char *incoming = NULL; 691 char *p = NULL; 686 692 char *p = NULL; 687 693 -
branches/3.1/mondo/src/common/libmondo-fork.c
r3147 r3148 42 42 char *newcall = NULL; 43 43 char *tmp = NULL; 44 char *p; 44 45 char *p; 45 46 -
branches/3.1/mondo/src/common/newt-specific.c
r3147 r3148 171 171 /*@ buffer *********************************************************** */ 172 172 char *tmp = NULL; 173 char *p; 173 174 char *p; 174 175 int i; … … 781 782 /*@ buffers *********************************************************** */ 782 783 char *prompt = NULL; 784 char *q; 783 785 char *q; 784 786 … … 1149 1151 static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL }; 1150 1152 char *outstr = NULL; 1153 char *p; 1151 1154 char *p; 1152 1155 t_bkptype backup_type; … … 1348 1351 char *tmp = NULL; 1349 1352 char *p; 1353 char *p; 1350 1354 char *tmp1 = NULL; 1351 1355 FILE *fin, *fout; -
branches/3.1/mondo/src/mondoarchive/mondoarchive.c
r3147 r3148 279 279 finish(0); 280 280 } 281 if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) { 282 g_loglevel = 10; 283 g_text_mode = TRUE; 284 setup_newt_stuff(); 285 #undef MDSTAT_FILE 286 #define MDSTAT_FILE "/tmp/mdstat" 287 if (!(fin = fopen(MDSTAT_FILE, "r"))) { 288 log_msg(1, "Could not open %s.\n", MDSTAT_FILE); 289 finish(1); 290 } 291 292 create_raidtab_from_mdstat(MDSTAT_FILE,"/tmp/raidtab"); 293 finish(0); 294 } 281 295 282 296 if (argc > 2 && !strcmp(argv[1], "find-cd")) { -
branches/3.1/mondo/src/mondorestore/mondo-prep.c
r3147 r3148 1421 1421 char *tmp1 = NULL; 1422 1422 char *tmp1 = NULL; 1423 char *tmp1 = NULL; 1423 1424 1424 1425 /** end *************************************************************/ … … 2263 2264 } else if (strcmp(format, "btrfs") == 0) { 2264 2265 strcpy(program, "mkfs.btrfs"); 2266 } else if (strcmp(format, "btrfs") == 0) { 2267 strcpy(program, "mkfs.btrfs"); 2265 2268 } else if (strcmp(format, "minix") == 0) { 2266 2269 mr_asprintf(program, "mkfs.minix"); -
branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c
r3147 r3148 80 80 char *incoming = NULL; 81 81 char *question = NULL; 82 char *q; 82 83 char *q; 83 84 … … 1399 1400 bool done; 1400 1401 int res = 0; /* FALSE */ 1402 bool mntlistchg = FALSE; 1403 FILE *fin = NULL; 1401 1404 bool mntlistchg = FALSE; 1402 1405 FILE *fin = NULL; … … 1877 1880 char *incoming = NULL; 1878 1881 char *q; 1882 char *q; 1879 1883 1880 1884 assert_string_is_neither_NULL_nor_zerolength(output_file);
Note:
See TracChangeset
for help on using the changeset viewer.