Changeset 2426 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

Sep 25, 2009, 7:42:09 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Attempt to stay backward compatible without protocol for -n option

File:

• branches/2.2.9/mondo/src/common/libmondo-cli.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -482 +482 @@
         }
         /* test for protocol */
-        p = strchr(bkpinfo->netfs_mount, ':');
+        p = strstr(bkpinfo->netfs_mount, "://");
         if (p == NULL) {
-            /* protocol not found abort */
-            fatal_error("No protocol specified for remote share mount. Please do man mondoarchive as syntax changed");
+            /* protocol not found assuming NFS for compatibility */
+            mr_asprintf(&q,"nfs");
+
+            p = strchr(bkpinfo->netfs_mount, ':');
+            if (p == NULL) {
+                fatal_error("No protocol specified for remote share mount, nor any old NFS syntax found.\nPlease do man mondoarchive as syntax changed");
+            }
+            /* p points on to the string server:/path */
+            p = bkpinfo->netfs_mount;
+
         } else {
-            /* Proto found. Store the 2 values */
-            p++;
-            if (*p != '/') {
-                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
-            }
-            p++;
-            if (*p != '/') {
-                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
-            }
-            p++;
-            /* p points on to the string server:/path */
-            strcpy(tmp,p);
-
-            /* going back to protocol */
-            p--;
-            p--;
-            p--;
+            /* Isolate the protocol */
             *p = '\0';
             mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
-            bkpinfo->netfs_proto = q;
-            strcpy(bkpinfo->netfs_mount,tmp);
-        }
+
+            /* Skip proto now */
+            p++;
+            p++;
+            p++;
+        }
+        /* whatever done before proto is pointed to by q */
+        bkpinfo->netfs_proto = q;
+
+        /* p points on to the string server:/path */
+        /* Store the 2 values */
+        strcpy(bkpinfo->netfs_mount,p);
+
         /* test if we specified a user */
         p = strchr(bkpinfo->netfs_mount, '@');