Changeset 1061 in MondoRescue for branches/stable/mondo/src

Timestamp:

Jan 18, 2007, 1:47:59 PM (18 years ago)

Author:

Bruno Cornec

Message:

• mpt + ohci modules added for mindi
• PATH fixed for init in restore (/usr/games added for petris + fixes)
• Useless conf files removed from rootfs/etc or cleaned up
• Still trying to have a working va_list by busybox alignment

Location:

branches/stable/mondo/src

Files:

• common/libmondo-tools.c (modified) (1 diff)
• include/mr_mem.h (modified) (1 diff)
• include/mr_msg.h (modified) (1 diff)
• lib/mr_err.c (modified) (1 diff)
• lib/mr_mem.c (modified) (2 diffs)
• lib/mr_msg.c (modified) (4 diffs)

branches/stable/mondo/src/common/libmondo-tools.c

@@ -343 +343 @@
 
 /**
- * Locate mondoarchive's home directory. Searches in /usr/local/mondo, /usr/share/mondo,
+ * Locate mondoarchive's home directory. Searches in /usr/share/mondo,
  * /usr/local/share/mondo, /opt, or if all else fails, search /usr.
  *

branches/stable/mondo/src/include/mr_mem.h

@@ -9 +9 @@
 #define MR_MEM_H
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <stdarg.h>
+
 /* functions (public methods) */
 
 extern void mr_free(char *allocated);
 extern void mr_allocstr(char *alloc, const char *orig);
-extern void mr_asprintf(char **alloc, const char *fmt, ...);
-/*
-extern void mr_vasprintf(char **alloc, const char *fmt, va_list ap);
-*/
+extern void mr_asprintf(char **alloc, const char *fmt, va_list args);
 extern void mr_getline(char **lineptr, size_t *n, FILE *stream);
 extern void *mr_malloc(size_t size);

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

@@ -9 +9 @@
 #define MR_MSG_H
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <stdarg.h>
+
 /* functions (public methods) */
 
-#include <stdarg.h>
-
-extern void mr_msg(int debug, const char *fmt, ...);
+extern void mr_msg(int debug, const char *fmt, va_list args);
 
 #endif                          /* MR_MSG_H */

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

@@ -36 +36 @@
 
 void mr_log_exit(int errorcode, const char *message) {
-    mr_msg(0,message);
+    mr_msg(0, message);
     mr_exit(errorcode, message);
 }

branches/stable/mondo/src/lib/mr_mem.c

@@ -12 +12 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 
 #include "mr_err.h"
@@ -53 +52 @@
 
 /* encapsulation function for asprintf */
-void mr_asprintf(char **strp, const char *fmt, ...) {
+void mr_asprintf(char **strp, const char *fmt, va_list args) {
 
-    va_list args;
     int res = 0;
 
-    va_start(args, fmt);
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
         mr_log_exit(-1,"Unable to alloc memory in mr_asprintf\nExiting...");
     }
-    va_end(args);
 }
 

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

@@ -30 +30 @@
     if ((fout = fopen(mr_logfile, "w")) == NULL) {
         fprintf(stderr,"Unable to write to %s\n",mr_logfile);
-        fprintf(stderr,"Logging desactivated\n",mr_logfile);
+        fprintf(stderr,"Logging desactivated\n");
         mr_msg_close();
     }
@@ -41 +41 @@
 /*
  * 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 *file, const char *function, int line, const char *fmt, va_list args) {
 
     int i = 0;
     int res = 0;
     FILE *fout = NULL;
-    va_list args;
 
     if (mr_logfile == NULL) {
@@ -66 +65 @@
             fprintf(fout, "%s->%s#%d: ", file, function, line);
         }
-        va_start(args, fmt);
         if (vfprintf(fout, fmt, args) < 0) {
             fprintf(stderr,"Unable to print to %s\n",mr_logfile);
+            return;
         }
-        va_end(args);
 
         fprintf(fout, "\n");
@@ -79 +77 @@
 }
 
-void mr_msg(int level, const char *format, ...) {
+void mr_msg(int level, const char *fmt, va_list args) {
 
-    va_list args;
-    va_start(args, format);
-    _mr_msg(level, __FILE__, __FUNCTION__, __LINE__, format, args);
-    va_end(args);
+    _mr_msg(level, __FILE__, __FUNCTION__, __LINE__, fmt, args);
 }