Changeset 1216 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Feb 27, 2007, 7:56:09 AM (17 years ago)

Author:

Bruno Cornec

Message:

First merge for mondo-rstr-tools.c

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (21 diffs)

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

@@ -5 +5 @@
 
 #include <pthread.h>
+#include <unistd.h>
 #include "my-stuff.h"
 #include "mr_mem.h"
@@ -13 +14 @@
 #include "libmondo.h"
 #include "mr-externs.h"
-//#include "mondo-restore.h"
-//#include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools.h"
 
@@ -40 +39 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern int g_partition_table_locked_up;
@@ -59 +59 @@
     mr_free(g_filelist_full);
     mr_free(g_filelist_imagedevs);
-//  mr_free (g_imagedevs_pot );
     mr_free(g_imagedevs_restthese);
     mr_free(g_mondo_cfg_file);
@@ -66 +65 @@
     mr_free(g_isodir_device);
     mr_free(g_isodir_format);
-
-}
-
+}
 
 
@@ -80 +77 @@
 void ask_about_these_imagedevs(char *infname, char *outfname)
 {
-    FILE *fin;
-    FILE *fout;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
   /************************************************************************
    * allocate memory regions. test and set  -sab 16 feb 2003              *
    ************************************************************************/
-    char *incoming_ptr;
-    char *question_ptr;
-
-    char incoming[MAX_STR_LEN] = "\0";
-    char question[MAX_STR_LEN];
+    char *incoming = NULL;
+    char *question = NULL;
+
+    size_t n = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(infname);
     assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-    incoming_ptr = mr_malloc(sizeof(incoming));
-    question_ptr = mr_malloc(sizeof(question));
-
-    memset(incoming_ptr, '\0', sizeof(incoming));
-    memset(question_ptr, '\0', sizeof(question));
-
-
-
     if (!(fin = fopen(infname, "r"))) {
         fatal_error("Cannot openin infname");
@@ -108 +96 @@
         fatal_error("Cannot openin outfname");
     }
-    for (fgets(incoming_ptr, MAX_STR_LEN, fin);
-         !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-        mr_strip_spaces(incoming_ptr);
+    for (mr_getline(&incoming, &n, fin);
+         !feof(fin); mr_getline(&incoming, &n, fin)) {
+        mr_strip_spaces(incoming);
 
         if (incoming[0] == '\0') {
@@ -116 +104 @@
         }
 
-        sprintf(question_ptr,
-                "Should I restore the image of %s ?", incoming_ptr);
-
-        if (ask_me_yes_or_no(question_ptr)) {
-            fprintf(fout, "%s\n", incoming_ptr);
-        }
+        mr_asprintf(&question,
+                 _("Should I restore the image of %s ?"), incoming);
+
+        if (ask_me_yes_or_no(question)) {
+            fprintf(fout, "%s\n", incoming);
+        }
+        mr_free(question);
     }
 
   /*** free memory ***********/
-    mr_free(incoming_ptr);
-    incoming_ptr = NULL;
-    mr_free(question_ptr);
-    question_ptr = NULL;
-
+    mr_free(incoming);
 
     paranoid_fclose(fout);
@@ -138 +123 @@
  *ASK_ABOUT_THESE_IMAGEDEVS                                               *
  **************************************************************************/
-
-
-
-
-
-
 
 
@@ -161 +140 @@
                                  char *output_mountlist_file)
 {
-    char *mountpt;
-    char *command;
-    char *orig_fname;
+    char *mountpt = NULL;
+    char *command = NULL;
+    char *orig_fname = NULL;
     int retval = 0;
 
     assert(bkpinfo != NULL);
-    malloc_string(mountpt);
-    malloc_string(command);
-    malloc_string(orig_fname);
     assert_string_is_neither_NULL_nor_zerolength(ramdisk_fname);
     assert_string_is_neither_NULL_nor_zerolength(output_cfg_file);
     assert_string_is_neither_NULL_nor_zerolength(output_mountlist_file);
-    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    sprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(&command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
+    mr_free(command);
+
+    mr_asprintf(&command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
             ramdisk_fname, bkpinfo->tmpdir);
-
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "umount %s", mountpt);
-
+    mr_free(command);
+
+    mr_asprintf(&command, "umount %s", mountpt);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(command, "mount -o loop %s/mindi.rd -t ext2 %s",
+    mr_free(command);
+
+    mr_asprintf(&command, "mount -o loop %s/mindi.rd -t ext2 %s",
             bkpinfo->tmpdir, mountpt);
-
     run_program_and_log_output(command, FALSE);
-
-    sprintf(command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-
+    mr_free(command);
+
+    mr_asprintf(&command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(command, "cp -f %s/%s %s",  // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s/%s %s", // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
             mountpt, g_mondo_cfg_file, output_cfg_file);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(orig_fname, "%s/%s", mountpt, g_mountlist_fname);
+    mr_free(command);
+
+    mr_asprintf(&orig_fname, "%s/%s", mountpt, g_mountlist_fname);
     if (does_file_exist(orig_fname)) {
-        sprintf(command, "cp -f %s %s", orig_fname, output_mountlist_file);
+        mr_asprintf(&command, "cp -f %s %s", orig_fname, output_mountlist_file);
         run_program_and_log_output(command, FALSE);
-    }
-    sprintf(command, "umount %s", mountpt);
+        mr_free(command);
+    }
+    mr_asprintf(&command, "umount %s", mountpt);
+    mr_free(mountpt);
+
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (!does_file_exist(output_cfg_file)
         || (!does_file_exist(output_mountlist_file)
@@ -213 +198 @@
         retval = 0;
     }
-    mr_free(mountpt);
-    mr_free(command);
     mr_free(orig_fname);
     return (retval);
-
-}
-
-
+}
 
 
@@ -231 +211 @@
     while (get_cfg_file_from_archive(bkpinfo)) {
         if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
+            (_
+             ("Failed to find config file/archives. Choose another source?")))
         {
             fatal_error("Could not find config file/archives. Aborting.");
@@ -251 +232 @@
 
   /** needs malloc **/
-    char *command;
-    char *file;
-    char *tmp;
-    int res;
-
-    malloc_string(command);
-    malloc_string(file);
-    malloc_string(tmp);
+    char *command = NULL;
+    char *file = NULL;
+    char *tmp = NULL;
+    int res = 0;
+
     assert_string_is_neither_NULL_nor_zerolength(f);
     assert_string_is_neither_NULL_nor_zerolength(list_fname);
@@ -264 +242 @@
 
     if (strncmp(preamble, f, strlen(preamble)) == 0) {
-        strcpy(file, f + strlen(preamble));
-    } else {
-        strcpy(file, f);
+        mr_asprintf(&file, f + strlen(preamble));
+    } else {
+        mr_asprintf(&file, f);
     }
     if (file[0] == '/' && file[1] == '/') {
-        strcpy(tmp, file);
-        strcpy(file, tmp + 1);
-    }
-    sprintf(tmp,
-            "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
+        mr_asprintf(&tmp, file);
+        mr_free(file);
+        mr_asprintf(&file, tmp + 1);
+        mr_free(tmp);
+    }
+    mr_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
             f, file);
-    mr_msg(2, tmp);
-    sprintf(command, "grep -E '^%s$' %s", file, list_fname);
+    mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
+    mr_free(file);
+
     res = run_program_and_log_output(command, FALSE);
     mr_free(command);
-    mr_free(file);
-    mr_free(tmp);
     if (res) {
         return (FALSE);
@@ -287 +265 @@
     }
 }
-
 /**************************************************************************
  *END_IS_FILE_IN_LIST                                                     *
  **************************************************************************/
-
 
 
@@ -305 +281 @@
 int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please)
 {
-    char *mount_isodir_command, *tmp, *command;
-    int retval = 0, i;
+    char *mount_isodir_command = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
+    int retval = 0, i = 0;
     bool already_mounted = FALSE;
 
     assert(bkpinfo != NULL);
-    malloc_string(mount_isodir_command);
-    malloc_string(tmp);
-    malloc_string(command);
+
     g_ISO_restore_mode = TRUE;
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
-/* Patch Conor Daly 26-june-2004 
- * Don't let this clobber an existing bkpinfo->isodir */
-        if (!bkpinfo->isodir[0]) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+    /* Patch Conor Daly 26-june-2004 
+     * Don't let this clobber an existing bkpinfo->isodir */
+        if (!bkpinfo->isodir) {
+            mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
         }
 /* End patch */
-        sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+        mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
         run_program_and_log_output(command, 5);
+        mr_free(command);
         mr_msg(2, "Setting isodir to %s", bkpinfo->isodir);
     }
@@ -335 +312 @@
 
     if (is_this_device_mounted(g_isodir_device)) {
-        log_to_screen("WARNING - isodir is already mounted");
+        log_to_screen(_("WARNING - isodir is already mounted"));
         already_mounted = TRUE;
     } else {
-        sprintf(mount_isodir_command, "mount %s", g_isodir_device);
         if (strlen(g_isodir_format) > 1) {
-            sprintf(mount_isodir_command + strlen(mount_isodir_command),
-                    " -t %s", g_isodir_format);
-        }
-        strcat(mount_isodir_command, " -o ro ");
-        strcat(mount_isodir_command, bkpinfo->isodir);
+            mr_asprintf(&mount_isodir_command, "mount %s -t %s -o ro %s", g_isodir_device, g_isodir_format, bkpinfo->isodir);
+        } else {
+            mr_asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
+        }
         run_program_and_log_output("df -m", FALSE);
-        sprintf(tmp,
-                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
+        mr_msg(1, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
                 mount_isodir_command);
-        mr_msg(1, tmp);
         if (run_program_and_log_output(mount_isodir_command, FALSE)) {
             popup_and_OK
-                ("Cannot mount the device where the ISO files are stored.");
+                (_
+                 ("Cannot mount the device where the ISO files are stored."));
+            mr_free(mount_isodir_command);
             return (1);
         }
+        mr_free(mount_isodir_command);
         log_to_screen
-            ("I have mounted the device where the ISO files are stored.");
+            (_
+             ("I have mounted the device where the ISO files are stored."));
     }
     if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -362 +339 @@
     }
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
-    sprintf(tmp, "%s #%d has been mounted via loopback mount",
-            media_descriptor_string(bkpinfo->backup_media_type), i);
-    mr_msg(1, tmp);
+    mr_msg(1, "%s #%d has been mounted via loopback mount",
+            bkpinfo->backup_media_string, i);
     if (i < 0) {
         popup_and_OK
-            ("Cannot find ISO images in the directory you specified.");
+            (_("Cannot find ISO images in the directory you specified."));
         retval = 1;
     }
     mr_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
             bkpinfo->isodir);
-    mr_free(mount_isodir_command);
-    mr_free(tmp);
-    mr_free(command);
     return (retval);
 }
 
 
-
-
 /**
  * Kill all Petris processes.
@@ -386 +357 @@
 void kill_petris(void)
 {
-    char *command;
-    malloc_string(command);
-    sprintf(command,
+    char *command = NULL;
+    mr_asprintf(&command,
             "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     paranoid_system(command);
@@ -398 +368 @@
  **************************************************************************/
 
-
-/**
- * (Disabled) Modify rc.local to fix some things on first boot.
- * This function currently doesn't do anything except make sure /tmp has the
- * right permissions.
- * @param path The path to /etc on the user's filesystem.
+/**
+ * Mount @p device at @p mpt as @p format.
+ * @param device The device (/dev entry) to mount.
+ * @param mpt The directory to mount it on.
+ * @param format The filesystem type of @p device.
+ * @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
  * @return 0 for success, nonzero for failure.
  */
-int modify_rclocal_one_time(char *path)
-{
-  /** malloc **/
-    char *rclocal_fname;
-    char *newfile_fname;
-    char *tmp;
-
-    malloc_string(rclocal_fname);
-    malloc_string(newfile_fname);
+int mount_device(char *device, char *mpt, char *format, bool writeable)
+{
+    int res = 0;
+
+    char *tmp = NULL;
+    char *command = NULL;
+    char *mountdir = NULL;
+    char *mountpoint = NULL;
+    char *additional_parameters = NULL;
+    char *p1 = NULL;
+    char *p2 = NULL;
+    char *p3 = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mpt);
+    assert(format != NULL);
     malloc_string(tmp);
-    assert_string_is_neither_NULL_nor_zerolength(path);
-
-    sprintf(rclocal_fname, "%s/rc.local", path);
-
-//  sprintf(tmp, "chmod 1777 %s/tmp", MNT_RESTORING);
-//  run_program_and_log_output( tmp, FALSE );
-    return (0);                 /* remove this line to open the floodgates... */
-
-    if (!does_file_exist(rclocal_fname)) {
-        sprintf(rclocal_fname, "%s/rc.d/rc.local", path);
-    }
-    if (!does_file_exist(rclocal_fname)) {
-        mr_free(rclocal_fname);
-        mr_free(newfile_fname);
-        mr_free(tmp);
-        return (1);
-    }
-    sprintf(newfile_fname, "%s/rc.local.mondorescue", path);
-    sprintf(tmp, "grep mondorescue %s > /dev/null 2> /dev/null",
-            rclocal_fname);
-    if (system(tmp)) {
-        sprintf(tmp, "echo \"[ -e %s ] && %s\n\" >> %s",
-                newfile_fname, newfile_fname, rclocal_fname);
-
-        paranoid_system(tmp);
-    }
-    sprintf(tmp, "echo -en \"#!/bin/sh\
-\\n\
-\\n\
-grep -v mondorescue %s > %s\\n\
-rm -f /var/lock/subsys/*xfs*\\n\
-rm -f /var/run/xfs.*\\n\
-killall xfs\\n\
-service xfs start\\n\
-yes | rm -f %s\\n\
-\" > %s", rclocal_fname, rclocal_fname, newfile_fname, newfile_fname);
-    sprintf(tmp, "chmod +x \"%s\"", newfile_fname);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(rclocal_fname);
-    mr_free(newfile_fname);
+    malloc_string(command);
+    malloc_string(mountdir);
+    malloc_string(additional_parameters);
+
+    if (!strcmp(mpt, "/1")) {
+        mr_asprintf(&mountpoint, "/");
+        mr_msg(3, "Mommm! SME is being a dildo!");
+    } else {
+        mr_asprintf(&mountpoint, mpt);
+    }
+
+    if (!strcmp(mountpoint, "lvm")) {
+        mr_free(mountpoint);
+        return (0);
+    }
+    if (!strcmp(mountpoint, "image")) {
+        mr_free(mountpoint);
+        return (0);
+    }
+    sprintf(tmp, "Mounting device %s   ", device);
+    mr_msg(1, tmp);
+    if (writeable) {
+        strcpy(additional_parameters, "-o rw");
+    } else {
+        strcpy(additional_parameters, "-o ro");
+    }
+    if (find_home_of_exe("setfattr")) {
+        strcat(additional_parameters, ",user_xattr");
+    }
+    if (find_home_of_exe("setfacl")) {
+        strcat(additional_parameters, ",acl");
+    }
+
+    if (!strcmp(mountpoint, "swap")) {
+        sprintf(command, "swapon %s", device);
+    } else {
+        if (!strcmp(mountpoint, "/")) {
+            strcpy(mountdir, MNT_RESTORING);
+        } else {
+            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        sprintf(command, "mkdir -p %s", mountdir);
+        run_program_and_log_output(command, FALSE);
+        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
+                additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_msg(2, "command='%s'", command);
+    }
+    res = run_program_and_log_output(command, TRUE);
+    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+        mr_msg(1, "Re-trying without the fancy extra parameters");
+        sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
+                mountdir, MONDO_LOGFILE);
+        res = run_program_and_log_output(command, TRUE);
+    }
+    if (res) {
+        mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
+                format, mountdir);
+        mr_msg(1, "command was '%s'", command);
+        if (!strcmp(mountpoint, "swap")) {
+            log_to_screen(tmp);
+        } else {
+            mr_msg(2, "Retrying w/o the '-t' switch");
+            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
+                    MONDO_LOGFILE);
+            mr_msg(2, "2nd command = '%s'", command);
+            res = run_program_and_log_output(command, TRUE);
+            if (res == 0) {
+                mr_msg(1,
+                        "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+            } else {
+                log_to_screen(tmp);
+            }
+        }
+    }
+    if (res && !strcmp(mountpoint, "swap")) {
+        mr_msg(2, "That's ok. It's just a swap partition.");
+        mr_msg(2, "Non-fatal error. Returning 0.");
+        res = 0;
+    }
+
     mr_free(tmp);
-    return (0);
+    mr_free(command);
+    mr_free(mountdir);
+    mr_free(mountpoint);
+    mr_free(additional_parameters);
+
+    return (res);
 }
 
 /**************************************************************************
- *END_ MODIFY_RCLOCAL_ONE_TIME                                            *
+ *END_MOUNT_DEVICE                                                        *
  **************************************************************************/
-
 
 
@@ -690 +711 @@
  *END_MOUNT_CDROM                                                         *
  **************************************************************************/
-
-
-/**
- * Mount @p device at @p mpt as @p format.
- * @param device The device (/dev entry) to mount.
- * @param mpt The directory to mount it on.
- * @param format The filesystem type of @p device.
- * @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
- * @return 0 for success, nonzero for failure.
- */
-int mount_device(char *device, char *mpt, char *format, bool writeable)
-{
-    int res = 0;
-
-  /** malloc **/
-    char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(mpt);
-    assert(format != NULL);
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(mountdir);
-    malloc_string(mountpoint);
-    malloc_string(additional_parameters);
-
-    if (!strcmp(mpt, "/1")) {
-        strcpy(mountpoint, "/");
-        mr_msg(3, "Mommm! SME is being a dildo!");
-    } else {
-        strcpy(mountpoint, mpt);
-    }
-
-    if (!strcmp(mountpoint, "lvm")) {
-        return (0);
-    }
-    if (!strcmp(mountpoint, "image")) {
-        return (0);
-    }
-    sprintf(tmp, "Mounting device %s   ", device);
-    mr_msg(1, tmp);
-    if (writeable) {
-        strcpy(additional_parameters, "-o rw");
-    } else {
-        strcpy(additional_parameters, "-o ro");
-    }
-    if (find_home_of_exe("setfattr")) {
-        strcat(additional_parameters, ",user_xattr");
-    }
-    if (find_home_of_exe("setfacl")) {
-        strcat(additional_parameters, ",acl");
-    }
-
-    if (!strcmp(mountpoint, "swap")) {
-        sprintf(command, "swapon %s", device);
-    } else {
-        if (!strcmp(mountpoint, "/")) {
-            strcpy(mountdir, MNT_RESTORING);
-        } else {
-            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        sprintf(command, "mkdir -p %s", mountdir);
-        run_program_and_log_output(command, FALSE);
-        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
-        mr_msg(2, "command='%s'", command);
-    }
-    res = run_program_and_log_output(command, TRUE);
-    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-        mr_msg(1, "Re-trying without the fancy extra parameters");
-        sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
-                mountdir, MONDO_LOGFILE);
-        res = run_program_and_log_output(command, TRUE);
-    }
-    if (res) {
-        mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
-                format, mountdir);
-        mr_msg(1, "command was '%s'", command);
-        if (!strcmp(mountpoint, "swap")) {
-            log_to_screen(tmp);
-        } else {
-            mr_msg(2, "Retrying w/o the '-t' switch");
-            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
-                    MONDO_LOGFILE);
-            mr_msg(2, "2nd command = '%s'", command);
-            res = run_program_and_log_output(command, TRUE);
-            if (res == 0) {
-                mr_msg(1,
-                        "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
-            } else {
-                log_to_screen(tmp);
-            }
-        }
-    }
-    if (res && !strcmp(mountpoint, "swap")) {
-        mr_msg(2, "That's ok. It's just a swap partition.");
-        mr_msg(2, "Non-fatal error. Returning 0.");
-        res = 0;
-    }
-
-    mr_free(tmp);
-    mr_free(command);
-    mr_free(mountdir);
-    mr_free(mountpoint);
-    mr_free(additional_parameters);
-
-    return (res);
-}
-
-/**************************************************************************
- *END_MOUNT_DEVICE                                                        *
- **************************************************************************/
-