hfs-157.tar.gz

diff --git a/Makefile b/Makefile
index b20ae9f0a890550b95ee1e6bca95faa17184471e..f4a89c6daa80e6c6a1a19177dbb6ce6febb3d8b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ DEBUG_LIBS = $(LIBS)
 PROF_LIBS = $(LIBS)
 
 
 PROF_LIBS = $(LIBS)
 
 

-NEXTSTEP_PB_CFLAGS = -Wno-four-char-constants
+NEXTSTEP_PB_CFLAGS = -Wno-four-char-constants -Wall -Werror

 
 
 NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
 
 
 NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc

diff --git a/Makefile.preamble b/Makefile.preamble
index c0dd6ee3c52f1695acf798fee2185b13e8c44534..6f6f22e2d9324dd98a06054987fdaac3b7581987 100644 (file)
--- a/Makefile.preamble
+++ b/Makefile.preamble
@@ -40,7 +40,7 @@
 #    OTHER_YFLAGS, LOCAL_YFLAGS:  additional flags passed to yacc
 #    OTHER_LFLAGS, LOCAL_LFLAGS:  additional flags passed to lex
 
 #    OTHER_YFLAGS, LOCAL_YFLAGS:  additional flags passed to yacc
 #    OTHER_LFLAGS, LOCAL_LFLAGS:  additional flags passed to lex
 

-OTHER_CFLAGS = -Wno-precomp
+OTHER_CFLAGS =  

 
 # These variables provide hooks enabling you to add behavior at almost every 
 # stage of the make:
 
 # These variables provide hooks enabling you to add behavior at almost every 
 # stage of the make:

diff --git a/hfs_util/Info.plist b/hfs_util/Info.plist
index cdbc0dac572126c3cb0d6e893bc9b7a40e5678ff..8c053d1a472459441b040957c7b68c9bb7b0f7af 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.4</string>
+       <string>1.4.1</string>

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

diff --git a/hfs_util/hfsutil_jnl.c b/hfs_util/hfsutil_jnl.c
index 2a619e87134568ea1e7a751c447e4e71fa4e6f4c..b87b2755bbb2efa355d3cff26b6edfdbfdae74c0 100644 (file)
--- a/hfs_util/hfsutil_jnl.c
+++ b/hfs_util/hfsutil_jnl.c
@@ -259,15 +259,6 @@ get_embedded_offset(char *devname)
        blkcnt = st.st_size / blksize;
     }
 
        blkcnt = st.st_size / blksize;
     }
 

-    /*
-     * There are only 31 bits worth of block count in
-     * the buffer cache.  So for large volumes a 4K
-     * physical block size is needed.
-     */
-    if (blksize == 512 && blkcnt > (u_int64_t)0x000000007fffffff) {
-       blksize = 4096;
-    }
-

     /*
      * At this point:
      *   blksize has our prefered physical block size
     /*
      * At this point:
      *   blksize has our prefered physical block size

diff --git a/hfs_util/hfsutil_main.c b/hfs_util/hfsutil_main.c
index 3d899f87564db9faa8bce07eddc463c26715563b..ff565074bed4cd86e4cdff1bccdff4b493caac8f 100644 (file)
--- a/hfs_util/hfsutil_main.c
+++ b/hfs_util/hfsutil_main.c
@@ -193,7 +193,7 @@ static int  SetVolumeUUIDRaw(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr
 static int     SetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr);
 static int     SetVolumeUUID(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr);
 static int     GetEmbeddedHFSPlusVol(HFSMasterDirectoryBlock * hfsMasterDirectoryBlockPtr, off_t * startOffsetPtr);
 static int     SetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr);
 static int     SetVolumeUUID(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr);
 static int     GetEmbeddedHFSPlusVol(HFSMasterDirectoryBlock * hfsMasterDirectoryBlockPtr, off_t * startOffsetPtr);

-static int     GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * name_o);
+static int     GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, unsigned char * name_o);

 static int     GetBTreeNodeInfo(int fd, off_t hfsPlusVolumeOffset, u_int32_t blockSize,
                                                        u_int32_t extentCount, const HFSPlusExtentDescriptor *extentList,
                                                        u_int32_t *nodeSize, u_int32_t *firstLeafNode);
 static int     GetBTreeNodeInfo(int fd, off_t hfsPlusVolumeOffset, u_int32_t blockSize,
                                                        u_int32_t extentCount, const HFSPlusExtentDescriptor *extentList,
                                                        u_int32_t *nodeSize, u_int32_t *firstLeafNode);


@@ -683,7 +683,7 @@ DoProbe(char *deviceNamePtr)
 
                /* Some poorly mastered HFS CDs have an empty MDB name field! */
                if (mdbPtr->drVN[0] == '\0') {
 
                /* Some poorly mastered HFS CDs have an empty MDB name field! */
                if (mdbPtr->drVN[0] == '\0') {

-                       strcpy(&mdbPtr->drVN[1], gHFS_FS_NAME_NAME);
+                       strcpy((char *)&mdbPtr->drVN[1], gHFS_FS_NAME_NAME);

                        mdbPtr->drVN[0] = strlen(gHFS_FS_NAME_NAME);
                }
 
                        mdbPtr->drVN[0] = strlen(gHFS_FS_NAME_NAME);
                }
 


@@ -744,7 +744,7 @@ DoProbe(char *deviceNamePtr)
        }
 
        if (FSUR_IO_SUCCESS == result) {
        }
 
        if (FSUR_IO_SUCCESS == result) {

-               char *s;
+               unsigned char *s;

                
                /* Change slashes to colons in the volume name */
                for (s=volnameUTF8; *s; ++s) {
                
                /* Change slashes to colons in the volume name */
                for (s=volnameUTF8; *s; ++s) {


@@ -753,7 +753,7 @@ DoProbe(char *deviceNamePtr)
                }
 
                /* Print the volume name to standard output */
                }
 
                /* Print the volume name to standard output */

-               write(1, volnameUTF8, strlen(volnameUTF8));
+               write(1, volnameUTF8, strlen((char *)volnameUTF8));

                result = FSUR_RECOGNIZED;
        }
 
                result = FSUR_RECOGNIZED;
        }
 


@@ -1631,7 +1631,7 @@ Return:
  */
 
 static int
  */
 
 static int

-GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * name_o)
+GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, unsigned char * name_o)

 {
     int                                        result = FSUR_IO_SUCCESS;
     u_int32_t                          blockSize;
 {
     int                                        result = FSUR_IO_SUCCESS;
     u_int32_t                          blockSize;


@@ -1768,7 +1768,7 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
            }
            swapped->unicode[i] = 0;
            cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, swapped->unicode, swapped->length);
            }
            swapped->unicode[i] = 0;
            cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, swapped->unicode, swapped->length);

-           (void) CFStringGetCString(cfstr, name_o, NAME_MAX, kCFStringEncodingUTF8);
+           (void) CFStringGetCString(cfstr, (char *)name_o, NAME_MAX, kCFStringEncodingUTF8);

            CFRelease(cfstr);
            free(swapped);
        }
            CFRelease(cfstr);
            free(swapped);
        }