etc/afpd/desktop.c | 33 +++++++++++++++++++++++++++++++++ etc/afpd/directory.c | 2 ++ etc/afpd/status.c | 2 +- etc/afpd/volume.c | 2 +- libatalk/cnid/cdb/cnid_cdb_close.c | 4 ++-- libatalk/cnid/cnid.c | 4 ++-- libatalk/cnid/dbd/cnid_dbd.c | 2 +- macros/cups.m4 | 2 +- macros/quota-check.m4 | 2 +- 9 files changed, 44 insertions(+), 9 deletions(-) Index: etc/afpd/desktop.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/etc/afpd/desktop.c,v retrieving revision 1.50 diff -u -p -r1.50 desktop.c --- etc/afpd/desktop.c 22 Jan 2010 04:40:38 -0000 1.50 +++ etc/afpd/desktop.c 23 Jan 2010 16:33:09 -0000 @@ -39,6 +39,20 @@ #include "mangle.h" +typedef struct _U2MMAP { + char *mname; + char *uname; +} U2MMAP; + +U2MMAP u2mmap[] = { + { "Network Trash Folder", ".AppleTrash" }, + { "Temporary Items", ".AppleTemp" }, + { "TheVolumeSettingsFolder", ".AppleVolumeSettings" }, + { "TheFindByContentFolder", ".AppleFindByContent" }, + { 0L, 0L } /* end of list */ +}; + + int afp_opendt(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct vol *vol; @@ -598,6 +612,7 @@ char *mtoupath(const struct vol *vol, ch size_t inplen; size_t outlen; u_int16_t flags; + U2MMAP *u2m; if ( *mpath == '\0' ) { return( "." ); @@ -614,6 +629,14 @@ char *mtoupath(const struct vol *vol, ch m = mpath; u = upath; + u2m = u2mmap; + while(u2m->mname) { + if (strcmp(m, u2m->mname) == 0) { + m = u2m->uname; + } + u2m++; + } + inplen = strlen(m); outlen = MAXPATHLEN; @@ -637,6 +660,7 @@ char *utompath(const struct vol *vol, ch char *m, *u; u_int16_t flags; size_t outlen; + U2MMAP *u2m; m = mpath; outlen = strlen(upath); @@ -650,12 +674,21 @@ char *utompath(const struct vol *vol, ch LOG(log_error, logtype_afpd, "Conversion from %s to %s for %s (%u) failed.", vol->v_volcodepage, vol->v_maccodepage, u, ntohl(id)); goto utompath_error; } + mpath[outlen] = 0; flags = !!(flags & CONV_REQMANGLE); if (utf8) flags |= 2; + u2m = u2mmap; + while(u2m->mname) { + if (strcmp(mpath, u2m->uname) == 0) { + strcpy(mpath, u2m->mname); + } + u2m++; + } + m = mangle(vol, mpath, outlen, upath, id, flags); #ifdef DEBUG Index: etc/afpd/directory.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/etc/afpd/directory.c,v retrieving revision 1.129 diff -u -p -r1.129 directory.c --- etc/afpd/directory.c 21 Jan 2010 12:10:19 -0000 1.129 +++ etc/afpd/directory.c 23 Jan 2010 16:33:10 -0000 @@ -1044,7 +1044,9 @@ adddir(struct vol *vol, struct dir *dir, edir->d_m_name_ucs2 = cdir->d_m_name_ucs2; free(cdir); cdir = edir; +#ifdef DEBUG LOG(log_error, logtype_afpd, "adddir: insert %s", edir->d_m_name); +#endif if (!cdir->d_parent || (cdir->d_parent == dir && !deleted)) { hash_alloc_insert(vol->v_hash, cdir, cdir); return cdir; Index: etc/afpd/status.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/etc/afpd/status.c,v retrieving revision 1.30 diff -u -p -r1.30 status.c --- etc/afpd/status.c 23 Nov 2009 19:04:14 -0000 1.30 +++ etc/afpd/status.c 23 Jan 2010 16:33:11 -0000 @@ -183,7 +183,7 @@ static u_int16_t status_signature(char * } usersign = options->signature + 5; if (strlen(usersign) < 3) - LOG(log_warning, logtype_afpd, "Signature %s is very short !", + LOG(log_warning, logtype_afpd, "Signature %s is very short!", options->signature); memset(data, 0, 16); Index: etc/afpd/volume.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/etc/afpd/volume.c,v retrieving revision 1.113 diff -u -p -r1.113 volume.c --- etc/afpd/volume.c 5 Jan 2010 12:06:33 -0000 1.113 +++ etc/afpd/volume.c 23 Jan 2010 16:33:12 -0000 @@ -383,7 +383,7 @@ static void volset(struct vol_option *op setoption(options, save, VOLOPT_ROLIST, val); } else if (optionok(tmp, "codepage:", val)) { - LOG (log_error, logtype_afpd, "The old codepage system has been removed. Please make sure to read the documentation !!!!"); + LOG (log_error, logtype_afpd, "The old codepage system has been removed. Please make sure to read the documentation!"); /* Make sure we don't screw anything */ exit (EXITERR_CONF); } else if (optionok(tmp, "volcharset:", val)) { Index: libatalk/cnid/cnid.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cnid.c,v retrieving revision 1.12 diff -u -p -r1.12 cnid.c --- libatalk/cnid/cnid.c 8 Dec 2009 22:33:33 -0000 1.12 +++ libatalk/cnid/cnid.c 23 Jan 2010 16:33:12 -0000 @@ -48,7 +48,7 @@ void cnid_register(struct _cnid_module * /* Check if our module is already registered. */ list_for_each(ptr, &modules) if (0 == strcmp(list_entry(ptr, cnid_module, db_list)->name, module->name)) { - LOG(log_error, logtype_afpd, "Module with name [%s] is already registered !", module->name); + LOG(log_error, logtype_afpd, "Module with name [%s] is already registered!", module->name); return; } @@ -202,7 +202,7 @@ void cnid_close(struct _cnid_db *db) u_int32_t flags; if (NULL == db) { - LOG(log_error, logtype_afpd, "Error: cnid_close called with NULL argument !"); + LOG(log_error, logtype_afpd, "Error: cnid_close called with NULL argument!"); return; } /* cnid_close free db */ Index: libatalk/cnid/cdb/cnid_cdb_close.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/cdb/cnid_cdb_close.c,v retrieving revision 1.2 diff -u -p -r1.2 cnid_cdb_close.c --- libatalk/cnid/cdb/cnid_cdb_close.c 28 Apr 2005 20:49:59 -0000 1.2 +++ libatalk/cnid/cdb/cnid_cdb_close.c 23 Jan 2010 16:33:12 -0000 @@ -13,8 +13,8 @@ void cnid_cdb_close(struct _cnid_db *cdb CNID_private *db; if (!cdb) { - LOG(log_error, logtype_afpd, "cnid_close called with NULL argument !"); - return; + LOG(log_error, logtype_afpd, "cnid_close called with NULL argument!"); + return; } if (!(db = cdb->_private)) { Index: libatalk/cnid/dbd/cnid_dbd.c =================================================================== RCS file: /cvsroot/netatalk/netatalk/libatalk/cnid/dbd/cnid_dbd.c,v retrieving revision 1.16 diff -u -p -r1.16 cnid_dbd.c --- libatalk/cnid/dbd/cnid_dbd.c 21 Jan 2010 14:14:49 -0000 1.16 +++ libatalk/cnid/dbd/cnid_dbd.c 23 Jan 2010 16:33:12 -0000 @@ -492,7 +492,7 @@ void cnid_dbd_close(struct _cnid_db *cdb CNID_private *db; if (!cdb) { - LOG(log_error, logtype_cnid, "cnid_close called with NULL argument !"); + LOG(log_error, logtype_cnid, "cnid_close called with NULL argument!"); return; } Index: macros/cups.m4 =================================================================== RCS file: /cvsroot/netatalk/netatalk/macros/cups.m4,v retrieving revision 1.2 diff -u -p -r1.2 cups.m4 --- macros/cups.m4 28 Apr 2005 20:50:05 -0000 1.2 +++ macros/cups.m4 23 Jan 2010 16:33:12 -0000 @@ -42,7 +42,7 @@ AC_DEFUN([NETATALK_AC_CUPS], [ AC_ARG_WITH(spooldir, - [ --with-spooldir=PATH path for spooldir used for CUPS support (LOCALSTATEDIR/spool/netatalk)],[ + [ --with-spooldir=PATH path for spooldir used for CUPS support (LOCALSTATEDIR/spool/netatalk)],[ if test "$withval" = "no"; then if test x"$spool_required" == x"yes"; then Index: macros/quota-check.m4 =================================================================== RCS file: /cvsroot/netatalk/netatalk/macros/quota-check.m4,v retrieving revision 1.6 diff -u -p -r1.6 quota-check.m4 --- macros/quota-check.m4 20 Jul 2005 23:58:21 -0000 1.6 +++ macros/quota-check.m4 23 Jan 2010 16:33:12 -0000 @@ -4,7 +4,7 @@ dnl FIXME: This is in now way complete. AC_DEFUN([AC_CHECK_QUOTA], [ AC_ARG_ENABLE(quota, - [ --enable-quota Turn on quota support (default=auto)]) + [ --enable-quota Turn on quota support (default=auto)]) if test x$enable_quota != xno; then QUOTA_LIBS=""