hfs-522.100.5.tar.gz

[apple/hfs.git] / mount_hfs / mount_hfs.c

diff --git a/mount_hfs/mount_hfs.c b/mount_hfs/mount_hfs.c
index 4c531c7ac6c1180194d3bc56f698372d41a13381..9e8fcffdd6d76c8e5c6c2647493962c7d86436d6 100644 (file)
--- a/mount_hfs/mount_hfs.c
+++ b/mount_hfs/mount_hfs.c
@@ -52,16 +52,11 @@
 
 #include <TargetConditionals.h>
 
-#if TARGET_OS_EMBEDDED
-#include <dirent.h>
-#include <fts.h>
-#endif /* TARGET_OS_EMBEDDED */
-
 /* Sensible wrappers over the byte-swapping routines */
 #include "hfs_endian.h"
-#if !TARGET_OS_EMBEDDED
-#include "optical.h"
-#endif
+#if TARGET_OS_OSX  
+#include "optical.h"  //only include optical headers on Macs
+#endif //osx
 
 #include <mntopts.h>
 
@@ -446,7 +441,6 @@ load_encoding(struct hfs_mnt_encoding *encp)
        return (0);
 }
 
-
 int
 main(argc, argv)
        int argc;
@@ -462,11 +456,13 @@ main(argc, argv)
 
        int do_rekey = 0;
        int tmp_mntflags = 0;
-#if TARGET_OS_EMBEDDED
+
+#if TARGET_OS_IPHONE 
        mntflags = MNT_NOATIME;
-#else
+#else // !TARGET_OS_IPHONE
        mntflags = 0;
-#endif
+#endif // TARGET_OS_IPHONE
+
        encp = NULL;
        (void)memset(&args, '\0', sizeof(struct hfs_mount_args));
 
@@ -641,7 +637,6 @@ main(argc, argv)
                        args.hfs_mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
        }
 
-
 #if DEBUG
     printf("mount_hfs: calling mount: \n" );
     printf("\tdevice = %s\n", dev);
@@ -655,7 +650,7 @@ main(argc, argv)
 
 #endif
 
-#if !TARGET_OS_EMBEDDED
+#if TARGET_OS_OSX
     /*
      * We shouldn't really be calling up to other layers, but
      * an exception was made in this case to fix the situation