Changeset 3628 in MondoRescue

Timestamp:

Dec 21, 2016, 3:18:07 PM (7 years ago)

Author:

Bruno Cornec

Message:

Change mr_msg_init interface definition to include argc and argv, which allows to detect the presence of the -K option and setup the log level accordingly as early as possible

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• include/mr_msg.h (modified) (1 diff)
• lib/mr_msg.c (modified) (3 diffs)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -976 +976 @@
                     if (optarg[0] != '/' && optarg[len - 1] == '/') {
                         optarg[--len] = '\0';
-                        log_to_screen
-                            ("Warning - param '%s' should not have trailing slash!",
-                             optarg);
+                        log_to_screen("Warning - param '%s' should not have trailing slash!", optarg);
                     }
                     if (opt == 'd') {

branches/3.3/mondo/src/include/mr_msg.h

@@ -17 +17 @@
 
 #define mr_msg(lvl,fmt,args...) {mr_msg_int(lvl,__LINE__,__FILE__,__FUNCTION__,fmt,## args);}
-extern void mr_msg_init(const char *logfile, int loglevel);
+extern void mr_msg_init(const char *logfile, int loglevel, int argc, char *argv[]);
 extern void mr_msg_close(void);
 extern void mr_msg_loglevel(int loglevel);

branches/3.3/mondo/src/lib/mr_msg.c

@@ -13 +13 @@
 #define _GNU_SOURCE
 #endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 
 static int mr_loglevel = 0;
@@ -48 +51 @@
 
 /* Initialization function for messages */
-void mr_msg_init(const char *logfile, int loglevel) {
+void mr_msg_init(const char *logfile, int loglevel, int argc, char *argv[]) {
+
+    int i=1;
+
     if (asprintf(&mr_logfile, "%s", logfile) == -1) {
         fprintf(stderr,"Unable to alloc memory\n");
@@ -67 +73 @@
             fprintf(stderr,"Logging desactivated\n");
             mr_msg_close();
+        }
+    }
+    while (i < argc) {
+        if (strcmp(argv[i],"-K") == 0) {
+            i++;
+            if (argv[i]) {
+                loglevel = atoi(argv[i]);
+            } else {
+                fprintf(stderr,"-K option requires a loglevel\n");
+                mr_msg_close();
+                exit(-1);
+            }
         }
     }

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -324 +324 @@
 
     /*  setup log level for new log system as well */
-    mr_msg_init(MONDO_LOGFILE,g_loglevel);
+    mr_msg_init(MONDO_LOGFILE,g_loglevel, argc, argv);
 
     if (pre_param_configuration()) {

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -2797 +2797 @@
 
     /*  setup log level for new log system as well */
-    mr_msg_init(MONDO_LOGFILE,g_loglevel);
+    mr_msg_init(MONDO_LOGFILE,g_loglevel,argc,argv);
 
     // Handle params here first