From: bfernhomberg <bfernhomberg>
Date: Mon, 3 Nov 2003 03:10:01 +0000 (+0000)
Subject: fix demangling for pre OSX clients, after cnid_resolve id contains the DID
X-Git-Tag: netatalk-2-0-alpha1~84
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=028515ab44ad6a8efcbd6f982d3c2993225c04dd

fix demangling for pre OSX clients, after cnid_resolve id contains the DID
---

diff --git a/etc/afpd/mangle.c b/etc/afpd/mangle.c
index 2277323b..38855a63 100644
--- a/etc/afpd/mangle.c
+++ b/etc/afpd/mangle.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: mangle.c,v 1.16.2.1.2.6 2003-11-01 02:14:56 bfernhomberg Exp $ 
+ * $Id: mangle.c,v 1.16.2.1.2.7 2003-11-03 03:10:01 bfernhomberg Exp $ 
  *
  * Copyright (c) 2002. Joe Marcus Clarke (marcus@marcuscom.com)
  * All Rights Reserved.  See COPYRIGHT.
@@ -112,12 +112,14 @@ private_demangle(const struct vol *vol, char *mfilename, cnid_t did, cnid_t *osx
 {
     char *t;
     char *u_name;
-    u_int32_t id = 0;
+    u_int32_t id, file_id;
     static char buffer[12 + MAXPATHLEN + 1];
     int len = 12 + MAXPATHLEN + 1;
     struct dir	*dir;
     size_t prefix;
 
+    id = file_id = 0;
+
     t = strchr(mfilename, MANGLE_CHAR);
     if (t == NULL) {
         return mfilename;
@@ -139,7 +141,7 @@ private_demangle(const struct vol *vol, char *mfilename, cnid_t did, cnid_t *osx
         return mfilename;
     }
 
-    id = htonl(id);
+    file_id = id = htonl(id);
     if (osx) {
         *osx = id;
     }
@@ -168,7 +170,7 @@ private_demangle(const struct vol *vol, char *mfilename, cnid_t did, cnid_t *osx
         }
         if (!osx) {
             /* convert back to mac name and check it's the same */
-            t = utompath(vol, u_name, id, utf8_encoding());
+            t = utompath(vol, u_name, file_id, utf8_encoding());
             if (!strcmp(t, mfilename)) {
                 return u_name;
             }