]> arthur.barton.de Git - netatalk.git/commitdiff
remove realpath() in afp_openvol()
authorHAT <hat@fa2.so-net.ne.jp>
Thu, 4 Oct 2012 13:30:33 +0000 (22:30 +0900)
committerHAT <hat@fa2.so-net.ne.jp>
Thu, 4 Oct 2012 13:30:33 +0000 (22:30 +0900)
because it has already been done, when parsing afp.conf

etc/afpd/volume.c

index 3b02b2390a467dd81de3319fa757ceb709434844..ecc9bf13761774280c3cb3975e7cd107f4c8bb77 100644 (file)
@@ -771,26 +771,7 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t
         return AFPERR_MISC;
     }
 
-    /* Normalize volume path */
-#ifdef REALPATH_TAKES_NULL
-    if ((volume->v_path = realpath(path, NULL)) == NULL)
-        return AFPERR_MISC;
-#else
-    if ((volume->v_path = malloc(MAXPATHLEN+1)) == NULL)
-        return AFPERR_MISC;
-    if (realpath(path, volume->v_path) == NULL) {
-        free(volume->v_path);
-        return AFPERR_MISC;
-    }
-    /* Safe some memory */
-    char *tmp;
-    if ((tmp = strdup(volume->v_path)) == NULL) {
-        free(volume->v_path);
-        return AFPERR_MISC;
-    }
-    free(volume->v_path);
-    volume->v_path = tmp;
-#endif
+    strlcpy(volume->v_path, path, MAXPATHLEN);
 
     if (volume_codepage(obj, volume) < 0) {
         ret = AFPERR_MISC;