From f6018484cedd536206ddbed4c66bc4a3c0c2f806 Mon Sep 17 00:00:00 2001 From: ksherlock Date: Fri, 9 Jan 2009 21:57:02 +0000 Subject: [PATCH] cleanups for Linux git-svn-id: https://profuse.googlecode.com/svn/trunk@17 aa027e90-d47c-11dd-86d7-074df07e0730 --- UniversalDiskImage.cpp | 3 ++- UniversalDiskImage.h | 1 + main.cpp | 11 +++++++++-- makefile.linux | 12 +++++++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/UniversalDiskImage.cpp b/UniversalDiskImage.cpp index bc43f16..e344cbb 100644 --- a/UniversalDiskImage.cpp +++ b/UniversalDiskImage.cpp @@ -47,4 +47,5 @@ bool UniversalDiskImage::Load(const uint8_t *buffer) return true; -} \ No newline at end of file +} + diff --git a/UniversalDiskImage.h b/UniversalDiskImage.h index 2dc583d..5fee6d2 100644 --- a/UniversalDiskImage.h +++ b/UniversalDiskImage.h @@ -37,3 +37,4 @@ struct UniversalDiskImage #endif + diff --git a/main.cpp b/main.cpp index fb948d0..568199b 100644 --- a/main.cpp +++ b/main.cpp @@ -330,8 +330,7 @@ static void prodos_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) return; } -// position not needed/valid for linux. -// position ignored, for now. +// TODO -- more consistent position support. static void prodos_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, size_t size, uint32_t off) { @@ -396,6 +395,14 @@ static void prodos_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, si fuse_reply_err(req, ENOENT); } +/* + * Linux, et alia do not have an offset parameter. + */ +static void prodos_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, size_t size) +{ + prodos_getxattr(req, ino, name, size, 0); +} + #pragma mark Directory Functions diff --git a/makefile.linux b/makefile.linux index c460bd2..8856fae 100755 --- a/makefile.linux +++ b/makefile.linux @@ -2,7 +2,7 @@ CC=g++ CFLAGS=-c $(shell pkg-config fuse --cflags) LDFLAGS=$(shell pkg-config fuse --libs) -SOURCES=main.cpp File.cpp Disk.cpp File.h Disk.h common.h +SOURCES=main.cpp File.cpp Disk.cpp DiskCopy42.cpp UniversalDiskImage.cpp OBJECTS=$(SOURCES:.cpp=.o) EXECUTABLE=profuse @@ -13,3 +13,13 @@ $(EXECUTABLE): $(OBJECTS) .cpp.o: $(CC) $(CFLAGS) $< -o $@ + +UniversalDiskImage.o: UniversalDiskImage.cpp UniversalDiskImage.h + +DiskCopy42.o: DiskCopy42.cpp DiskCopy42.h + +File.o: File.cpp File.h + +Disk.o: Disk.cpp Disk.h File.h DiskCopy42.h UniversalDiskImage.h + +main.o: main.cpp Disk.h File.h