Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/libmondo-files.c
- Timestamp:
- Nov 10, 2012, 5:05:37 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo/src/common/libmondo-files.c
r2921 r3060 52 52 /*@ pointers **************************************************** */ 53 53 char *p; 54 char *q; 54 55 FILE *fin; 55 56 … … 65 66 fin = popen(command, "r"); 66 67 if (fin) { 67 (void) fgets(output, MAX_STR_LEN, fin); 68 p = strchr(output, ' '); 68 q = fgets(output, MAX_STR_LEN, fin); 69 if (!q) { 70 // FIXME 71 } 72 q = strchr(output, ' '); 69 73 paranoid_pclose(fin); 70 74 } … … 129 133 char incoming[MAX_STR_LEN]; 130 134 char tmp[MAX_STR_LEN]; 135 char *q; 131 136 132 137 /*@ long ******************************************************** */ … … 156 161 noof_lines = 0; 157 162 } else { 158 (void) fgets(incoming, MAX_STR_LEN - 1, fin); 159 while (strlen(incoming) > 0 163 q = fgets(incoming, MAX_STR_LEN - 1, fin); 164 if (!q) { 165 // FIXME 166 } 167 while (strlen(incoming) > 0 && (q != NULL) 160 168 && incoming[strlen(incoming) - 1] < 32) { 161 169 incoming[strlen(incoming) - 1] = '\0'; … … 211 219 char tmp[MAX_STR_LEN]; 212 220 char incoming[MAX_STR_LEN]; 221 char *q; 213 222 214 223 /*@ int ********************************************************* */ … … 234 243 return; 235 244 } 236 for ( fgets(incoming, MAX_STR_LEN, fin); !feof(fin);237 fgets(incoming, MAX_STR_LEN, fin)) {245 for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); 246 q = fgets(incoming, MAX_STR_LEN, fin)) { 238 247 i = strlen(incoming) - 1; 239 248 if (i >= 0 && incoming[i] < 32) { … … 497 506 static char command[MAX_STR_LEN * 2]; 498 507 static char tmp[MAX_STR_LEN]; 508 char *p = NULL; 499 509 500 510 /*@ pointers **************************************************** */ … … 512 522 sprintf(command, "tail -n1 %s", filename); 513 523 fin = popen(command, "r"); 514 (void) fgets(output, MAX_STR_LEN, fin); 524 p = fgets(output, MAX_STR_LEN, fin); 525 if (p == NULL) { 526 // FIXME 527 } 515 528 paranoid_pclose(fin); 516 529 while (strlen(output) > 0 && output[strlen(output) - 1] < 32) { … … 568 581 char curr_cksum[1000]; 569 582 char tmp[1000]; 583 char *q; 570 584 571 585 /*@ long [long] ************************************************* */ … … 596 610 return (1); 597 611 } 598 for ( fgets(stub_fname, 999, fin); !feof(fin);599 fgets(stub_fname, 999, fin)) {612 for (q = fgets(stub_fname, 999, fin); !feof(fin) && (q != NULL); 613 q = fgets(stub_fname, 999, fin)) { 600 614 if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) { 601 615 stub_fname[i] = '\0'; … … 700 714 /*@ buffers **************************************************** */ 701 715 char incoming[MAX_STR_LEN]; 716 char *p = NULL; 702 717 703 718 /*@ end vars *************************************************** */ … … 710 725 return (0); 711 726 } 712 (void)fgets(incoming, MAX_STR_LEN - 1, fin);713 while (!feof(fin) ) {727 p = fgets(incoming, MAX_STR_LEN - 1, fin); 728 while (!feof(fin) && (p != NULL)) { 714 729 if (strstr(incoming, wildcard)) { 715 730 matches++; 716 731 } 717 (void)fgets(incoming, MAX_STR_LEN - 1, fin);732 p = fgets(incoming, MAX_STR_LEN - 1, fin); 718 733 } 719 734 paranoid_fclose(fin); … … 759 774 char *comment; 760 775 char *tmp; 776 char *q; 761 777 char *command; 762 778 … … 783 799 } else { 784 800 log_msg(4, "Reading it..."); 785 for ( fgets(fname, MAX_STR_LEN, fin); !feof(fin);786 fgets(fname, MAX_STR_LEN, fin)) {801 for (q = fgets(fname, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); 802 q = fgets(fname, MAX_STR_LEN, fin)) { 787 803 if (fname[strlen(fname) - 1] <= 32) { 788 804 fname[strlen(fname) - 1] = '\0'; … … 854 870 llres = 0; 855 871 } else { 856 (void)fgets(tmp, MAX_STR_LEN, fin);872 p = fgets(tmp, MAX_STR_LEN, fin); 857 873 paranoid_pclose(fin); 858 874 p = strchr(tmp, '\t'); … … 991 1007 return (1); 992 1008 } 993 fscanf(fin, "%s\n", contents);1009 res = fscanf(fin, "%s\n", contents); 994 1010 i = strlen(contents); 995 1011 if (i > 0 && contents[i - 1] < 32) { … … 997 1013 } 998 1014 paranoid_fclose(fin); 1015 res = 0; 999 1016 return (res); 1000 1017 } … … 1024 1041 char tmp[MAX_STR_LEN]; 1025 1042 char old_pwd[MAX_STR_LEN]; 1043 int res = 0; 1026 1044 1027 1045 mvaddstr_and_log_it(g_currentY, 0, … … 1044 1062 log_it("Untarring payload %s to scratchdir %s", tmp, 1045 1063 bkpinfo->scratchdir); 1046 (void) getcwd(old_pwd, MAX_STR_LEN - 1); 1047 chdir(bkpinfo->scratchdir); 1064 if (getcwd(old_pwd, MAX_STR_LEN - 1)) { 1065 // FIXME 1066 } 1067 if (chdir(bkpinfo->scratchdir)) { 1068 // FIXME 1069 } 1048 1070 sprintf(command, "tar -zxvf %s", tmp); 1049 1071 if (run_program_and_log_output(command, FALSE)) { 1050 1072 fatal_error("Failed to untar payload"); 1051 1073 } 1052 chdir(old_pwd); 1074 if (chdir(old_pwd)) { 1075 // FIXME 1076 } 1053 1077 } 1054 1078
Note:
See TracChangeset
for help on using the changeset viewer.