From 5622ebede9a01771659d12a67317367fcb001d68 Mon Sep 17 00:00:00 2001 From: HAT Date: Thu, 29 Aug 2013 20:40:27 +0900 Subject: [PATCH] twisted u_name and m_name Fix Bug#523. Additional Info: The following line in ofork.c may also be wrong. /* Somone has used write_fork, we assume file was changed, register it to file change event api */ if (ofork->of_flags & AFPFORK_MODIFIED) { struct dir *dir = dirlookup(ofork->of_vol, ofork->of_did); bstring forkpath = bformat("%s/%s", bdata(dir->d_fullpath), of_name(ofork)); fce_register(FCE_FILE_MODIFY, bdata(forkpath), NULL, fce_file); bdestroy(forkpath); } --- NEWS | 4 ++++ etc/afpd/fork.c | 4 ++-- include/atalk/adouble.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 98e2d2b5..3da771f9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Changes in 3.0.6 +================ +* FIX: charset conversion failed when copying from Mac OS 9. Bug #523. + Changes in 3.0.5 ================ * FIX: Fix a crash when using pam_winbind. Fixes bug #516. diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c index 0c988828..350b5711 100644 --- a/etc/afpd/fork.c +++ b/etc/afpd/fork.c @@ -66,10 +66,10 @@ static int getforkparams(const AFPObj *obj, struct ofork *ofork, uint16_t bitmap vol = ofork->of_vol; dir = dirlookup(vol, ofork->of_did); - if (NULL == (path.m_name = utompath(vol, of_name(ofork), dir->d_did, utf8_encoding(obj)))) { + if (NULL == (path.u_name = mtoupath(vol, of_name(ofork), dir->d_did, utf8_encoding(obj)))) { return( AFPERR_MISC ); } - path.u_name = of_name(ofork); + path.m_name = of_name(ofork); path.id = 0; st = &path.st; if ( bitmap & ( (1<