Changeset c0c48d14

Timestamp:

Jul 9, 2011, 4:01:01 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

bf5e6a2

Parents:

7feba19

git-author:

David Benjamin <davidben@mit.edu> (06/25/11 06:25:02)

git-committer:

David Benjamin <davidben@mit.edu> (07/09/11 16:01:01)

Message:

Reimplement owl_util_makepath

The new algorithm is cleaner and much more reasonable. foo/~/bar should
not expand the ~. Also don't expand '~user /bar' as '/home/user /bar'.
Also leave non-existant users unexpanded.

It still has some finicky bits of string manipulations, but what can you
do. A unit test is coming in the next commit.

File:

• util.c (modified) (1 diff)

util.c

@@ -37 +37 @@
 CALLER_OWN char *owl_util_makepath(const char *in)
 {
-  int i, j, x;
-  char *out, user[MAXPATHLEN];
-  struct passwd *pw;
-
-  out=g_new(char, MAXPATHLEN+1);
-  out[0]='\0';
-  j=strlen(in);
-  x=0;
-  for (i=0; i<j; i++) {
-    if (in[i]=='~') {
-      if ( (i==(j-1)) ||          /* last character */
-           (in[i+1]=='/') ) {     /* ~/ */
-        /* use my homedir */
-        pw=getpwuid(getuid());
-        if (!pw) {
-          out[x]=in[i];
-        } else {
-          out[x]='\0';
-          strcat(out, pw->pw_dir);
-          x+=strlen(pw->pw_dir);
-        }
-      } else {
-        /* another user homedir */
-        int a, b;
-        b=0;
-        for (a=i+1; i<j; a++) {
-          if (in[a]==' ' || in[a]=='/') {
-            break;
-          } else {
-            user[b]=in[a];
-            i++;
-            b++;
-          }
-        }
-        user[b]='\0';
-        pw=getpwnam(user);
-        if (!pw) {
-          out[x]=in[i];
-        } else {
-          out[x]='\0';
-          strcat(out, pw->pw_dir);
-          x+=strlen(pw->pw_dir);
-        }
-      }
-    } else if (in[i]=='/') {
-      /* check for a double / */
-      if (i<(j-1) && (in[i+1]=='/')) {
-        /* do nothing */
-      } else {
-        out[x]=in[i];
-        x++;
-      }
+  char *out;
+  int i, j;
+  if (in[0] == '~') {
+    /* Attempt tilde-expansion of the first component. Get the
+       tilde-prefix, which goes up to the next slash. */
+    struct passwd *pw;
+    const char *end = strchr(in + 1, '/');
+    if (end == NULL)
+      end = in + strlen(in);
+
+    if (end == in + 1) {
+      /* My home directory. */
+      pw = getpwuid(getuid());
     } else {
-      out[x]=in[i];
-      x++;
-    }
-  }
-  out[x]='\0';
-  return(out);
+      /* Someone else's home directory. */
+      char *user = g_strndup(in + 1, end - (in + 1));
+      pw = getpwnam(user);
+      g_free(user);
+    }
+
+    /* Patch together a new path. Replace the ~ and tilde-prefix with
+       the homedir. */
+    if (pw) {
+      out = g_strconcat(pw->pw_dir, end, NULL);
+    } else {
+      out = g_strdup(in);
+    }
+  } else {
+      out = g_strdup(in);
+  }
+
+  /* And a quick pass to remove duplicate slashes. */
+  for (i = j = 0; out[i] != '\0'; i++) {
+    if (out[i] != '/' || i == 0 || out[i-1] != '/')
+      out[j++] = out[i];
+  }
+  out[j] = '\0';
+  return out;
 }