Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-tools.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/mondo/mondo/common/libmondo-tools.c (modified) (17 diffs)

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

@@ -174 +174 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
+#include "lib-common-externs.h"
 #include "libmondo-tools.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -270 +271 @@
         newtSuspend();
 #endif
-    printf(_("ASSERTION FAILED: `%s'\n"), exp);
-    printf(_("\tat %s:%d in %s\n\n"), file, line, function);
-    printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
+    printf("ASSERTION FAILED: `%s'\n", exp);
+    printf("\tat %s:%d in %s\n\n", file, line, function);
+    printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
     do {
         is_valid = TRUE;
@@ -299 +300 @@
         case '\n':
             printf
-                (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
+                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
             break;
         default:
             is_valid = FALSE;
-            printf(_("Invalid choice.\n"));
+            printf("Invalid choice.\n");
             break;
         }
@@ -472 +473 @@
 #endif
 }
+
+
+/**
+ * Log a trace message to the trace file.
+ * @bug This function seems orphaned. Please remove.
+ */
+void log_trace(char *o)
+{
+    /*@ pointers **************************************************** */
+    FILE *fout;
+
+    /*@ buffers ***************************************************** */
+    char output[MAX_STR_LEN];
+
+    /*@ int    ****************************************************** */
+    int i;
+
+    /*@ end vars *************************************************** */
+
+    if (o[0] == '\0') {
+        return;
+    }
+    strcpy(output, o);
+    i = (int) strlen(output);
+    if (i <= 0) {
+        return;
+    }
+    if (output[i - 1] < 32) {
+        output[i - 1] = '\0';
+    }
+    if (g_text_mode
+        /* && !strstr(last_line_of_file(MONDO_LOGFILE),output) */ ) {
+        printf("%s\n", output);
+    }
+
+    fout = fopen(MONDO_TRACEFILE, "a");
+    if (fout) {
+        fprintf(fout, "%s\n", output);
+        paranoid_fclose(fout);
+    } else {
+        log_OS_error("Cannot write to tracefile");
+    }
+}
+
+
+
 
 
@@ -923 +970 @@
         strcpy(bkpinfo->isodir, "/");
     } else {
-        strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
+        strcpy(bkpinfo->isodir, "/root/images/mondo");
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
@@ -1022 +1069 @@
     if (atol(tmp) < 35000) {
         retval++;
-        log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
+        log_to_screen("You must have at least 32MB of RAM to use Mondo.");
     }
     if (atol(tmp) < 66000) {
         log_to_screen
-            (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
-    }
-#endif
-
-    if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
+            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+    }
+#endif
+
+    if ((Lres = free_space_on_given_partition("/root")) == -1) {
         Lres = free_space_on_given_partition("/");
     }
-    */
     log_it("Free space on given partition = %ld MB", Lres);
 
     if (Lres < 50) {
-        fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner."); 
+        run_program_and_log_output
+            ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
+             3);
+        //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 
@@ -1051 +1100 @@
         ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
-            (_("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")))
+            ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
         {
             //          retval++;
             log_to_screen
-                (_("It looks as if your kernel lacks ramdisk and initrd support."));
+                ("It looks as if your kernel lacks ramdisk and initrd support.");
             log_to_screen
-                (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
+                ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
         }
     }
@@ -1079 +1128 @@
         !run_program_and_log_output
         ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
-        log_to_screen(_("I think you have a Windows 9x partition."));
+        log_to_screen("I think you have a Windows 9x partition.");
         retval += whine_if_not_found("parted");
 #ifndef __IA64__
@@ -1085 +1134 @@
         // retval += 
         if (!find_home_of_exe("ms-sys")) {
-            log_to_screen(_("Please install ms-sys just in case."));
+            log_to_screen("Please install ms-sys just in case.");
         }
 #endif
@@ -1095 +1144 @@
         } else {
             log_to_screen
-                (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
+                ("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
             if (run_program_and_log_output
                 ("cp -f `which true` /usr/bin/cmp", 0)) {
@@ -1110 +1159 @@
         if (strstr(tmp, "autofs")) {
             log_to_screen
-                (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
+                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
             log_to_screen
-                (_("if a CD actually is inserted. If a CD is inserted, please"));
-            log_to_screen(_("eject it. Thank you."));
+                ("if a CD actually is inserted. If a CD is inserted, please");
+            log_to_screen("eject it. Thank you.");
             log_it
                 ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
@@ -1139 +1188 @@
             retval++;
             log_to_screen
-                (_("Please find out what happened to /etc/modules.conf"));
+                ("Please find out what happened to /etc/modules.conf");
         }
     }
@@ -1152 +1201 @@
 
     if (run_program_and_log_output("mindi -V", 1)) {
-        log_to_screen(_("Could not ascertain mindi's version number."));
+        log_to_screen("Could not ascertain mindi's version number.");
         log_to_screen
-            (_("You have not installed Mondo and/or Mindi properly."));
-        log_to_screen(_("Please uninstall and reinstall them both."));
+            ("You have not installed Mondo and/or Mindi properly.");
+        log_to_screen("Please uninstall and reinstall them both.");
         fatal_error("Please reinstall Mondo and Mindi.");
     }
@@ -1161 +1210 @@
         ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
         log_to_screen
-            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
+            ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
         log_to_screen
-            (_("Please run that command by hand and examine /var/log/mindi.log"));
+            ("Please run that command by hand and examine /var/log/mindi.log");
         log_to_screen
-            (_("for more information. Perhaps your /etc/fstab file is insane."));
+            ("for more information. Perhaps your /etc/fstab file is insane.");
         log_to_screen
-            (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
+            ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
         retval++;
     }
@@ -1174 +1223 @@
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
-            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
+            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
         create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
     }
 
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
     return (retval);
@@ -1443 +1492 @@
 }
 
+
+/**
+ * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
+ * information to the logfile.
+ */
+void standard_log_debug_msg(int debug_level, const char *szFile,
+                            const char *szFunction, int nLine,
+                            const char *fmt, ...)
+{
+    va_list args;
+    int i;
+    static int depth = 0;
+    char *tmp;
+    FILE *fout;
+
+    if (depth > 5) {
+        depth--;
+        return;
+    }
+    depth++;
+
+    malloc_string(tmp);
+
+    if (debug_level <= g_loglevel) {
+        va_start(args, fmt);
+        if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
+            return;
+        }                       // fatal_error("Failed to openout to logfile - sheesh..."); }
+
+        // add tabs to distinguish log levels
+        if (debug_level > 0) {
+            for (i = 1; i < debug_level; i++)
+                fprintf(fout, "\t");
+            if (getpid() == g_main_pid)
+                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
+                        nLine);
+            else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
+                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
+                        nLine);
+            else
+                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
+                        szFunction, nLine);
+        }
+        vfprintf(fout, fmt, args);
+
+        // do not slow down the progran if standard debug level
+        // must be enabled: if no flush, the log won't be up-to-date if there
+        // is a segfault
+        //if (g_dwDebugLevel != 1)
+
+        va_end(args);
+        fprintf(fout, "\n");
+        paranoid_fclose(fout);
+    }
+    depth--;
+    paranoid_free(tmp);
+}
+
+/**
+ * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
+ */
+void (*log_debug_msg) (int, const char *, const char *, int, const char *,
+                       ...) = standard_log_debug_msg;
+
+
 /**
  * If @p y, malloc @p x, else free @p x.
@@ -1472 +1586 @@
         paranoid_free(g_magicdev_command);
     }
+
+    /*
+       char**list_of_arrays[] = {
+       &g_boot_mountpt,
+       &g_mondo_home,
+       &g_tmpfs_mountpt,
+       &g_erase_tmpdir_and_scratchdir,
+       &g_serial_string,
+       &g_magicdev_command,
+       NULL};
+
+       char**ppcurr;
+       int i;
+
+       for(i=0;list_of_arrays[i];i++)
+       {
+       log_msg(5, "Allocating %d", i);
+       ppcurr = list_of_arrays[i];
+       if (mal)
+       { *ppcurr = malloc(MAX_STR_LEN); }
+       else
+       {
+       if (*ppcurr)
+       {
+       free(*ppcurr);
+       }
+       }
+       }
+       log_msg(5, "Returning");
+     */
 }