put volume case insensitive option back

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 53a36b306ddd263877591158840477fb830ddf1c..4abaae91c48593ddbbb4b52f214f7d157aa24135 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.96 2009-04-10 11:21:19 franklahm Exp $
+ * $Id: directory.c,v 1.97 2009-04-17 04:24:20 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -66,10 +66,10 @@ int             afp_errno;
 #define SENTINEL (&sentinel)
 static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK,
                                  NULL, NULL, NULL, NULL, NULL, 0, 0, 
-                                 0, 0, NULL, NULL};
+                                 0, 0, NULL, NULL, NULL};
 static struct dir rootpar  = { SENTINEL, SENTINEL, NULL, 0,
                                  NULL, NULL, NULL, NULL, NULL, 0, 0, 
-                                 0, 0, NULL, NULL};
+                                 0, 0, NULL, NULL, NULL};
 
 /* (from IM: Toolbox Essentials)
  * dirFinderInfo (DInfo) fields:
@@ -461,6 +461,7 @@ static void dir_remove( const struct vol *vol _U_, struct dir       *dir)
     dirfreename(dir);
     dir->d_m_name = NULL;
     dir->d_u_name = NULL;
+    dir->d_m_name_ucs2 = NULL;
 #else /* ! REMOVE_NODES */
 
     /* go searching for a node with at most one child */
@@ -536,11 +537,14 @@ static void dir_remove( const struct vol *vol _U_, struct dir     *dir)
         /* set the node's d_name */
         node->d_m_name = save.d_m_name;
         node->d_u_name = save.d_u_name;
+        node->d_m_name_ucs2 = save.d_m_name_ucs2;
     }
 
     if (node->d_color == DIRTREE_COLOR_BLACK)
         dir_rmrecolor(vol, leaf);
 
+    if (node->d_m_name_ucs2)
+        free(node->d_u_name_ucs2);
     if (node->d_u_name != node->d_m_name) {
         free(node->d_u_name);
     }
@@ -601,6 +605,89 @@ struct dir *dir;
     return pdir;
 }
 
+#define ENUMVETO "./../Network Trash Folder/TheVolumeSettingsFolder/TheFindByContentFolder/:2eDS_Store/Contents/Desktop Folder/Trash/Benutzer/"
+
+int
+caseenumerate(const struct vol *vol, struct path *path, struct dir *dir)
+{
+    DIR               *dp;
+    struct dirent     *de;
+    int               ret;
+    static u_int32_t  did = 0;
+    static char              cname[MAXPATHLEN];
+    static char              lname[MAXPATHLEN];
+    ucs2_t           u2_path[MAXPATHLEN];
+    ucs2_t           u2_dename[MAXPATHLEN];
+    char             *tmp, *savepath;
+
+    if (!(vol->v_flags & AFPVOL_CASEINSEN))
+        return -1;
+        
+    if (veto_file(ENUMVETO, path->u_name))
+       return -1;
+
+    savepath = path->u_name;
+
+    /* very simple cache */
+    if ( dir->d_did == did && strcmp(lname, path->u_name) == 0) {
+        path->u_name = cname;
+        path->d_dir = NULL;
+        if (of_stat( path ) == 0 ) {
+            return 0;
+        }
+        /* something changed, we cannot stat ... */
+        did = 0;
+    }
+
+    if (NULL == ( dp = opendir( "." )) ) {
+        LOG(log_debug, logtype_afpd, "caseenumerate: opendir failed: %s", dir->d_u_name);
+        return -1;
+    }
+
+
+    /* LOG(log_debug, logtype_afpd, "caseenumerate: for %s", path->u_name); */
+    if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, path->u_name, strlen(path->u_name), u2_path, sizeof(u2_path)) ) 
+        LOG(log_debug, logtype_afpd, "caseenumerate: conversion failed for %s", path->u_name);
+
+    /*LOG(log_debug, logtype_afpd, "caseenumerate: dir: %s, path: %s", dir->d_u_name, path->u_name); */
+    ret = -1;
+    for ( de = readdir( dp ); de != NULL; de = readdir( dp )) {
+        if (NULL == check_dirent(vol, de->d_name))
+            continue;
+
+        if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, de->d_name, strlen(de->d_name), u2_dename, sizeof(u2_dename)) )
+            continue;
+
+        if (strcasecmp_w( u2_path, u2_dename) == 0) {
+            tmp = path->u_name;
+            strlcpy(cname, de->d_name, sizeof(cname));
+            path->u_name = cname;
+            path->d_dir = NULL;
+            if (of_stat( path ) == 0 ) {
+                LOG(log_debug, logtype_afpd, "caseenumerate: using dir: %s, path: %s", de->d_name, path->u_name);
+                strlcpy(lname, tmp, sizeof(lname));
+                did = dir->d_did;
+                ret = 0;
+                break;
+            }
+            else 
+                path->u_name = tmp;
+        }
+
+    }
+    closedir(dp);
+
+    if (ret) {
+        /* invalidate cache */
+        cname[0] = 0;
+        did = 0;
+        path->u_name = savepath;
+    }
+    /* LOG(log_debug, logtype_afpd, "caseenumerate: path on ret: %s", path->u_name); */
+    return ret;
+}
+
+
 /*
  * attempt to extend the current dir. tree to include path
  * as a side-effect, movecwd to that point and return the new dir
@@ -618,7 +705,10 @@ struct path *path;
         return NULL;
     }
     if (of_stat( path ) != 0 ) {
-        return NULL;
+        if (!(vol->v_flags & AFPVOL_CASEINSEN))
+            return NULL;
+       else if(caseenumerate(vol, path, dir) != 0)
+            return(NULL);
     }
 
     if (!S_ISDIR(path->st.st_mode)) {
@@ -933,6 +1023,10 @@ struct path     *path;
         LOG(log_error, logtype_afpd, "adddir: malloc: %s", strerror(errno) );
         return NULL;
     }
+    if ((size_t)-1 == convert_string_allocate((utf8_encoding())?CH_UTF8_MAC:vol->v_maccharset, CH_UCS2, path->m_name, strlen(path->m_name), &cdir->d_m_name_ucs2)) {
+       LOG(log_error, logtype_afpd, "Couldn't set UCS2 name for %s", name);
+       cdir->d_m_name_ucs2 = NULL;
+    }
 
     cdir->d_did = id;
 
@@ -955,6 +1049,7 @@ struct path     *path;
         dirfreename(edir);
         edir->d_m_name = cdir->d_m_name;
         edir->d_u_name = cdir->d_u_name;
+        edir->d_m_name_ucs2 = cdir->d_m_name_ucs2;
         free(cdir);
         cdir = edir;
         LOG(log_error, logtype_afpd, "adddir: insert %s", edir->d_m_name);
@@ -981,6 +1076,8 @@ void dirfreename(struct dir *dir)
     if (dir->d_u_name != dir->d_m_name) {
         free(dir->d_u_name);
     }
+    if (dir->d_m_name_ucs2)
+        free(dir->d_m_name_ucs2); 
     free(dir->d_m_name);
 }
 
@@ -1028,6 +1125,7 @@ struct dir *dirnew(const char *m_name, const char *u_name)
         return NULL;
     }
 
+    dir->d_m_name_ucs2 = NULL;
     dir->d_left = dir->d_right = SENTINEL;
     dir->d_next = dir->d_prev = dir;
     return dir;
@@ -1045,7 +1143,7 @@ const struct dir *k = key;
        0x69232f74U, 0xfead7bb3U, 0xe9089ab6U, 0xf012f6aeU,
     };
 
-    const unsigned char *str = (unsigned char *)k->d_u_name;
+    const unsigned char *str = k->d_u_name;
     hash_val_t acc = 0;
 
     while (*str) {
@@ -1161,7 +1259,7 @@ const struct vol  *vol;
 struct dir     *dir;
 char   **cpath;
 {
-    struct dir            *cdir;
+    struct dir            *cdir, *scdir=NULL;
     static char                   path[ MAXPATHLEN + 1];
     static struct path ret;
 
@@ -1305,18 +1403,50 @@ char    **cpath;
             }
         }
         if ( !extend ) {
-            if (dir->d_did == DIRDID_ROOT_PARENT) {
-                /* 
-                   root parent (did 1) has one child: the volume. Requests for did=1 with some <name>
-                   must check against the volume name.
-                */
-                if (!strcmp(vol->v_dir->d_m_name, ret.m_name))
-                    cdir = vol->v_dir;
-                else
-                    cdir = NULL;
+            ucs2_t *tmpname;
+            cdir = dir->d_child;
+            scdir = NULL;
+           if ( cdir && (vol->v_flags & AFPVOL_CASEINSEN) &&
+                    (size_t)-1 != convert_string_allocate(((ret.m_type == 3)?CH_UTF8_MAC:vol->v_maccharset), 
+                                                          CH_UCS2, path, strlen(path), (char **)&tmpname) )
+            {
+                while (cdir) {
+                    if (!cdir->d_m_name_ucs2) {
+                        LOG(log_error, logtype_afpd, "cname: no UCS2 name for %s (did %u)!!!", cdir->d_m_name, ntohl(cdir->d_did) );
+                        /* this shouldn't happen !!!! */
+                        goto noucsfallback;
+                    }
+
+                    if ( strcmp_w( cdir->d_m_name_ucs2, tmpname ) == 0 ) {
+                         break;
+                    }
+                    if ( strcasecmp_w( cdir->d_m_name_ucs2, tmpname ) == 0 ) {
+                         scdir = cdir;
+                    }
+                    cdir = (cdir == dir->d_child->d_prev) ? NULL :cdir->d_next;
+                }
+                free(tmpname);
             }
             else {
-                cdir = dirsearch_byname(vol, dir, ret.u_name);
+noucsfallback:
+                if (dir->d_did == DIRDID_ROOT_PARENT) {
+                  /* 
+                     root parent (did 1) has one child: the volume. Requests for did=1 with some <name>
+                     must check against the volume name.
+                  */
+                  if (!strcmp(vol->v_dir->d_m_name, ret.m_name))
+                      cdir = vol->v_dir;
+                  else
+                      cdir = NULL;
+                }
+                else {
+                  cdir = dirsearch_byname(vol, dir, ret.u_name);
+                }
+            }
+  
+            if (cdir == NULL && scdir != NULL) {
+                cdir = scdir;
+                /* LOG(log_debug, logtype_afpd, "cname: using casediff for %s, (%s = %s)", fullpathname(cdir->d_u_name), cdir->d_m_name, path ); */
             }
 
             if ( cdir == NULL ) {
@@ -2411,6 +2541,13 @@ struct dir       *dir, *newparent;
         strcpy( dir->d_u_name, dst );
     }
 
+    if (dir->d_m_name_ucs2)
+       free(dir->d_m_name_ucs2);
+
+    dir->d_m_name_ucs2 = NULL;
+    if ((size_t)-1 == convert_string_allocate((utf8_encoding())?CH_UTF8_MAC:vol->v_maccharset, CH_UCS2, dir->d_m_name, strlen(dir->d_m_name), (char**)&dir->d_m_name_ucs2))
+        dir->d_m_name_ucs2 = NULL;
+
     if (( parent = dir->d_parent ) == NULL ) {
         return( AFP_OK );
     }

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index dcd4a2f2f12fe6ad9a7f21675f561c16bed4d2b1..51e619962f74d629d2248ab3b153200d2eeedc9d 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.h,v 1.23 2008-12-03 18:35:44 didg Exp $
+ * $Id: directory.h,v 1.24 2009-04-17 04:24:20 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -57,6 +57,7 @@ struct dir {
 
     char       *d_m_name;            /* mac name */
     char        *d_u_name;            /* unix name */
+    ucs2_t     *d_m_name_ucs2;       /* mac name as UCS2 */
 };
 
 struct path {
@@ -205,6 +206,8 @@ extern int file_access   __P((struct path *path, int mode));
 extern int netatalk_rmdir __P((const char *name));
 extern int netatalk_unlink __P((const char *name));
 
+extern int caseenumerate __P((const struct vol *, struct path *, struct dir *));
+
 extern hash_t *dirhash __P((void));
 /* from enumerate.c */
 extern char *check_dirent __P((const struct vol *, char *));

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 8078d9555a0b918b3ac712842217b00f232ee0d5..c7efc070dcfc012f975248f75489a0687e4c1a61 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.52 2009-01-30 04:57:42 didg Exp $
+ * $Id: filedir.c,v 1.53 2009-04-17 04:24:20 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -406,14 +406,14 @@ int         isdir;
         if (strcmp(oldname, newname) == 0)
             return AFP_OK;
 
-        if (stat(upath, st) == 0 ) {
+        if (stat(upath, st) == 0 || caseenumerate(vol, &path, curdir) == 0) {
             if (!stat(p, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) {
                 /* not the same file */
                 return AFPERR_EXIST;
             }
             errno = 0;
         }
-    } else if (stat(upath, st ) == 0)
+    } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0)
         return AFPERR_EXIST;
 
     if ( !isdir ) {

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index f2189938cc2a876d2418055ac6edf5a08a246117..fb61d38c5d957e78c64cd38a57899deaa0c81beb 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.83 2009-03-20 11:32:11 franklahm Exp $
+ * $Id: volume.c,v 1.84 2009-04-17 04:24:20 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -175,6 +175,7 @@ static const _vol_opt_name vol_opt_names[] = {
                                          * maybe because it will be mounted later in preexec */
     {AFPVOL_UNIX_PRIV,  "UNIXPRIV"},    /* support unix privileges */
     {AFPVOL_NODEV,      "NODEV"},       /* always use 0 for device number in cnid calls */
+    {AFPVOL_CASEINSEN,  "CASEINSENSITIVE"}, /* volume is case insensitive */
     {AFPVOL_EILSEQ,     "ILLEGALSEQ"},     /* encode illegal sequence */
     {AFPVOL_CACHE,      "CACHEID"},     /* Use adouble v2 CNID caching, default don't use it */
     {AFPVOL_EXT_ATTRS,  "EXT_ATTRS"},   /* Vol supports Extened Attributes */
@@ -494,6 +495,8 @@ static void volset(struct vol_option *options, struct vol_option *save,
                 options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS;
             else if (strcasecmp(p, "nodev") == 0)
                 options[VOLOPT_FLAGS].i_value |= AFPVOL_NODEV;
+            else if (strcasecmp(p, "caseinsensitive") == 0)
+                options[VOLOPT_FLAGS].i_value |= AFPVOL_CASEINSEN;
             else if (strcasecmp(p, "illegalseq") == 0)
                 options[VOLOPT_FLAGS].i_value |= AFPVOL_EILSEQ;
             else if (strcasecmp(p, "cachecnid") == 0)
@@ -558,7 +561,7 @@ static void showvol(const ucs2_t *name)
 {
     struct vol *volume;
     for ( volume = Volumes; volume; volume = volume->v_next ) {
-      if (volume->v_hide && !strcasecmp_w( (utf8_encoding()?volume->v_u8mname:volume->v_macname), name ) ) {
+      if (volume->v_hide && !strcasecmp_w( volume->v_name, name ) ) {
             volume->v_hide = 0;
             return;
         }
@@ -688,6 +691,8 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
         free(volume);
         return -1;
     }
+
+    volume->v_name = utf8_encoding()?volume->v_u8mname:volume->v_macname;
     volume->v_hide = hide;
     strcpy( volume->v_path, path );
 
@@ -1800,7 +1805,7 @@ int       ibuflen _U_, *rbuflen;
     load_volumes(obj);
 
     for ( volume = Volumes; volume; volume = volume->v_next ) {
-        if ( strcasecmp_w( (ucs2_t*) volname, (utf8_encoding()?volume->v_u8mname:volume->v_macname) ) == 0 ) {
+        if ( strcasecmp_w( (ucs2_t*) volname, volume->v_name ) == 0 ) {
             break;
         }
     }
@@ -1902,6 +1907,7 @@ int       ibuflen _U_, *rbuflen;
 
     dir->d_did = DIRDID_ROOT;
     dir->d_color = DIRTREE_COLOR_BLACK; /* root node is black */
+    dir->d_m_name_ucs2 = strdup_w(volume->v_name);
     volume->v_dir = volume->v_root = dir;
     volume->v_hash = dirhash();
 
@@ -2057,7 +2063,7 @@ static void deletevol(struct vol *vol)
 
     closevol(vol);
     if (vol->v_deleted) {
-      showvol(utf8_encoding()?vol->v_u8mname:vol->v_macname);
+      showvol(vol->v_name);
        volume_free(vol);
        volume_unlink(vol);
        free(vol);

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index c955c894ce689e0e358a5d9df4dcc7a6a96b6759..3b04693ac7d52a28acf298453abfebbf89cc63d0 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.h,v 1.29 2009-03-16 13:59:12 franklahm Exp $
+ * $Id: volume.h,v 1.30 2009-04-17 04:24:20 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -27,6 +27,7 @@ struct vol {
     char        *v_localname;   /* as defined in AppleVolumes.default */
     ucs2_t             *v_u8mname;     /* converted to utf8-mac in ucs2 */
     ucs2_t             *v_macname;     /* mangled to legacy longname in ucs2 */
+    ucs2_t             *v_name;        /* either v_u8mname or v_macname */
     char               *v_path;
     
     struct dir         *v_dir, *v_root;
@@ -127,7 +128,7 @@ this is going away. */
                                      * help if device number is notconsistent across reboot 
                                      * NOTE symlink to a different device will return an ACCESS error
                                      */
-#define AFPVOL_RESERVED  (1 << 19)  /* was AFPVOL_CASEINSEN, volume is case insensitive */
+#define AFPVOL_CASEINSEN (1 << 19)  /* volume is case insensitive */
 #define AFPVOL_EILSEQ    (1 << 20)  /* encode illegal sequence 'asis' UCS2, ex "\217-", which is not 
                                        a valid SHIFT-JIS char, is encoded  as U\217 -*/