Use HasPrefix() instead of strncmp().

[nmh] / sbr / path.c

diff --git a/sbr/path.c b/sbr/path.c
index 871ad22d7ccddec2ec61b160b97d0a86fa82cbd2..4ef4003f24d530a93f88ca745a3107dea2a012f3 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -66,17 +66,17 @@ expath (char *name, int flag)
 
     if (*name == '/'
            || (flag == TFOLDER
-               && (strncmp (name, CWD, NCWD)
+               && (!HasPrefix(name, CWD)
                    && strcmp (name, DOT)
                    && strcmp (name, DOTDOT)
-                   && strncmp (name, PWD, NPWD))))
-       return getcpy (name);
+                   && !HasPrefix(name, PWD))))
+       return mh_xstrdup(name);
 
     if (pwds == NULL)
        pwds = pwd ();
 
     if (strcmp (name, DOT) == 0 || strcmp (name, CWD) == 0)
-       return getcpy (pwds);
+       return mh_xstrdup(pwds);
 
     ep = pwds + strlen (pwds);
     if ((cp = strrchr(pwds, '/')) == NULL)
@@ -85,21 +85,21 @@ expath (char *name, int flag)
        if (cp == pwds)
            cp++;
 
-    if (strncmp (name, CWD, NCWD) == 0)
+    if (HasPrefix(name, CWD))
        name += NCWD;
 
     if (strcmp (name, DOTDOT) == 0 || strcmp (name, PWD) == 0) {
        snprintf (buffer, sizeof(buffer), "%.*s", (int)(cp - pwds), pwds);
-       return getcpy (buffer);
+       return mh_xstrdup(buffer);
     }
 
-    if (strncmp (name, PWD, NPWD) == 0)
+    if (HasPrefix(name, PWD))
        name += NPWD;
     else
        cp = ep;
 
     snprintf (buffer, sizeof(buffer), "%.*s/%s", (int)(cp - pwds), pwds, name);
-    return getcpy (buffer);
+    return mh_xstrdup(buffer);
 }
 
 
@@ -141,7 +141,7 @@ compath (char *f)
                        *cp = '\0';
                        break;
                    }
-                   if (strncmp (cp, PWD, NPWD) == 0) {
+                   if (HasPrefix(cp, PWD)) {
                        for (dp = cp - 2; dp > f; dp--)
                            if (*dp == '/')
                                break;
@@ -151,7 +151,7 @@ compath (char *f)
                        cp = dp;
                        continue;
                    }
-                   if (strncmp (cp, CWD, NCWD) == 0) {
+                   if (HasPrefix(cp, CWD)) {
                        strcpy (cp - 1, cp + NCWD - 1);
                        cp--;
                        continue;