Changeset 1316 in MondoRescue for branches/2.2.2/mondo/src/mondorestore

Timestamp:

04/16/07 16:50:28 (20 years ago)

Author:

Bruno Cornec

Message:

MONDO_LOGFILE is rather a char* exported by each main program (consolidation of those mecanisms in .h files with ps_*)

Location:

branches/2.2.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-restore.c (modified) (1 diff)
• mondo-rstr-compare.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (1 diff)
• mondorestore.h (modified) (1 diff)

branches/2.2.2/mondo/src/mondorestore/mondo-prep.c

@@ -189 +189 @@
 
 extern void pause_for_N_seconds(int, char *);
+extern char *MONDO_LOGFILE;
 
 

branches/2.2.2/mondo/src/mondorestore/mondo-restore.c

@@ -120 +120 @@
  */
 char *g_mondo_home;
-
-/* Busybox ps has no option and PID in first pos */
-char *ps_options = "";
-char *ps_proc_id = "$1";
 
 extern char *g_getfacl;

branches/2.2.2/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -64 +64 @@
 #include "mondo-restore-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+
+extern char *MONDO_LOGFILE;
 
 //static char cvsid[] = "$Id$";

branches/2.2.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -160 +160 @@
 
 extern int g_partition_table_locked_up;
+extern char *MONDO_LOGFILE;
 
 /* Should we use or not extended attributes and acl when restoring */

branches/2.2.2/mondo/src/mondorestore/mondorestore.h

@@ -8 +8 @@
  * Compatibility #define to ease the transition to logfile-in-a-variable.
  */
-#define MONDO_LOGFILE    "/tmp/mondorestore.log"
+char *MONDO_LOGFILE = "/tmp/mondorestore.log"
+
+/* Busybox ps has no option and PID in first pos */
+char *ps_options = "";
+char *ps_proc_id = "$1";