[PATCH master 0/2] Fixing up nfs url handling

[Brian C. Lane]

These are for master, but they might be nice to have on f15-branch, 
even though there is no bug associated with them.

Brian C. Lane (2):
  Fix order of nfs mountOpts in promptForNfs
  Rewrite nfs url parsing in loader

loader/nfsinstall.c |   61 +++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 33 deletions(-)

[PATCH master 1/2] Fix order of nfs mountOpts in promptForNfs

[Brian C. Lane]

---
 loader/nfsinstall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 3706311..76529bf 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -249,7 +249,7 @@ int promptForNfs(struct loaderData_s *loaderData) {
         }

if (mountOpts) {
-            checked_asprintf(&loaderData->instRepo, "nfs:%s:%s:%s", host, mountOpts,
+            checked_asprintf(&loaderData->instRepo, "nfs:%s:%s:%s", mountOpts, host
                              directory);
         } else {
             checked_asprintf(&loaderData->instRepo, "nfs:%s:%s", host, directory);

[PATCH master 2/2] Rewrite nfs url parsing in loader

[Brian C. Lane]

---
 loader/nfsinstall.c |   59 +++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 76529bf..485d1cc 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -121,38 +121,32 @@ static int nfsGetSetup(char ** hostptr, char ** dirptr, char ** optsptr) {
     return LOADER_OK;
 }

+/* Parse nfs: url and return its componenets
+ *
+ * nfs[:options]:<server>:<path>
+ */
 void parseNfsHostPathOpts(char *url, char **host, char **path, char **opts) {
-    char *tmp;
-    char *hostsrc;
-
     /* Skip over the leading nfs: if present. */
     if (!strncmp(url, "nfs:", 4))
         url += 4;

logMessage(DEBUGLVL, "parseNfsHostPathOpts url: |%s|", url);

-    hostsrc = strdup(url);
-    *host = hostsrc;
-    tmp = strchr(*host, ':');
-
-    if (tmp) {
-       *path = strdup(tmp + 1);
-       *tmp = '\0';
-    }
-    else {
-        *path = malloc(sizeof(char *));
-        **path = '\0';
-    }
-
-    tmp = strchr(*path, ':');
-    if (tmp && strlen(tmp) > 1) {
-	char * c = tmp;
-
-        *opts = *path;
-	*path = strdup(c + 1);
-	*c = '\0';
+    gchar **parts = g_strsplit(url, ":", 3)     ;
+    if (parts == NULL || g_strv_length(parts) < 2) {
+        *opts = g_strdup("");
+        *host = g_strdup("");
+        *path = g_strdup("");
+    } else if (g_strv_length(parts) == 2) {
+        *opts = g_strdup("");
+        *host = g_strdup(parts[0]);
+        *path = g_strdup(parts[1]);
+        g_strfreev(parts);
     } else {
-	*opts = NULL;
+        *opts = g_strdup(parts[0]);
+        *host = g_strdup(parts[1]);
+        *path = g_strdup(parts[2]);
+        g_strfreev(parts);
     }

logMessage(DEBUGLVL, "parseNfsHostPathOpts host: |%s|", *host);
@@ -229,9 +223,9 @@ cleanup3:
 cleanup2:
     umount("/mnt/isodir");
 cleanup1:
-    free(host);
-    free(path);
-    free(opts);
+    g_free(host);
+    g_free(path);
+    g_free(opts);
     free(url);
     return rc;
 }
@@ -314,9 +308,9 @@ int loadNfsImages(struct loaderData_s *loaderData) {
         free(url);
     }

-    free(host);
-    free(path);
-    free(opts);
+    g_free(host);
+    g_free(path);
+    g_free(opts);
     return 1;
 }

@@ -457,8 +451,9 @@ int getFileFromNfs(char * url, char * dest, struct loaderData_s * loaderData) {
         failed = 1;
     }

-    free(host);
-    free(path);
+    g_free(host);
+    g_free(path);
+    g_free(opts);
     if (ip) free(ip);

if (umount("/tmp/mnt") == -1)

[Chris Lumens]

> These are for master, but they might be nice to have on f15-branch, 
> even though there is no bug associated with them.

I'm fine with these on f15-branch, too.  It's preventing an obvious bug
that you know is going to get filed.

- Chris