Changeset 1120 in MondoRescue

Timestamp:

Feb 9, 2007, 8:09:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

fix linker errors
begining of rewrite for libmondo-devices.c

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (16 diffs)
• common/libmondo-files.c (modified) (2 diffs)
• mondoarchive/mondo-cli.c (modified) (1 diff)

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

@@ -14 +14 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
-
+#include "mr_mem.h"
+
+#include <sys/ioctl.h>
 #include <sys/types.h>
+#include <unistd.h>
 #ifdef __FreeBSD__
 #define DKTYPENAMES
@@ -100 +103 @@
 bool am_I_in_disaster_recovery_mode(void)
 {
-    char *tmp, *comment;
+    char *tmp = NULL;
+    char *comment = NULL;
     bool is_this_a_ramdisk = FALSE;
 
-    malloc_string(tmp);
-    malloc_string(comment);
-    strcpy(tmp, where_is_root_mounted());
-    sprintf(comment, "root is mounted at %s\n", tmp);
+    mr_asprintf(&tmp, where_is_root_mounted());
+    mr_asprintf(&comment, "root is mounted at %s\n", tmp);
     mr_msg(0, comment);
+    mr_free(comment);
+
     mr_msg(0,
             "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
@@ -126 +130 @@
     }
 #endif
+    mr_free(tmp);
 
     if (is_this_a_ramdisk) {
@@ -131 +136 @@
             && !does_file_exist("/tmp/mountlist.txt.sample")) {
             log_to_screen
-                ("Using /dev/root is stupid of you but I'll forgive you.");
+                (_("Using /dev/root is stupid of you but I'll forgive you."));
             is_this_a_ramdisk = FALSE;
         }
@@ -138 +143 @@
         is_this_a_ramdisk = TRUE;
     }
-    mr_free(tmp);
-    mr_free(comment);
     mr_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
-
-
-
 
 
@@ -182 +182 @@
         strcpy(output, "udev");
         break;
+    case usb:
+        strcpy(output, "usb");
+        break;
     default:
         strcpy(output, "default");
@@ -187 +190 @@
     return (output);
 }
-
 
 
@@ -201 +203 @@
 int eject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res1 = 0, res2 = 0;
-
-    malloc_string(command);
 
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        sprintf(command, "mt -f %s offline", dev);
+        mr_asprintf(&command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
+        mr_free(command);
     } else {
         res1 = 0;
@@ -216 +217 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s eject", dev);
-    } else {
-        sprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+        mr_asprintf(&command, "cdcontrol -f %s eject", dev);
+    } else {
+        mr_asprintf(&command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    sprintf(command, "eject %s", dev);
+    mr_asprintf(&command, "eject %s", dev);
 #endif
 
@@ -235 +236 @@
 }
 
+
 /**
  * Load (inject) the tray of the specified CD device.
@@ -242 +244 @@
 int inject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int i;
-
-    malloc_string(command);
-
 
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s close", dev);
-    } else {
-        sprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`",
+        mr_asprintf(&command, "cdcontrol -f %s close", dev);
+    } else {
+        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    sprintf(command, "eject -t %s", dev);
+    mr_asprintf(&command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
@@ -273 +272 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp;
-    bool ret;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+    bool ret = FALSE;
+
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    sprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
+    mr_asprintf(&tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -287 +285 @@
     }
     mr_free(tmp);
-    return (ret);
+    return(ret);
 }
 
@@ -318 +316 @@
     /*@ buffers **************************************************** */
     char *program;
-    char *incoming;
+    char *incoming = NULL;
     char *searchstr;
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ ints ******************************************************* */
     int res = 0;
+    size_t n = 0;
 
     /*@ pointers *************************************************** */
@@ -333 +332 @@
     assert(partno >= 0 && partno < 999);
 
-    malloc_string(program);
     malloc_string(incoming);
     malloc_string(searchstr);
@@ -340 +338 @@
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    sprintf(program, "ls %s >/dev/null 2>&1", drive,
+    // BERLIOS: This is BROKEN - 1 %s - 2 params !!
+    mr_asprintf(&program, "ls %s >/dev/null 2>&1", drive,
             build_partition_name(tmp, drive, partno));
     return system(program);

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

@@ -18 +18 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+
 #include "mr_mem.h"
-
+#include "mr_msg.h"
 #include "mr_file.h"
 
@@ -1265 +1266 @@
             *(strchr(tmp, ' ')) = '\0';
         }
-        if (!strcmp(sz_last_suffix(filename), tmp)) {
+        if (!strcmp(strrchr(filename,'.'), tmp)) {
             mr_free(do_not_compress_these);
             mr_free(tmp);

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -16 +16 @@
 #include "../common/libmondo.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 //static char cvsid[] = "$Id$";