hfs-195.tar.gz

diff --git a/CopyHFSMeta/Makefile b/CopyHFSMeta/Makefile
deleted file mode 100644 (file)
index 6f49bee..0000000
--- a/CopyHFSMeta/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-Project = CopyHFSMeta
-ProductType = tool
-Install_Dir = /System/Library/Filesystems/hfs.fs/Contents/Resources
-
-CFILES= main.c misc.c ScanExtents.c dump.c SparseBundle.c \
-       DeviceWrapper.c Gather.c \
-       ${OBJROOT}/${Project}/_version.c
-
-${OBJROOT}/${Project}/_version.c:
-       /Developer/Makefiles/bin/version.pl CopyHFSMeta > $@
-
-Extra_LD_Flags= -framework CoreFoundation -lz
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
-
-

diff --git a/CopyHFSMeta/SparseBundle.c b/CopyHFSMeta/SparseBundle.c
index e342d470bcb45df8a6f4bed6fcc0cd3f5ff28423..1ac5a6889f0d3474a7bb4227615ecd0b63793fe5 100644 (file)
--- a/CopyHFSMeta/SparseBundle.c
+++ b/CopyHFSMeta/SparseBundle.c
@@ -10,6 +10,7 @@
 #include <removefile.h>
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <System/sys/fsctl.h> 
 
 #include "hfsmeta.h"
 #include "Sparse.h"
@@ -59,6 +60,21 @@ static const char *bundlePrototype =
 "</dict>\n"
        "</plist>\n";
 
+/*
+ * Do a per-volume sync.  We use this just before updating the progress file, so
+ * that any changes -- data and metadata -- will have made it to disk, without
+ * causing a sync of every mounted volume.
+ *
+ */
+
+static void
+sync_volume(const char *path) {
+        int full_sync = FSCTL_SYNC_FULLSYNC | FSCTL_SYNC_WAIT;
+
+        (void)fsctl(path, FSCTL_SYNC_VOLUME, &full_sync, 0);
+        return;
+}
+
 /*
  * Read from a sparse bundle.  If the band file doesn't exist, or is shorter than
  * what we need to get from it, we pad out with 0's.
@@ -156,7 +172,6 @@ doSparseWrite(IOWrapper_t *context, off_t offset, void *buffer, size_t len)
                        retval = -1;
                        goto done;
                }
-               (void)fcntl(fd, F_FULLFSYNC, 0);
                written += nwritten;
        }
        retval = written;
@@ -326,6 +341,7 @@ SetProgress(struct IOWrapper *context, off_t prog)
        } else {
                fp = fopen(progFile, "w");
                if (fp) {
+                       sync_volume(ctx->pathname);
                        (void)fprintf(fp, "%llu\n", prog);
                        fclose(fp);
                }

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index a373447..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-Project = hfs
-
-SubProjects = hfs_util CopyHFSMeta
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
-

diff --git a/dpkg/control b/dpkg/control
deleted file mode 100644 (file)
index d97b20e..0000000
--- a/dpkg/control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: hfs
-Maintainer: Darwin Developers <darwin-development@public.lists.apple.com>
-Description: HFS/HFS+ commands
-Build-Depends: build-base, diskdev-cmds, extentools, perl, corefoundation, xnu, carbonheaders, project-makefiles

diff --git a/hfs.xcodeproj/project.pbxproj b/hfs.xcodeproj/project.pbxproj
new file mode 100644 (file)
index 0000000..b11abf4
--- /dev/null
+++ b/hfs.xcodeproj/project.pbxproj
@@ -0,0 +1,394 @@
+// !$*UTF8*$!
+{
+       archiveVersion = 1;
+       classes = {
+       };
+       objectVersion = 45;
+       objects = {
+
+/* Begin PBXAggregateTarget section */
+               FDD9FA3714A132E40043D4A9 /* hfs */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = FDD9FA3814A132E40043D4A9 /* Build configuration list for PBXAggregateTarget "hfs" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               FDD9FA3C14A132F10043D4A9 /* PBXTargetDependency */,
+                               FDD9FA3E14A132F20043D4A9 /* PBXTargetDependency */,
+                       );
+                       name = hfs;
+                       productName = hfs;
+               };
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+               C1B6FA0810CC0A0A00778D48 /* hfsutil_jnl.c in Sources */ = {isa = PBXBuildFile; fileRef = C1B6FA0610CC0A0A00778D48 /* hfsutil_jnl.c */; };
+               C1B6FA0910CC0A0A00778D48 /* hfsutil_main.c in Sources */ = {isa = PBXBuildFile; fileRef = C1B6FA0710CC0A0A00778D48 /* hfsutil_main.c */; };
+               C1B6FA3010CC0B9500778D48 /* hfs.util.8 in Copy man8 */ = {isa = PBXBuildFile; fileRef = C1B6FA2F10CC0B8A00778D48 /* hfs.util.8 */; };
+               FDD9FA4214A133F00043D4A9 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1B6FA2210CC0AF400778D48 /* CoreFoundation.framework */; };
+               FDD9FA5214A1343D0043D4A9 /* DeviceWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4814A1343D0043D4A9 /* DeviceWrapper.c */; };
+               FDD9FA5314A1343D0043D4A9 /* dump.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4914A1343D0043D4A9 /* dump.c */; };
+               FDD9FA5414A1343D0043D4A9 /* Gather.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4A14A1343D0043D4A9 /* Gather.c */; };
+               FDD9FA5514A1343D0043D4A9 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4C14A1343D0043D4A9 /* main.c */; };
+               FDD9FA5714A1343D0043D4A9 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4E14A1343D0043D4A9 /* misc.c */; };
+               FDD9FA5814A1343D0043D4A9 /* ScanExtents.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA4F14A1343D0043D4A9 /* ScanExtents.c */; };
+               FDD9FA5914A1343D0043D4A9 /* SparseBundle.c in Sources */ = {isa = PBXBuildFile; fileRef = FDD9FA5114A1343D0043D4A9 /* SparseBundle.c */; };
+               FDD9FA5A14A135290043D4A9 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1B6FA2210CC0AF400778D48 /* CoreFoundation.framework */; };
+               FDD9FA5C14A135840043D4A9 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD9FA5B14A135840043D4A9 /* libz.dylib */; };
+               FDD9FA6814A138D80043D4A9 /* Info.plist in Copy Contents */ = {isa = PBXBuildFile; fileRef = FDD9FA6214A138960043D4A9 /* Info.plist */; };
+               FDD9FA6914A138DA0043D4A9 /* PkgInfo in Copy Contents */ = {isa = PBXBuildFile; fileRef = FDD9FA6414A138960043D4A9 /* PkgInfo */; };
+               FDD9FA6B14A138EC0043D4A9 /* version.plist in Copy Contents */ = {isa = PBXBuildFile; fileRef = FDD9FA6514A138960043D4A9 /* version.plist */; };
+               FDD9FA6C14A138EF0043D4A9 /* InfoPlist.strings in Copy InfoPlist.strings */ = {isa = PBXBuildFile; fileRef = FDD9FA6314A138960043D4A9 /* InfoPlist.strings */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+               FDD9FA3B14A132F10043D4A9 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 8DD76FA90486AB0100D96B5E;
+                       remoteInfo = hfs.util;
+               };
+               FDD9FA3D14A132F20043D4A9 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = FDD9FA2B14A132BF0043D4A9;
+                       remoteInfo = CopyHFSMeta;
+               };
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+               8DD76FAF0486AB0100D96B5E /* Copy man8 */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               C1B6FA3010CC0B9500778D48 /* hfs.util.8 in Copy man8 */,
+                       );
+                       name = "Copy man8";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               FDD9FA6714A138AB0043D4A9 /* Copy Contents */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = Contents;
+                       dstSubfolderSpec = 1;
+                       files = (
+                               FDD9FA6814A138D80043D4A9 /* Info.plist in Copy Contents */,
+                               FDD9FA6914A138DA0043D4A9 /* PkgInfo in Copy Contents */,
+                               FDD9FA6B14A138EC0043D4A9 /* version.plist in Copy Contents */,
+                       );
+                       name = "Copy Contents";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               FDD9FA6A14A138DC0043D4A9 /* Copy InfoPlist.strings */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = Contents/Resources/English.lproj;
+                       dstSubfolderSpec = 1;
+                       files = (
+                               FDD9FA6C14A138EF0043D4A9 /* InfoPlist.strings in Copy InfoPlist.strings */,
+                       );
+                       name = "Copy InfoPlist.strings";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+               C1B6FA0610CC0A0A00778D48 /* hfsutil_jnl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hfsutil_jnl.c; sourceTree = "<group>"; };
+               C1B6FA0710CC0A0A00778D48 /* hfsutil_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hfsutil_main.c; sourceTree = "<group>"; };
+               C1B6FA2210CC0AF400778D48 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+               C1B6FA2F10CC0B8A00778D48 /* hfs.util.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hfs.util.8; sourceTree = "<group>"; };
+               C1B6FD2B10CC0DB200778D48 /* hfs.util */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = hfs.util; sourceTree = BUILT_PRODUCTS_DIR; };
+               FDD9FA2C14A132BF0043D4A9 /* CopyHFSMeta */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CopyHFSMeta; sourceTree = BUILT_PRODUCTS_DIR; };
+               FDD9FA4714A1343D0043D4A9 /* Data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Data.h; sourceTree = "<group>"; };
+               FDD9FA4814A1343D0043D4A9 /* DeviceWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DeviceWrapper.c; sourceTree = "<group>"; };
+               FDD9FA4914A1343D0043D4A9 /* dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dump.c; sourceTree = "<group>"; };
+               FDD9FA4A14A1343D0043D4A9 /* Gather.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Gather.c; sourceTree = "<group>"; };
+               FDD9FA4B14A1343D0043D4A9 /* hfsmeta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hfsmeta.h; sourceTree = "<group>"; };
+               FDD9FA4C14A1343D0043D4A9 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+               FDD9FA4E14A1343D0043D4A9 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
+               FDD9FA4F14A1343D0043D4A9 /* ScanExtents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ScanExtents.c; sourceTree = "<group>"; };
+               FDD9FA5014A1343D0043D4A9 /* Sparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sparse.h; sourceTree = "<group>"; };
+               FDD9FA5114A1343D0043D4A9 /* SparseBundle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SparseBundle.c; sourceTree = "<group>"; };
+               FDD9FA5B14A135840043D4A9 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
+               FDD9FA6214A138960043D4A9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               FDD9FA6314A138960043D4A9 /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
+               FDD9FA6414A138960043D4A9 /* PkgInfo */ = {isa = PBXFileReference; lastKnownFileType = text; path = PkgInfo; sourceTree = "<group>"; };
+               FDD9FA6514A138960043D4A9 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+               8DD76FAD0486AB0100D96B5E /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               FDD9FA4214A133F00043D4A9 /* CoreFoundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               FDD9FA2914A132BF0043D4A9 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               FDD9FA5C14A135840043D4A9 /* libz.dylib in Frameworks */,
+                               FDD9FA5A14A135290043D4A9 /* CoreFoundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+               08FB7794FE84155DC02AAC07 /* hfs */ = {
+                       isa = PBXGroup;
+                       children = (
+                               08FB7795FE84155DC02AAC07 /* Source */,
+                               FDD9FA4014A133A50043D4A9 /* Frameworks */,
+                               C1B6FD2C10CC0DB200778D48 /* Products */,
+                       );
+                       name = hfs;
+                       sourceTree = "<group>";
+               };
+               08FB7795FE84155DC02AAC07 /* Source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               FDD9FA4614A1343D0043D4A9 /* CopyHFSMeta */,
+                               FDD9FA3F14A1335D0043D4A9 /* hfs_util */,
+                       );
+                       name = Source;
+                       sourceTree = "<group>";
+               };
+               C1B6FD2C10CC0DB200778D48 /* Products */ = {
+                       isa = PBXGroup;
+                       children = (
+                               C1B6FD2B10CC0DB200778D48 /* hfs.util */,
+                               FDD9FA2C14A132BF0043D4A9 /* CopyHFSMeta */,
+                       );
+                       name = Products;
+                       sourceTree = "<group>";
+               };
+               FDD9FA3F14A1335D0043D4A9 /* hfs_util */ = {
+                       isa = PBXGroup;
+                       children = (
+                               FDD9FA6214A138960043D4A9 /* Info.plist */,
+                               FDD9FA6314A138960043D4A9 /* InfoPlist.strings */,
+                               FDD9FA6414A138960043D4A9 /* PkgInfo */,
+                               C1B6FA2F10CC0B8A00778D48 /* hfs.util.8 */,
+                               C1B6FA0610CC0A0A00778D48 /* hfsutil_jnl.c */,
+                               C1B6FA0710CC0A0A00778D48 /* hfsutil_main.c */,
+                               FDD9FA6514A138960043D4A9 /* version.plist */,
+                       );
+                       path = hfs_util;
+                       sourceTree = "<group>";
+               };
+               FDD9FA4014A133A50043D4A9 /* Frameworks */ = {
+                       isa = PBXGroup;
+                       children = (
+                               C1B6FA2210CC0AF400778D48 /* CoreFoundation.framework */,
+                               FDD9FA5B14A135840043D4A9 /* libz.dylib */,
+                       );
+                       name = Frameworks;
+                       sourceTree = "<group>";
+               };
+               FDD9FA4614A1343D0043D4A9 /* CopyHFSMeta */ = {
+                       isa = PBXGroup;
+                       children = (
+                               FDD9FA4714A1343D0043D4A9 /* Data.h */,
+                               FDD9FA4814A1343D0043D4A9 /* DeviceWrapper.c */,
+                               FDD9FA4914A1343D0043D4A9 /* dump.c */,
+                               FDD9FA4A14A1343D0043D4A9 /* Gather.c */,
+                               FDD9FA4B14A1343D0043D4A9 /* hfsmeta.h */,
+                               FDD9FA4C14A1343D0043D4A9 /* main.c */,
+                               FDD9FA4E14A1343D0043D4A9 /* misc.c */,
+                               FDD9FA4F14A1343D0043D4A9 /* ScanExtents.c */,
+                               FDD9FA5014A1343D0043D4A9 /* Sparse.h */,
+                               FDD9FA5114A1343D0043D4A9 /* SparseBundle.c */,
+                       );
+                       path = CopyHFSMeta;
+                       sourceTree = "<group>";
+               };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+               8DD76FA90486AB0100D96B5E /* hfs_util */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "hfs_util" */;
+                       buildPhases = (
+                               8DD76FAB0486AB0100D96B5E /* Sources */,
+                               8DD76FAD0486AB0100D96B5E /* Frameworks */,
+                               8DD76FAF0486AB0100D96B5E /* Copy man8 */,
+                               FDD9FA6714A138AB0043D4A9 /* Copy Contents */,
+                               FDD9FA6A14A138DC0043D4A9 /* Copy InfoPlist.strings */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = hfs_util;
+                       productInstallPath = "$(HOME)/bin";
+                       productName = hfs;
+                       productReference = C1B6FD2B10CC0DB200778D48 /* hfs.util */;
+                       productType = "com.apple.product-type.tool";
+               };
+               FDD9FA2B14A132BF0043D4A9 /* CopyHFSMeta */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = FDD9FA3514A132BF0043D4A9 /* Build configuration list for PBXNativeTarget "CopyHFSMeta" */;
+                       buildPhases = (
+                               FDD9FA2814A132BF0043D4A9 /* Sources */,
+                               FDD9FA2914A132BF0043D4A9 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = CopyHFSMeta;
+                       productName = CopyHFSMeta;
+                       productReference = FDD9FA2C14A132BF0043D4A9 /* CopyHFSMeta */;
+                       productType = "com.apple.product-type.tool";
+               };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+               08FB7793FE84155DC02AAC07 /* Project object */ = {
+                       isa = PBXProject;
+                       buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "hfs" */;
+                       compatibilityVersion = "Xcode 3.1";
+                       developmentRegion = English;
+                       hasScannedForEncodings = 1;
+                       knownRegions = (
+                               en,
+                       );
+                       mainGroup = 08FB7794FE84155DC02AAC07 /* hfs */;
+                       productRefGroup = C1B6FD2C10CC0DB200778D48 /* Products */;
+                       projectDirPath = "";
+                       projectRoot = "";
+                       targets = (
+                               FDD9FA3714A132E40043D4A9 /* hfs */,
+                               8DD76FA90486AB0100D96B5E /* hfs_util */,
+                               FDD9FA2B14A132BF0043D4A9 /* CopyHFSMeta */,
+                       );
+               };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+               8DD76FAB0486AB0100D96B5E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               C1B6FA0910CC0A0A00778D48 /* hfsutil_main.c in Sources */,
+                               C1B6FA0810CC0A0A00778D48 /* hfsutil_jnl.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               FDD9FA2814A132BF0043D4A9 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               FDD9FA5514A1343D0043D4A9 /* main.c in Sources */,
+                               FDD9FA5714A1343D0043D4A9 /* misc.c in Sources */,
+                               FDD9FA5814A1343D0043D4A9 /* ScanExtents.c in Sources */,
+                               FDD9FA5314A1343D0043D4A9 /* dump.c in Sources */,
+                               FDD9FA5914A1343D0043D4A9 /* SparseBundle.c in Sources */,
+                               FDD9FA5214A1343D0043D4A9 /* DeviceWrapper.c in Sources */,
+                               FDD9FA5414A1343D0043D4A9 /* Gather.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+               FDD9FA3C14A132F10043D4A9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 8DD76FA90486AB0100D96B5E /* hfs_util */;
+                       targetProxy = FDD9FA3B14A132F10043D4A9 /* PBXContainerItemProxy */;
+               };
+               FDD9FA3E14A132F20043D4A9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = FDD9FA2B14A132BF0043D4A9 /* CopyHFSMeta */;
+                       targetProxy = FDD9FA3D14A132F20043D4A9 /* PBXContainerItemProxy */;
+               };
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+               1DEB928708733DD80010E9CD /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               INSTALL_PATH = /System/Library/Filesystems/hfs.fs;
+                               PRODUCT_NAME = hfs.util;
+                       };
+                       name = Release;
+               };
+               1DEB928B08733DD80010E9CD /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CODE_SIGN_IDENTITY = "-";
+                               CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)";
+                               DEAD_CODE_STRIPPING = YES;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               PROVISIONING_PROFILE = "";
+                               USE_HEADERMAP = NO;
+                               VERSIONING_SYSTEM = "apple-generic";
+                               WARNING_CFLAGS = (
+                                       "-Wall",
+                                       "-W",
+                               );
+                       };
+                       name = Release;
+               };
+               FDD9FA3414A132BF0043D4A9 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               INSTALL_PATH = /System/Library/Filesystems/hfs.fs/Contents/Resources;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               FDD9FA3A14A132E40043D4A9 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+               1DEB928508733DD80010E9CD /* Build configuration list for PBXNativeTarget "hfs_util" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               1DEB928708733DD80010E9CD /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "hfs" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               1DEB928B08733DD80010E9CD /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               FDD9FA3514A132BF0043D4A9 /* Build configuration list for PBXNativeTarget "CopyHFSMeta" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               FDD9FA3414A132BF0043D4A9 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               FDD9FA3814A132E40043D4A9 /* Build configuration list for PBXAggregateTarget "hfs" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               FDD9FA3A14A132E40043D4A9 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+/* End XCConfigurationList section */
+       };
+       rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}

diff --git a/hfs_util/Makefile b/hfs_util/Makefile
deleted file mode 100644 (file)
index 19fb77e..0000000
--- a/hfs_util/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-Project = hfs.util
-ProductType = tool
-Install_Dir = /System/Library/Filesystems/hfs.fs
-
-MAN_DIR= $(DSTROOT)/usr/share/man/man8
-MANPAGES= hfs.util.8
-
-CFILES = hfsutil_main.c hfsutil_jnl.c
-OTHERSRCS = \
-            hfs_CD.fs.tiff hfs_CD.openfs.tiff hfs_FD.fs.tiff \
-            hfs_FD.openfs.tiff hfs_HD.fs.tiff hfs_HD.openfs.tiff \
-            hfs_RHD.fs.tiff hfs_RHD.openfs.tiff Info.plist \
-            InfoPlist.strings PkgInfo version.plist hfs.util.8
-
-Extra_LD_Flags = -framework CoreFoundation
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
-
-after_install:
-       $(INSTALL_DIRECTORY) "$(DSTROOT)/$(Install_Dir)/Contents/Resources/English.lproj"
-       install -o root -m 644 Info.plist "$(DSTROOT)/$(Install_Dir)/Contents"
-       install -o root -m 644 PkgInfo "$(DSTROOT)/$(Install_Dir)/Contents"
-       install -o root -m 644 version.plist "$(DSTROOT)/$(Install_Dir)/Contents"
-       install -o root -m 644 InfoPlist.strings "$(DSTROOT)/$(Install_Dir)/Contents/Resources/English.lproj"

diff --git a/hfs_util/hfs.util.8 b/hfs_util/hfs.util.8
index 4e73fffa3be35ffda141e74458ff4055f6c2a426..05efbcdc0cd6eed1953aab3256cc2917d0db3a6e 100644 (file)
--- a/hfs_util/hfs.util.8
+++ b/hfs_util/hfs.util.8
@@ -76,7 +76,7 @@ An optional size may
 be specified (e.g. 32M for a 32 megabyte journal).
 .It Fl k 
 Get the UUID key for the HFS file system at
-.Ar device
+.Ar device .
 .It Fl m
 Mount the HFS file system located on
 .Ar device
@@ -133,6 +133,12 @@ or
 or
 .Ar nodev
 .El
+.Pp
+Note that for the 
+.Ar device
+references above, you must only supply the last component of the path to the 
+device in question, such as disk0s2 rather than /dev/disk0s2. 
+
 .Sh SEE ALSO 
 .Xr diskarbitrationd 8
 .Sh HISTORY