Changeset 1316 in MondoRescue

Timestamp:

Apr 16, 2007, 4:50:28 PM (17 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

Files:

• common/libmondo-archive.c (modified) (3 diffs)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-fifo.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-stream.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/libmondo-verify.c (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondoarchive/main.c (modified) (1 diff)
• mondoarchive/mondoarchive.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.h (modified) (1 diff)

branches/2.2.2/mondo/src/common/libmondo-archive.c

@@ -173 +173 @@
  */
 
-#include "../common/my-stuff.h"
-#include "../common/mondostructures.h"
+#include "my-stuff.h"
+#include "mondostructures.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -187 +187 @@
 #include "libmondo-archive.h"
 #include "lib-common-externs.h"
+#include "mondoarchive.h"
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -237 +238 @@
 extern char *g_getfacl;
 extern char *g_getfattr;
+extern char *MONDO_LOGFILE;
 
 

branches/2.2.2/mondo/src/common/libmondo-devices.c

@@ -261 +261 @@
 extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;
+extern char *MONDO_LOGFILE;
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";

branches/2.2.2/mondo/src/common/libmondo-fifo.c

@@ -138 +138 @@
 extern char *ps_options;
 extern char *ps_proc_id;
+extern char *MONDO_LOGFILE;
 
 /**

branches/2.2.2/mondo/src/common/libmondo-filelist.c

@@ -136 +136 @@
 
 extern ssize_t getline(char **lineptr, size_t * n, FILE * stream);
+extern char *MONDO_LOGFILE;
 
 

branches/2.2.2/mondo/src/common/libmondo-fork.c

@@ -117 +117 @@
 extern t_bkptype g_backup_media_type;
 extern bool g_text_mode;
+extern char *MONDO_LOGFILE;
 pid_t g_buffer_pid = 0;
 

branches/2.2.2/mondo/src/common/libmondo-stream.c

@@ -118 +118 @@
 extern char *g_getfacl;
 extern char *g_getfattr;
+extern char *MONDO_LOGFILE;
 
 /**

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

@@ -194 +194 @@
 extern int g_currentY;
 extern int g_current_media_number;
+extern char *MONDO_LOGFILE;
 
 /**

branches/2.2.2/mondo/src/common/libmondo-verify.c

@@ -126 +126 @@
 extern char *g_getfacl;
 extern char *g_getfattr;
+extern char *MONDO_LOGFILE;
 
 /**

branches/2.2.2/mondo/src/common/newt-specific.c

@@ -120 +120 @@
 #include "libmondo-gui-EXT.h"
 #include "lib-common-externs.h"
+
+extern char *MONDO_LOGFILE;
 
 /*@unused@*/

branches/2.2.2/mondo/src/mondoarchive/main.c

@@ -141 +141 @@
 bool g_skip_floppies;
 long diffs;
-char *ps_options = "auxww";
-char *ps_proc_id = "$2";
 
 extern t_bkptype g_backup_media_type;

branches/2.2.2/mondo/src/mondoarchive/mondoarchive.h

@@ -8 +8 @@
  * Compatibility #define to ease the transition to logfile-in-a-variable.
  */
-#define MONDO_LOGFILE    "/var/log/mondoarchive.log"
+char *MONDO_LOGFILE = "/var/log/mondoarchive.log"
+
+/* No restriction on ps options */
+char *ps_options = "auxww";
+char *ps_proc_id = "$2";

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";