Changeset 1074 in MondoRescue for trunk/mondo/src/lib/mr_msg.c

Timestamp:

Jan 25, 2007, 4:18:12 PM (17 years ago)

Author:

Bruno Cornec

Message:

This version of trunk desn't seg fault on mr_msg anymore.
Still not ready for 3.0.0 but improvements ongoing

File:

• trunk/mondo/src/lib/mr_msg.c (modified) (2 diffs)

trunk/mondo/src/lib/mr_msg.c

@@ -10 +10 @@
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 static int mr_loglevel = 0;
 static char *mr_logfile = NULL;
 
+/*
+ * This function is in the lowest part of the tree
+ * It should not depend on any other function of the mr lib 
+ */
+
+/* Cleanup function for messages */
+void mr_msg_close(void) {
+    free(mr_logfile);
+    mr_logfile = NULL;
+    mr_loglevel = 0;
+}
+
 /* Initialization function for messages */
-void mr_msg_init(void) {
+void mr_msg_init(const char *configfile, int loglevel) {
+    FILE *fout = NULL;
+    int res = 0;
 
+    asprintf(&mr_logfile,configfile);
+    if ((fout = fopen(mr_logfile, "w")) == NULL) {
+        fprintf(stderr,"Unable to write to %s\n",mr_logfile);
+        fprintf(stderr,"Logging desactivated\n");
+        mr_msg_close();
+    }
+    if ((res = fclose(fout)) != 0) {
+        fprintf(stderr,"Unable to close %s\n",mr_logfile);
+    }
+    mr_loglevel = loglevel;
 }
 
 /*
  * Function that log a message. Not called directly 
- * but through macros in mr_msg.h
+ * but through other functions
  */
-void _mr_msg(int debug, const char *file, const char *function, int line, const char *fmt, ...) {
+void mr_msg(int debug, const char *fmt, ...) {
 
-    va_list args;
     int i = 0;
     int res = 0;
     FILE *fout = NULL;
+    va_list args;
+
+    if (mr_logfile == NULL) {
+        return;
+    }
 
     if (debug <= mr_loglevel) {
-        va_start(args, fmt);
-        if (!(fout = fopen(mr_logfile, "a"))) {
+        if ((fout = fopen(mr_logfile, "a")) == NULL) {
             fprintf(stderr,"Unable to append to %s\n",mr_logfile);
             return;
@@ -43 +74 @@
             for (i = 1; i < debug; i++)
                 fprintf(fout, "  ");
-            fprintf(fout, "%s->%s#%d: ", file, function, line);
+            fprintf(fout, "%s->%s#%d: ", __FILE__, __FUNCTION__, __LINE__);
         }
-        vfprintf(fout, fmt, args);
+        va_start(args,fmt);
+        if (vfprintf(fout, fmt, args) < 0) {
+            fprintf(stderr,"Unable to print to %s\n",mr_logfile);
+        }
+        va_end(args);
 
-        va_end(args);
-        fprintf(fout, "\n");
         if ((res = fclose(fout)) != 0) {
             fprintf(stderr,"Unable to close %s\n",mr_logfile);