Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2026-04-20 14:16:37 +00:00
Code Issues Projects Releases Wiki Activity

git-svn-id: https://profuse.googlecode.com/svn/branches/v2@261 aa027e90-d47c-11dd-86d7-074df07e0730

Browse Source
This commit is contained in:
ksherlock
2010-05-22 17:36:47 +00:00
parent 2e4b2961eb
commit 7b80e2e089
2 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fuse_pascal.cpp
+23 -34
View File
@@ -22,10 +22,8 @@
#include <ProFUSE/Exception.h>
#include <Device/BlockDevice.h>
#include <Device/MappedFile.h>
#include <Device/DiskCopy42Image.h>
Pascal::VolumeEntry *fVolume = NULL;
std::string fDiskImage;
@@ -42,6 +40,8 @@ void usage()
" -v verbose\n"
" --format=format specify the disk image format. Valid values are:\n"
" dc42 DiskCopy 4.2 Image\n"
" davex Davex Disk Image\n"
" 2img Universal Disk Image\n"
" do DOS Order Disk Image\n"
" po ProDOS Order Disk Image (default)\n"
" -o opt1,opt2... other mount parameters.\n"
@@ -163,6 +163,10 @@ int main(int argc, char **argv)
int foreground = false;
int multithread = false;
std::auto_ptr<Pascal::VolumeEntry> volume;
init_ops(&pascal_ops);
@@ -180,44 +184,30 @@ int main(int argc, char **argv)
// default prodos-order disk image.
if (options.format)
{
format = Device::DiskImage::ImageType(options.format);
format = Device::BlockDevice::ImageType(options.format);
if (!format)
std::fprintf(stderr, "Warning: Unknown image type ``%s''\n", options.format);
}
if (!format)
format = Device::DiskImage::ImageType(fDiskImage.c_str(), 'PO__');
bool readOnly = true;
try {
try
{
std::auto_ptr<Device::BlockDevice> device;
device.reset( Device::BlockDevice::Open(fDiskImage.c_str(), readOnly, format) );
switch(format)
if (!device.get())
{
case 'DC42':
device.reset(new Device::DiskCopy42Image(fDiskImage.c_str(), readOnly));
break;
case 'PO__':
device.reset(new Device::ProDOSOrderDiskImage(fDiskImage.c_str(), readOnly));
break;
case 'DO__':
device.reset(new Device::DOSOrderDiskImage(fDiskImage.c_str(), readOnly));
break;
default:
std::fprintf(stderr, "Error: Unknown or unsupported device type.\n");
exit(1);
}
fVolume = new Pascal::VolumeEntry(device.get());
volume.reset( new Pascal::VolumeEntry(device.get()) );
device.release();
}
catch (ProFUSE::POSIXException &e)
{
@@ -237,7 +227,7 @@ int main(int argc, char **argv)
{
// Macfuse supports custom volume names (displayed in Finder)
std::string str("-ovolname=");
str += fVolume->name();
str += volume->name();
fuse_opt_add_arg(&args, str.c_str());
// 512 byte blocksize.
@@ -266,7 +256,7 @@ int main(int argc, char **argv)
if (mountpoint == NULL || *mountpoint == 0)
{
if (make_mount_dir(fVolume->name(), mountPath))
if (make_mount_dir(volume->name(), mountPath))
mountpoint = (char *)mountPath.c_str();
}
@@ -277,13 +267,13 @@ int main(int argc, char **argv)
{
struct fuse_session* se;
std::printf("Mounting ``%s'' on ``%s''\n", fVolume->name(), mountpoint);
std::printf("Mounting ``%s'' on ``%s''\n", volume->name(), mountpoint);
se = fuse_lowlevel_new(&args, &pascal_ops, sizeof(pascal_ops), fVolume);
se = fuse_lowlevel_new(&args, &pascal_ops, sizeof(pascal_ops), volume.get());
if (se) do {
//foreground = 1;
//multithread = 0;
foreground = 1;
multithread = 0;
err = fuse_daemonize(foreground); // todo
if (err < 0 ) break;
@@ -307,7 +297,6 @@ int main(int argc, char **argv)
fuse_opt_free_args(&args);
delete fVolume;
#ifdef __APPLE__
newfs_pascal.cpp
+6
View File
@@ -215,6 +215,12 @@ int main(int argc, char **argv)
device.reset( RawDevice::Open(fname, false) );
blocks = device->blocks();
rawDevice = true;
if (blocks > 0xffff)
{
std::fprintf(stderr, "Error: device is too large.\n");
return 0x5a;
}
}
else