Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2024-05-28 22:41:39 +00:00
Code Issues Projects Releases Wiki Activity

volume name for raw devices.

Browse Source 
git-svn-id: https://profuse.googlecode.com/svn/branches/v2@248 aa027e90-d47c-11dd-86d7-074df07e0730
This commit is contained in:
ksherlock 2010-05-21 01:46:53 +00:00
parent 0af8ce500a
commit c901f55b50
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
newfs_pascal.cpp
View File

@ -113,7 +113,9 @@ void usage()
" -s size specify size in blocks.\n" " -s size specify size in blocks.\n"
" Default is 1600 blocks (800K)\n" " Default is 1600 blocks (800K)\n"
" -f format specify the disk image format. Valid values are:\n" " -f format specify the disk image format. Valid values are:\n"
" 2img Universal Disk Image\n"
" dc42 DiskCopy 4.2 Image\n" " dc42 DiskCopy 4.2 Image\n"
" davex Davex Disk Image\n"
" do DOS Order Disk Image\n" " do DOS Order Disk Image\n"
" po ProDOS Order Disk Image (default)\n" " po ProDOS Order Disk Image (default)\n"
); );
@ -186,17 +188,10 @@ int main(int argc, char **argv)
fname = argv[0]; fname = argv[0];
fileName = argv[0]; fileName = argv[0];
// generate a filename.
if (volumeName.empty())
{
volumeName = filename(fileName);
if (volumeName.empty() || !VolumeEntry::ValidName(volumeName.c_str()))
volumeName = "PASCAL";
}
try try
{ {
@ -223,7 +218,8 @@ int main(int argc, char **argv)
} }
else else
{ {
// file exists, verify we want to destroy it. // file exists, verify we want to destroy it.
fprintf(stderr, "`%s' already exists. Are you sure you want to overwrite it? ", fname); fprintf(stderr, "`%s' already exists. Are you sure you want to overwrite it? ", fname);
@ -232,6 +228,15 @@ int main(int argc, char **argv)
} }
// generate a filename.
if (volumeName.empty())
{
if (!rawDevice)
volumeName = filename(fileName);
if (volumeName.empty() || !VolumeEntry::ValidName(volumeName.c_str()))
volumeName = "PASCAL";
}
if (!rawDevice) if (!rawDevice)
device.reset( BlockDevice::Create(fname, volumeName.c_str(), blocks, format)); device.reset( BlockDevice::Create(fname, volumeName.c_str(), blocks, format));