Changeset 1917 in MondoRescue for branches/2.2.6/mondo/src/common/libmondo-tools.c

Timestamp:

Apr 17, 2008, 1:29:45 AM (16 years ago)

Author:

Bruno Cornec

Message:

mondo.libmondo-cli.patch (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>) modified to not duplicate the newt initialization stuff (we should rather remove them in mondoarchive)

File:

• branches/2.2.6/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

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

@@ -180 +180 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-raid-EXT.h"
+#include "libmondo-devices-EXT.h"
 #include <sys/socket.h>
 #include <netdb.h>
@@ -244 +245 @@
 
 extern bool am_I_in_disaster_recovery_mode(void);
+
+/* Return a string containing the date */
+char *mr_date(void) {
+
+        time_t tcurr;
+
+        tcurr = time(NULL);
+        return(ctime(&tcurr));
+}
+
+/*-----------------------------------------------------------*/
 
 
@@ -1001 +1013 @@
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
 
-    /* special case for tmpdir as used eveywhere after */
-    setup_tmpdir(NULL);
+    sensibly_set_tmpdir_and_scratchdir();
 
     bkpinfo->manual_cd_tray = FALSE;
@@ -1030 +1041 @@
     strcpy(bkpinfo->prefix, STD_PREFIX);
 
-    bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     bkpinfo->optimal_set_size = 0;