Changeset 2404 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c
- Timestamp:
- Sep 17, 2009, 2:23:18 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-filelist.c
r2383 r2404 1345 1345 time_t this_time; 1346 1346 1347 /* dir is needed when we pass it to the shell */ 1347 1348 dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\'); 1348 1349 p = strrchr(dir, '/'); … … 1382 1383 mr_free(tmp1); 1383 1384 1384 mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir );1385 mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir1); 1385 1386 open_evalcall_form(name_of_evalcall_form); 1386 1387 mr_free(name_of_evalcall_form); … … 1403 1404 last_time = this_time; 1404 1405 if (!g_text_mode) { 1405 mr_asprintf(tmp, "Reading %-68s", dir );1406 mr_asprintf(tmp, "Reading %-68s", dir1); 1406 1407 newtDrawRootText(0, g_noof_rows - 3, tmp); 1407 1408 mr_free(tmp); … … 1421 1422 mr_asprintf(skip_these, " %s ", sth); 1422 1423 } 1423 mr_asprintf(new_with_spaces, " %s ", dir );1424 if ((dip = opendir(dir )) == NULL) {1425 mr_asprintf(tmp,"opendir %s", dir );1424 mr_asprintf(new_with_spaces, " %s ", dir1); 1425 if ((dip = opendir(dir1)) == NULL) { 1426 mr_asprintf(tmp,"opendir %s", dir1); 1426 1427 log_OS_error(tmp); 1427 1428 mr_free(tmp); 1428 1429 } else if (strstr(skip_these, new_with_spaces)) { 1429 fprintf(fout, "%s\n", dir ); // if excluded dir then print dir ONLY1430 fprintf(fout, "%s\n", dir1); // if excluded dir then print dir ONLY 1430 1431 } else { 1431 fprintf(fout, "%s\n", dir );1432 fprintf(fout, "%s\n", dir1); 1432 1433 while ((dit = readdir(dip)) != NULL) { 1433 1434 i++; 1434 if (strcmp(dir , "/")) {1435 mr_asprintf(new,"%s/%s",dir ,dit->d_name);1435 if (strcmp(dir1, "/")) { 1436 mr_asprintf(new,"%s/%s",dir1,dit->d_name); 1436 1437 } else { 1437 mr_asprintf(new,"%s%s",dir ,dit->d_name);1438 mr_asprintf(new,"%s%s",dir1,dit->d_name); 1438 1439 } 1439 1440 mr_free(new_with_spaces);
Note:
See TracChangeset
for help on using the changeset viewer.