Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c
- Timestamp:
- Aug 29, 2009, 3:22:10 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-prep.c
r2334 r2357 188 188 { 189 189 /** buffers **********************************************/ 190 char *tmp ;190 char *tmp = NULL; 191 191 char *tmp1 = NULL; 192 char *incoming ;192 char *incoming = NULL; 193 193 char *command; 194 194 char *lvscan_sz = NULL; … … 225 225 } 226 226 227 malloc_string(tmp);228 malloc_string(incoming);229 227 command = malloc(1024); 230 228 … … 271 269 log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff..."); 272 270 rewind(fin); 273 for ( fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {271 for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) { 274 272 fgetpos(fin, &orig_pos); 275 273 if (incoming[0] != '#') { 274 mr_free(incoming); 276 275 continue; 277 276 } … … 284 283 if ((p = strstr(incoming, "vgcreate"))) { 285 284 // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm) 286 for ( fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin); fgets(tmp, MAX_STR_LEN - 1, fin)) {285 for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) { 287 286 if (tmp[0] == '#') { 288 287 fsetpos(fin, &orig_pos); … … 290 289 } else { 291 290 fgetpos(fin, &orig_pos); 292 strcat(incoming, tmp);291 mr_strcat(incoming, tmp); 293 292 } 294 } 293 mr_free(tmp); 294 } 295 mr_free(tmp); 296 295 297 for (q = incoming; *q != '\0'; q++) { 296 298 if (*q < 32) { … … 298 300 } 299 301 } 300 strcpy(tmp, p + strlen("vgcreate") + 1);302 mr_asprintf(tmp, "%s", p + strlen("vgcreate") + 1); 301 303 for (q = tmp; *q > 32; q++); 302 304 *q = '\0'; 303 305 log_msg(1, "Deleting old entries at /dev/%s", tmp); 304 306 mr_asprintf(tmp1, "rm -Rf /dev/%s", tmp); 307 mr_free(tmp); 308 305 309 run_program_and_log_output(tmp1, 1); 306 310 mr_free(tmp1); … … 308 312 run_program_and_log_output(vgscan_sz, 1); 309 313 run_program_and_log_output(pvscan_sz, 1); 310 log_msg(3, 311 "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'", 312 incoming); 314 log_msg(3, "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'", incoming); 313 315 } 314 316 for (p = incoming + 1; *p == ' '; p++); 317 mr_free(incoming); 318 315 319 strcpy(command, p); 316 320 for (p = command; *p != '\0'; p++); … … 330 334 if (strstr(command, "lvm lvcreate")) 331 335 lvmversion = 2; 332 log_it("%s... so I'll get creative.", tmp);333 336 if (lvmversion == 2) { 334 337 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE); 335 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));338 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1)); 336 339 mr_free(tmp1); 337 340 } else { 338 341 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE); 339 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));342 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1)); 340 343 mr_free(tmp1); 341 344 } … … 343 346 extents = atol(p); 344 347 log_msg(5, "p='%s' --> extents=%ld", p, extents); 348 mr_free(tmp); 349 345 350 p = strstr(command, "-L"); 346 351 if (!p) { … … 395 400 sleep(1); 396 401 } 402 mr_free(incoming); 397 403 mr_free(vgscan_sz); 398 404 mr_free(pvscan_sz); … … 401 407 log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff."); 402 408 } 403 paranoid_free(tmp);404 paranoid_free(incoming);405 409 paranoid_free(command); 406 410 system("sync"); … … 440 444 441 445 /** buffers **********************************************************/ 442 char *incoming ;446 char *incoming = NULL; 443 447 444 448 /** pointers *********************************************************/ … … 450 454 /** end **************************************************************/ 451 455 452 malloc_string(incoming);453 456 assert(new_mountlist != NULL); 454 457 assert(old_mountlist != NULL); 455 458 456 459 #ifdef __FreeBSD__ 457 log_to_screen 458 ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."); 460 log_to_screen("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."); 459 461 return (1); 460 462 #endif … … 472 474 finish(1); 473 475 } 474 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) 475 && !strstr(incoming, old_mountlist->el[lino].device); 476 fgets(incoming, MAX_STR_LEN - 1, fin)); 476 mr_getline(incoming, fin); 477 while (feof(fin) && !strstr(incoming, old_mountlist->el[lino].device)) { 478 mr_free(incoming); 479 mr_getline(incoming, fin); 480 } 481 mr_free(incoming); 482 477 483 if (!feof(fin)) { 478 484 log_it("Investigating %s", old_mountlist->el[lino].device); 479 485 480 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) 481 && !strstr(incoming, "raiddev"); 482 fgets(incoming, MAX_STR_LEN - 1, fin)) { 483 if (strstr(incoming, OSSWAP("device", "drive")) 484 && !strchr(incoming, '#')) { 485 for (p = incoming + strlen(incoming); 486 *(p - 1) <= 32; p--); 486 for (mr_getline(incoming, fin); !feof(fin) && !strstr(incoming, "raiddev"); mr_getline(incoming, fin)) { 487 if (strstr(incoming, OSSWAP("device", "drive")) && !strchr(incoming, '#')) { 488 for (p = incoming + strlen(incoming); *(p - 1) <= 32; p--); 487 489 *p = '\0'; 488 490 for (p--; p > incoming && *(p - 1) > 32; p--); 491 489 492 log_it("Extrapolating %s", p); 490 493 491 for (j = 0; 492 j < new_mountlist->entries 493 && strcmp(new_mountlist->el[j].device, p); 494 j++); 494 for (j = 0; j < new_mountlist->entries && strcmp(new_mountlist->el[j].device, p); j++); 495 495 if (j >= new_mountlist->entries) { 496 strcpy(new_mountlist-> 497 el[new_mountlist->entries].device, p); 498 strcpy(new_mountlist-> 499 el[new_mountlist->entries].mountpoint, 500 "raid"); 501 strcpy(new_mountlist-> 502 el[new_mountlist->entries].format, 503 "raid"); 504 new_mountlist->el[new_mountlist->entries]. 505 size = old_mountlist->el[lino].size; 496 strcpy(new_mountlist->el[new_mountlist->entries].device, p); 497 strcpy(new_mountlist->el[new_mountlist->entries].mountpoint, "raid"); 498 strcpy(new_mountlist->el[new_mountlist->entries].format, "raid"); 499 new_mountlist->el[new_mountlist->entries].size = old_mountlist->el[lino].size; 506 500 new_mountlist->entries++; 507 501 } else { 508 502 log_it("Not adding %s to mountlist: it's already there", p); 509 503 } 504 mr_free(incoming); 510 505 } 511 506 } 507 mr_free(incoming); 512 508 } 513 509 paranoid_fclose(fin); … … 656 652 #ifdef __FreeBSD__ 657 653 static bool vinum_started_yet = FALSE; 654 char *line = NULL; 655 char *status; 658 656 #endif 659 657 … … 710 708 if (vinum_started_yet) { 711 709 FILE *fin; 712 char line[MAX_STR_LEN];713 710 714 711 log_to_screen("Initializing Vinum device %s (this may take a *long* time)", device); … … 723 720 724 721 fin = fopen("/tmp/plexes", "r"); 725 while (fgets(line, MAX_STR_LEN - 1, fin)) { 722 /* BERLIOS: doesn't work */ 723 while (mr_getline(line, fin)) { 726 724 if (strchr(line, '\n')) 727 725 *(strchr(line, '\n')) = '\0'; // get rid of the \n on the end … … 740 738 mr_free(tmp); 741 739 742 char status[MAX_STR_LEN / 4]; 743 fgets(status, MAX_STR_LEN / 4 - 1, pin); 740 mr_getline(status, pin); 744 741 pclose(pin); 745 742 746 743 if (!strcmp(status, "up")) { 744 mr_free(status); 747 745 break; /* it's done */ 748 746 } 749 747 update_evalcall_form(atoi(status)); 750 748 usleep(250000); 749 mr_free(status); 751 750 } 752 751 close_evalcall_form(); 753 } 752 mr_free(line); 753 } 754 mr_free(line); 754 755 fclose(fin); 755 756 unlink("/tmp/plexes"); … … 1721 1722 fput_string_one_char_at_a_time(pout_to_fdisk, output); 1722 1723 fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n"); 1723 mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));1724 tmp = last_line_of_file(FDISK_LOG); 1724 1725 if (strstr(tmp, " (m ")) { 1725 1726 log_msg(1, "Successfully created partition %d on %s", partno, drive); … … 1912 1913 char *output = NULL; 1913 1914 char *tmp = NULL; 1915 char *tmp1 = NULL; 1914 1916 char *partcode = NULL; 1915 1917 … … 1981 1983 res = 0; 1982 1984 fput_string_one_char_at_a_time(pout_to_fdisk, "t\n"); 1983 if (partno > 11984 || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {1985 tmp1 = last_line_of_file(FDISK_LOG); 1986 if (partno > 1 || strstr(tmp1, " (1-4)")) { 1985 1987 log_msg(5, "Specifying partno (%d) - yay", partno); 1986 1988 mr_asprintf(tmp, "%d\n", partno); … … 1988 1990 mr_free(tmp); 1989 1991 1990 log_msg(5, "A - last line = '%s'", 1991 last_line_of_file(FDISK_LOG)); 1992 } 1992 mr_free(tmp1); 1993 tmp1 = last_line_of_file(FDISK_LOG); 1994 log_msg(5, "A - last line = '%s'", tmp1); 1995 } 1996 mr_free(tmp1); 1993 1997 1994 1998 mr_asprintf(tmp, "%s\n", partcode); … … 1996 2000 mr_free(tmp); 1997 2001 1998 log_msg(5, "B - last line = '%s'", 1999 last_line_of_file(FDISK_LOG)); 2002 tmp1 = last_line_of_file(FDISK_LOG); 2003 log_msg(5, "B - last line = '%s'", tmp1); 2004 mr_free(tmp1); 2005 2000 2006 fput_string_one_char_at_a_time(pout_to_fdisk, "\n"); 2001 log_msg(5, "C - last line = '%s'", 2002 last_line_of_file(FDISK_LOG)); 2003 2004 mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG)); 2005 if (!strstr(tmp, " (m ")) { 2006 log_msg(1, "last line = '%s'; part type set failed", tmp); 2007 tmp1 = last_line_of_file(FDISK_LOG); 2008 log_msg(5, "C - last line = '%s'", tmp1); 2009 mr_free(tmp1); 2010 2011 tmp1 = last_line_of_file(FDISK_LOG); 2012 if (!strstr(tmp1, " (m ")) { 2013 log_msg(1, "last line = '%s'; part type set failed", tmp1); 2007 2014 res++; 2008 2015 fput_string_one_char_at_a_time(pout_to_fdisk, "\n"); 2009 2016 } 2010 mr_free(tmp );2017 mr_free(tmp1); 2011 2018 2012 2019 fput_string_one_char_at_a_time(pout_to_fdisk, "p\n"); 2013 2020 } else { 2014 2021 mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode); 2015 mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, 2016 MONDO_LOGFILE, MONDO_LOGFILE); 2022 mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE); 2017 2023 log_msg(5, "output = '%s'", output); 2018 2024 log_msg(5, "partno=%d; partcode=%s", partno, partcode); … … 2157 2163 /** int *************************************************************/ 2158 2164 int retval = 0; 2165 2166 /** char ************************************************************/ 2167 char *incoming = NULL; 2159 2168 #ifndef __FreeBSD__ 2169 char *dev; 2170 char *p; 2160 2171 int res; 2161 2172 #endif 2162 2173 2163 /** char ************************************************************/2164 char *incoming;2165 #ifndef __FreeBSD__2166 char *dev;2167 #endif2168 2174 /** pointers ********************************************************/ 2169 #ifndef __FreeBSD__2170 char *p;2171 #endif2172 2175 FILE *fin; 2173 2176 int i; … … 2175 2178 /** end ****************************************************************/ 2176 2179 2177 malloc_string(dev);2178 malloc_string(incoming);2179 2180 assert(mountlist != NULL); 2180 2181 2181 2182 for (i = 0; i < 3; i++) { 2182 2183 #ifdef __FreeBSD__ 2183 fin = 2184 popen 2185 ("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2", 2186 "r"); 2184 fin = popen("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2", "r"); 2187 2185 if (!fin) { 2188 paranoid_free(dev);2189 paranoid_free(incoming);2190 2186 return (1); 2191 2187 } 2192 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); 2193 fgets(incoming, MAX_STR_LEN - 1, fin)) { 2188 for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) { 2194 2189 retval += stop_raid_device(incoming); 2195 } 2190 mr_free(incoming); 2191 } 2192 mr_free(incoming); 2196 2193 #else 2197 2194 fin = fopen("/proc/mdstat", "r"); 2198 2195 if (!fin) { 2199 2196 log_OS_error("/proc/mdstat"); 2200 paranoid_free(dev);2201 paranoid_free(incoming);2202 2197 return (1); 2203 2198 } 2204 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); 2205 fgets(incoming, MAX_STR_LEN - 1, fin)) { 2206 for (p = incoming; 2207 *p != '\0' && (*p != 'm' || *(p + 1) != 'd' 2208 || !isdigit(*(p + 2))); p++); 2199 for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) { 2200 for (p = incoming; *p != '\0' && (*p != 'm' || *(p + 1) != 'd' || !isdigit(*(p + 2))); p++); 2209 2201 if (*p != '\0') { 2210 sprintf(dev, "/dev/%s", p);2202 mr_asprintf(dev, "/dev/%s", p); 2211 2203 for (p = dev; *p > 32; p++); 2212 2204 *p = '\0'; 2213 2205 res = stop_raid_device(dev); 2214 } 2215 } 2206 mr_free(dev); 2207 } 2208 mr_free(incoming); 2209 } 2210 mr_free(incoming); 2216 2211 #endif 2217 2212 } … … 2220 2215 log_msg(1, "Warning - unable to stop some RAID devices"); 2221 2216 } 2222 paranoid_free(dev);2223 paranoid_free(incoming);2224 2217 system("sync"); 2225 2218 system("sync");
Note:
See TracChangeset
for help on using the changeset viewer.
