Changeset 3628 in MondoRescue
- Timestamp:
- Dec 21, 2016, 3:18:07 PM (7 years ago)
- Location:
- branches/3.3/mondo/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/mondo/src/common/libmondo-cli.c
r3610 r3628 976 976 if (optarg[0] != '/' && optarg[len - 1] == '/') { 977 977 optarg[--len] = '\0'; 978 log_to_screen 979 ("Warning - param '%s' should not have trailing slash!", 980 optarg); 978 log_to_screen("Warning - param '%s' should not have trailing slash!", optarg); 981 979 } 982 980 if (opt == 'd') { -
branches/3.3/mondo/src/include/mr_msg.h
r3509 r3628 17 17 18 18 #define mr_msg(lvl,fmt,args...) {mr_msg_int(lvl,__LINE__,__FILE__,__FUNCTION__,fmt,## args);} 19 extern void mr_msg_init(const char *logfile, int loglevel );19 extern void mr_msg_init(const char *logfile, int loglevel, int argc, char *argv[]); 20 20 extern void mr_msg_close(void); 21 21 extern void mr_msg_loglevel(int loglevel); -
branches/3.3/mondo/src/lib/mr_msg.c
r3509 r3628 13 13 #define _GNU_SOURCE 14 14 #endif 15 15 16 #include <stdio.h> 16 17 #include <stdarg.h> 17 18 #include <stdlib.h> 19 #include <unistd.h> 20 #include <string.h> 18 21 19 22 static int mr_loglevel = 0; … … 48 51 49 52 /* Initialization function for messages */ 50 void mr_msg_init(const char *logfile, int loglevel) { 53 void mr_msg_init(const char *logfile, int loglevel, int argc, char *argv[]) { 54 55 int i=1; 56 51 57 if (asprintf(&mr_logfile, "%s", logfile) == -1) { 52 58 fprintf(stderr,"Unable to alloc memory\n"); … … 67 73 fprintf(stderr,"Logging desactivated\n"); 68 74 mr_msg_close(); 75 } 76 } 77 while (i < argc) { 78 if (strcmp(argv[i],"-K") == 0) { 79 i++; 80 if (argv[i]) { 81 loglevel = atoi(argv[i]); 82 } else { 83 fprintf(stderr,"-K option requires a loglevel\n"); 84 mr_msg_close(); 85 exit(-1); 86 } 69 87 } 70 88 } -
branches/3.3/mondo/src/mondoarchive/mondoarchive.c
r3527 r3628 324 324 325 325 /* setup log level for new log system as well */ 326 mr_msg_init(MONDO_LOGFILE,g_loglevel );326 mr_msg_init(MONDO_LOGFILE,g_loglevel, argc, argv); 327 327 328 328 if (pre_param_configuration()) { -
branches/3.3/mondo/src/mondorestore/mondorestore.c
r3613 r3628 2797 2797 2798 2798 /* setup log level for new log system as well */ 2799 mr_msg_init(MONDO_LOGFILE,g_loglevel );2799 mr_msg_init(MONDO_LOGFILE,g_loglevel,argc,argv); 2800 2800 2801 2801 // Handle params here first
Note:
See TracChangeset
for help on using the changeset viewer.