From bf0af66573e3cd8420892d51e6bdbed327567fab Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 5 Feb 2008 20:49:30 +0000 Subject: [PATCH] DEVEL15-windows-pioctl-path-charset-translation-20080205 LICENSE MIT FIXES 84279 Do not translate the character set of the pioctl path data. These paths were not provided by the file system but by the end user. Therefore, they were not converted to the OEM character set. With this change the AFS shell context menu will be displayed for non-ASCII file names when ANSI file names are being used as well as the fs commands will work. (cherry picked from commit b85428263c75316ff8fd15c188617f4eb02670a8) --- src/WINNT/afsd/cm_ioctl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c index 2266817a79..b078ee295a 100644 --- a/src/WINNT/afsd/cm_ioctl.c +++ b/src/WINNT/afsd/cm_ioctl.c @@ -238,10 +238,16 @@ long cm_ParseIoctlPath(smb_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp, * \\netbios-name\submount\path\. * \\netbios-name\submount\path\file */ - TranslateExtendedChars(relativePath); + + /* We do not perform path name translation on the ioctl path data + * because these paths were not translated by Windows through the + * file system API. Therefore, they are not OEM characters but + * whatever the display character set is. + */ + // TranslateExtendedChars(relativePath); /* This is usually nothing, but for StatMountPoint it is the file name. */ - TranslateExtendedChars(ioctlp->inDatap); + // TranslateExtendedChars(ioctlp->inDatap); #ifdef AFSIFS /* we have passed the whole path, including the afs prefix.