hfs-116.14.tar.gz

diff --git a/hfs_util/Info.plist b/hfs_util/Info.plist
index f794579543f78113a7e4fa3716c09eefcc453044..61638f322295e7e6971a184006b94e7723100d12 100644 (file)
--- a/hfs_util/Info.plist
+++ b/hfs_util/Info.plist
@@ -13,7 +13,7 @@
        <key>CFBundlePackageType</key>
        <string>fs  </string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>fs  </string>
        <key>CFBundleShortVersionString</key>

-       <string>1.2</string>
+       <string>1.2.1</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

diff --git a/hfs_util/hfsutil_main.c b/hfs_util/hfsutil_main.c
index 4b0520203cf0c5c1c9a253cfa750387949b48a53..49ac43929140254ff187e5fd12cfc8f6e8591c14 100644 (file)
--- a/hfs_util/hfsutil_main.c
+++ b/hfs_util/hfsutil_main.c
@@ -188,6 +188,7 @@ static int  ReadFile(int fd, void *buffer, off_t offset, ssize_t length,
 static ssize_t readAt( int fd, void * buf, off_t offset, ssize_t length );
 static ssize_t writeAt( int fd, void * buf, off_t offset, ssize_t length );
 
 static ssize_t readAt( int fd, void * buf, off_t offset, ssize_t length );
 static ssize_t writeAt( int fd, void * buf, off_t offset, ssize_t length );
 

+CF_EXPORT Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *buffer, CFIndex maxBufLen);

 
 /*
  * The fuction CFStringGetSystemEncoding does not work correctly in
 
 /*
  * The fuction CFStringGetSystemEncoding does not work correctly in


@@ -547,8 +548,7 @@ DoProbe(char *deviceNamePtr)
                encoding = CFStringGetSystemEncoding();
                cfstr = CFStringCreateWithPascalString(kCFAllocatorDefault,
                            mdbPtr->drVN, encoding);
                encoding = CFStringGetSystemEncoding();
                cfstr = CFStringCreateWithPascalString(kCFAllocatorDefault,
                            mdbPtr->drVN, encoding);

-               cfOK = CFStringGetCString(cfstr, volnameUTF8, NAME_MAX,
-                           kCFStringEncodingUTF8);
+               cfOK = _CFStringGetFileSystemRepresentation(cfstr, volnameUTF8, NAME_MAX);

                CFRelease(cfstr);
 
                if (!cfOK && encoding != kCFStringEncodingMacRoman) {
                CFRelease(cfstr);
 
                if (!cfOK && encoding != kCFStringEncodingMacRoman) {


@@ -556,8 +556,7 @@ DoProbe(char *deviceNamePtr)
                        /* default to MacRoman on conversion errors */
                        cfstr = CFStringCreateWithPascalString(kCFAllocatorDefault,
                                    mdbPtr->drVN, kCFStringEncodingMacRoman);
                        /* default to MacRoman on conversion errors */
                        cfstr = CFStringCreateWithPascalString(kCFAllocatorDefault,
                                    mdbPtr->drVN, kCFStringEncodingMacRoman);

-                       CFStringGetCString(cfstr, volnameUTF8, NAME_MAX,
-                           kCFStringEncodingUTF8);
+                       _CFStringGetFileSystemRepresentation(cfstr, volnameUTF8, NAME_MAX);

                        CFRelease(cfstr);
                }
  
                        CFRelease(cfstr);
                }