From c901f55b50088802e5e2169377e0e58b866ee6a1 Mon Sep 17 00:00:00 2001
From: ksherlock <ksherlock@aa027e90-d47c-11dd-86d7-074df07e0730>
Date: Fri, 21 May 2010 01:46:53 +0000
Subject: [PATCH] volume name for raw devices.

git-svn-id: https://profuse.googlecode.com/svn/branches/v2@248 aa027e90-d47c-11dd-86d7-074df07e0730
---
 newfs_pascal.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/newfs_pascal.cpp b/newfs_pascal.cpp
index 4aca6cd..f2722b1 100644
--- a/newfs_pascal.cpp
+++ b/newfs_pascal.cpp
@@ -113,7 +113,9 @@ void usage()
                 "  -s size          specify size in blocks.\n"
                 "                   Default is 1600 blocks (800K)\n"
                 "  -f format        specify the disk image format. Valid values are:\n"
+                "                   2img  Universal Disk Image\n"
                 "                   dc42  DiskCopy 4.2 Image\n"
+                "                   davex Davex Disk Image\n"
                 "                   do    DOS Order Disk Image\n"
                 "                   po    ProDOS Order Disk Image (default)\n"
     );
@@ -186,17 +188,10 @@ int main(int argc, char **argv)
     fname = 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
     {
         
@@ -223,7 +218,8 @@ int main(int argc, char **argv)
             }
             
             else
-            {
+            {          
+                
                 // file exists, verify we want to destroy it.
                 
                 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)
             device.reset( BlockDevice::Create(fname, volumeName.c_str(), blocks, format));