Changeset 1625 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c
- Timestamp:
- Sep 9, 2007, 1:00:49 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondorestore.c
r1621 r1625 32 32 #include "mondo-rstr-tools-EXT.h" 33 33 34 #define DEFAULT_MR_LOGLEVEL 4 35 34 36 extern void twenty_seconds_til_yikes(void); 37 extern struct mr_ar_conf *mr_conf = NULL; 35 38 36 39 … … 1013 1016 struct s_node *node = NULL; 1014 1017 1015 old_loglevel = g_loglevel;1018 old_loglevel = mr_conf->log_level; 1016 1019 ubuf = &the_utime_buf; 1017 1020 assert(bkpinfo != NULL); … … 1076 1079 if (biggiestruct.use_ntfsprog) // if it's an NTFS device 1077 1080 { 1078 g_loglevel = 4;1081 mr_conf->log_level = 4; 1079 1082 use_ntfsprog_hack = TRUE; 1080 1083 mr_msg(2, … … 1241 1244 } 1242 1245 paranoid_fclose(fout); 1243 g_loglevel = old_loglevel;1246 mr_conf->log_level = old_loglevel; 1244 1247 1245 1248 if (use_ntfsprog_hack) { … … 1317 1320 ubuf = &the_utime_buf; 1318 1321 1319 old_loglevel = g_loglevel;1322 old_loglevel = mr_conf->log_level; 1320 1323 assert(bkpinfo != NULL); 1321 1324 assert(orig_bf_fname != NULL); … … 1365 1368 1366 1369 if (use_ntfsprog) { 1367 g_loglevel = 4;1370 mr_conf->log_level = 4; 1368 1371 mr_asprintf(&outfile_fname, orig_bf_fname); 1369 1372 use_ntfsprog_hack = TRUE; … … 1507 1510 } 1508 1511 1509 g_loglevel = old_loglevel;1512 mr_conf->log_level = old_loglevel; 1510 1513 return (retval); 1511 1514 } … … 2817 2820 } 2818 2821 2819 g_loglevel = DEFAULT_MR_LOGLEVEL;2822 mr_conf->log_level = DEFAULT_MR_LOGLEVEL; 2820 2823 2821 2824 /* Configure global variables */ … … 2926 2929 } 2927 2930 2928 g_loglevel = DEFAULT_MR_LOGLEVEL;2931 mr_conf->log_level = DEFAULT_MR_LOGLEVEL; 2929 2932 if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0) { 2930 2933 fout = fopen("/tmp/out.txt", "w"); … … 2958 2961 2959 2962 if (argc == 5 && strcmp(argv[1], "--common") == 0) { 2960 g_loglevel = 6;2963 mr_conf->log_level = 6; 2961 2964 filelist = load_filelist(argv[2]); 2962 2965 if (!filelist) { … … 2986 2989 if (argc == 5 && strcmp(argv[1], "--copy") == 0) { 2987 2990 mr_msg(1, "SCORE"); 2988 g_loglevel = 10;2991 mr_conf->log_level = 10; 2989 2992 if (strstr(argv[2], "save")) { 2990 2993 mr_msg(1, "Saving from %s to %s", argv[3], argv[4]);
Note:
See TracChangeset
for help on using the changeset viewer.