Changeset 3189 in MondoRescue

Timestamp:

Sep 25, 2013, 8:55:41 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Again some more backports from 3.1 for memory management

Location:

branches/3.0/mondo/src

Files:

• include/my-stuff.h (modified) (2 diffs)
• lib/mr_err.c (modified) (2 diffs)

branches/3.0/mondo/src/include/my-stuff.h

@@ -77 +77 @@
  * The location where mindi media images are stored.
  */
-#define MINDI_CACHE "/var/cache/mindi"
+#define MINDI_CACHE_REL "var/cache/mindi"   /* Should be coherent with mindi */
+#define MINDI_CACHE "/"MINDI_CACHE_REL
 
 /**
@@ -88 +89 @@
  */
 #define MDSTAT_FILE "/proc/mdstat"
+
+#ifdef __FreeBSD__
+#define CMDLINE "/tmp/cmdline"
+#else
+// Default Linux
+#define CMDLINE "/proc/cmdline"
+#endif
 
 #undef assert

branches/3.0/mondo/src/lib/mr_err.c

@@ -16 +16 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "mr_msg.h"
 
 /* Pointer to the right cleanup function provided by each main */
-extern void (*mr_cleanup)(void);
+extern void (*mr_cleanup)(int);
 
 /*
@@ -26 +27 @@
 
     if (mr_cleanup != NULL) {
-        mr_cleanup();
+        mr_cleanup(errorcode);
     }
     if (message != NULL) {
         fprintf(stderr,"%s\n",message);
     }
+    mr_msg_close();
     exit(errorcode);
 }