for mac os porting

Author: secularbird

GNUmakefile

@@ -8,5 +8,7 @@ all: $(PROGS)
 
 distclean clean:
 	rm -f $(PROGS)
+	rm -rf *.o
+	rm -rf *.dSYM
 
 .PHONY: all clean

cramfsck.c

@@ -47,11 +47,17 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
+#ifdef LINUX
 #include <sys/sysmacros.h>
+#endif
 #include <utime.h>
 #include <sys/ioctl.h>
 #define _LINUX_STRING_H_
+#ifdef LINUX
 #include <linux/fs.h>
+#else
+#include <sys/disk.h>
+#endif
 #include <linux/cramfs_fs.h>
 #include <zlib.h>
 
@@ -142,9 +148,15 @@ static void test_super(int *start, size_t *length) {
 		die(FSCK_ERROR, 1, "open failed: %s", filename);
 	}
 	if (S_ISBLK(st.st_mode)) {
+#ifdef LINUX
 		if (ioctl(fd, BLKGETSIZE, length) < 0) {
 			die(FSCK_ERROR, 1, "ioctl failed: unable to determine device size: %s", filename);
 		}
+#else
+		if (ioctl(fd, DKIOCGETBLOCKCOUNT, length) < 0) {
+			die(FSCK_ERROR, 1, "ioctl failed: unable to determine device size: %s", filename);
+		}
+#endif
 		*length = *length * 512;
 	}
 	else if (S_ISREG(st.st_mode)) {
@@ -218,7 +230,11 @@ static void test_crc(int start)
 
 	buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 	if (buf == MAP_FAILED) {
+#ifdef LINUX
 		buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#else
+		buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+#endif
 		if (buf != MAP_FAILED) {
 			lseek(fd, 0, SEEK_SET);
 			read(fd, buf, super.size);

mkcramfs.c

@@ -223,7 +223,7 @@ static int cramsort (const void *a, const void *b)
 		       (*(const struct dirent **) b)->d_name);
 }
 
-static unsigned int parse_directory(struct entry *root_entry, const char *name, struct entry **prev, loff_t *fslen_ub)
+static unsigned int parse_directory(struct entry *root_entry, const char *name, struct entry **prev, off_t *fslen_ub)
 {
 	struct dirent **dirlist;
 	int totalsize = 0, dircount, dirindex;
@@ -687,7 +687,7 @@ int main(int argc, char **argv)
 	ssize_t offset, written;
 	int fd;
 	/* initial guess (upper-bound) of required filesystem size */
-	loff_t fslen_ub = sizeof(struct cramfs_super);
+	off_t fslen_ub = sizeof(struct cramfs_super);
 	char const *dirname, *outfile;
 	u32 crc;
 	int c;			/* for getopt */
@@ -787,8 +787,11 @@ int main(int argc, char **argv)
 	   RAM free.  If the reason is to be able to write to
 	   un-mmappable block devices, then we could try shared mmap
 	   and revert to anonymous mmap if the shared mmap fails. */
+#ifdef LINUX
 	rom_image = mmap(NULL, fslen_ub?fslen_ub:1, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-
+#else
+   	rom_image = mmap(NULL, fslen_ub?fslen_ub:1, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+#endif
 	if (rom_image == MAP_FAILED) {
 		die(MKFS_ERROR, 1, "mmap failed");
 	}