Changeset 2382 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.c

Timestamp:

Sep 10, 2009, 2:07:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/newt-specific.c (modified) (7 diffs)

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

@@ -20 +20 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -99 +100 @@
     long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-    char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
+    char *g_selfmounted_isodir; ///< Holds the NETFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
@@ -1106 +1107 @@
  * Ask the user which backup media type they would like to use.
  * The choices are @p none (exit to shell), @c cdr, @c cdrw, @c dvd,
- * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c nfs,
+ * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c netfs,
  * and @c iso.
  * @param restoring TRUE if we're restoring, FALSE if we're backing up.
@@ -1120 +1121 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "nfs", "iso", NULL };
+        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
+        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
         t_bkptype backup_type;
@@ -1171 +1172 @@
         b4 = newtButton(17, 5, "USB Key/Disk");
         b5 = newtButton(1, 5, " DVD disks ");
-        b6 = newtButton(17, 9, " NFS mount ");
+        b6 = newtButton(17, 9, " Net mount ");
         b7 = newtButton(1, 13, " Hard disk ");
         b8 = newtButton(17, 13, "    Exit   ");
@@ -1191 +1192 @@
             output = dvd;
         } else if (b_res == b6) {
-            output = nfs;
+            output = netfs;
         } else if (b_res == b7) {
             output = iso;
@@ -1453 +1454 @@
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
-            tmp = filelist_entry_to_string(&(filelist->el[i])), keylist[i];
-            newtListboxAppendEntry(fileListbox, tmp);
+            tmp = filelist_entry_to_string(&(filelist->el[i]));
+            newtListboxAppendEntry(fileListbox, tmp, keylist[i]);
             mr_free(tmp);
         }