dsktool 0.2.1 → 0.4.1

data/doc/classes/DOSDisk.html

@@ -58,6 +58,10 @@
                 <a href="../files/lib/DOSDisk_rb.html">
                 lib/DOSDisk.rb
                 </a>
+        <br />
+                <a href="../files/test/backup/DOSDisk_rb.html">
+                test/backup/DOSDisk.rb
+                </a>
         <br />
             </td>
         </tr>
@@ -79,13 +83,6 @@
 
 
   <div id="contextContent">
-    <div id="diagram">
-      <map id="map" name="map">
-  <area shape="RECT" coords="13,101,88,149"      href="DOSDisk.html" alt="DOSDisk">
-  <area shape="RECT" coords="15,5,87,53"      href="DSK.html" alt="DSK">
-</map>
-<img src="../dot/f_3.png" usemap="#map" border=0 alt="TopLevel">
-    </div>
 
     <div id="description">
       <pre>
@@ -186,9 +183,25 @@ TRACK/SECTOR LIST FORMAT (from Beneath Apple DOS p 4-6)
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000041">dump_catalog</a>&nbsp;&nbsp;
-      <a href="#M000042">new</a>&nbsp;&nbsp;
-      <a href="#M000043">read_vtoc</a>&nbsp;&nbsp;
+      <a href="#M000145">add_file</a>&nbsp;&nbsp;
+      <a href="#M000137">add_file</a>&nbsp;&nbsp;
+      <a href="#M000135">delete_file</a>&nbsp;&nbsp;
+      <a href="#M000138">dump_catalog</a>&nbsp;&nbsp;
+      <a href="#M000127">dump_catalog</a>&nbsp;&nbsp;
+      <a href="#M000139">file_system</a>&nbsp;&nbsp;
+      <a href="#M000128">file_system</a>&nbsp;&nbsp;
+      <a href="#M000132">find_catalog_slot</a>&nbsp;&nbsp;
+      <a href="#M000143">find_catalog_slot</a>&nbsp;&nbsp;
+      <a href="#M000144">free_sector_list</a>&nbsp;&nbsp;
+      <a href="#M000133">free_sector_list</a>&nbsp;&nbsp;
+      <a href="#M000134">get_track_sector_list</a>&nbsp;&nbsp;
+      <a href="#M000141">make_file</a>&nbsp;&nbsp;
+      <a href="#M000130">make_file</a>&nbsp;&nbsp;
+      <a href="#M000129">new</a>&nbsp;&nbsp;
+      <a href="#M000140">new</a>&nbsp;&nbsp;
+      <a href="#M000131">read_vtoc</a>&nbsp;&nbsp;
+      <a href="#M000142">read_vtoc</a>&nbsp;&nbsp;
+      <a href="#M000136">set_sector</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -210,13 +223,27 @@ TRACK/SECTOR LIST FORMAT (from Beneath Apple DOS p 4-6)
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000042" class="method-detail">
-        <a name="M000042"></a>
+      <div id="method-M000129" class="method-detail">
+        <a name="M000129"></a>
 
         <div class="method-heading">
-          <a href="DOSDisk.src/M000042.html" target="Code" class="method-signature"
-            onclick="popupCode('DOSDisk.src/M000042.html');return false;">
-          <span class="method-name">new</span><span class="method-args">(file_bytes)</span>
+          <a href="DOSDisk.src/M000129.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000129.html');return false;">
+          <span class="method-name">new</span><span class="method-args">(file_bytes,sector_order)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000140" class="method-detail">
+        <a name="M000140"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000140.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000140.html');return false;">
+          <span class="method-name">new</span><span class="method-args">(file_bytes,sector_order)</span>
           </a>
         </div>
       
@@ -226,12 +253,54 @@ TRACK/SECTOR LIST FORMAT (from Beneath Apple DOS p 4-6)
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000041" class="method-detail">
-        <a name="M000041"></a>
+      <div id="method-M000145" class="method-detail">
+        <a name="M000145"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000145.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000145.html');return false;">
+          <span class="method-name">add_file</span><span class="method-args">(file)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000137" class="method-detail">
+        <a name="M000137"></a>
 
         <div class="method-heading">
-          <a href="DOSDisk.src/M000041.html" target="Code" class="method-signature"
-            onclick="popupCode('DOSDisk.src/M000041.html');return false;">
+          <a href="DOSDisk.src/M000137.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000137.html');return false;">
+          <span class="method-name">add_file</span><span class="method-args">(file)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000135" class="method-detail">
+        <a name="M000135"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000135.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000135.html');return false;">
+          <span class="method-name">delete_file</span><span class="method-args">(filename)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000138" class="method-detail">
+        <a name="M000138"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000138.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000138.html');return false;">
           <span class="method-name">dump_catalog</span><span class="method-args">()</span>
           </a>
         </div>
@@ -240,12 +309,180 @@ TRACK/SECTOR LIST FORMAT (from Beneath Apple DOS p 4-6)
         </div>
       </div>
 
-      <div id="method-M000043" class="method-detail">
-        <a name="M000043"></a>
+      <div id="method-M000127" class="method-detail">
+        <a name="M000127"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000127.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000127.html');return false;">
+          <span class="method-name">dump_catalog</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000139" class="method-detail">
+        <a name="M000139"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000139.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000139.html');return false;">
+          <span class="method-name">file_system</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000128" class="method-detail">
+        <a name="M000128"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000128.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000128.html');return false;">
+          <span class="method-name">file_system</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
+      <div id="method-M000132" class="method-detail">
+        <a name="M000132"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000132.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000132.html');return false;">
+          <span class="method-name">find_catalog_slot</span><span class="method-args">(filename)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+iterate through the CATALOG to find either the named file or (if nil is
+passed in) an empty slot
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000143" class="method-detail">
+        <a name="M000143"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000143.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000143.html');return false;">
+          <span class="method-name">find_catalog_slot</span><span class="method-args">(filename)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+iterate through the CATALOG to find either the named file or (if nil is
+passed in) an empty slot
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000144" class="method-detail">
+        <a name="M000144"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000144.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000144.html');return false;">
+          <span class="method-name">free_sector_list</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+iterate through the sector usage bitmap, return a list of [track,sector]
+for sectors marked available
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000133" class="method-detail">
+        <a name="M000133"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000133.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000133.html');return false;">
+          <span class="method-name">free_sector_list</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+iterate through the sector usage bitmap, return a list of [track,sector]
+for sectors marked available
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000134" class="method-detail">
+        <a name="M000134"></a>
 
         <div class="method-heading">
-          <a href="DOSDisk.src/M000043.html" target="Code" class="method-signature"
-            onclick="popupCode('DOSDisk.src/M000043.html');return false;">
+          <a href="DOSDisk.src/M000134.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000134.html');return false;">
+          <span class="method-name">get_track_sector_list</span><span class="method-args">(ts_list_track_no,ts_list_sector_no)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+given a track and sector, treat it as a track/sector list and return an
+array containing track/sector pairs
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000141" class="method-detail">
+        <a name="M000141"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000141.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000141.html');return false;">
+          <span class="method-name">make_file</span><span class="method-args">(filename,contents,file_options={})</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+default file type is <a href="TextFile.html">TextFile</a> Tokenisation not
+currently implemented
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000130" class="method-detail">
+        <a name="M000130"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000130.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000130.html');return false;">
+          <span class="method-name">make_file</span><span class="method-args">(filename,contents,file_options={})</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+default file type is <a href="TextFile.html">TextFile</a> Tokenisation not
+currently implemented
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000131" class="method-detail">
+        <a name="M000131"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000131.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000131.html');return false;">
           <span class="method-name">read_vtoc</span><span class="method-args">()</span>
           </a>
         </div>
@@ -257,6 +494,37 @@ reads the VTOC, and populate the &quot;files&quot; array with files
         </div>
       </div>
 
+      <div id="method-M000142" class="method-detail">
+        <a name="M000142"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000142.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000142.html');return false;">
+          <span class="method-name">read_vtoc</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+reads the VTOC, and populate the &quot;files&quot; array with files
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000136" class="method-detail">
+        <a name="M000136"></a>
+
+        <div class="method-heading">
+          <a href="DOSDisk.src/M000136.html" target="Code" class="method-signature"
+            onclick="popupCode('DOSDisk.src/M000136.html');return false;">
+          <span class="method-name">set_sector</span><span class="method-args">(track,sector,contents)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+        </div>
+      </div>
+
 
     </div>
 

data/doc/classes/DOSDisk.src/M000127.html

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>dump_catalog (DOSDisk)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 87</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dump_catalog</span>
+                <span class="ruby-identifier">s</span>=<span class="ruby-value str">&quot;&quot;</span>
+        <span class="ruby-identifier">files</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">file_name</span><span class="ruby-operator">|</span>             
+                        <span class="ruby-identifier">file</span>=<span class="ruby-identifier">files</span>[<span class="ruby-identifier">file_name</span>]        
+                        <span class="ruby-identifier">s</span><span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;#{file.locked ? '*':' '}#{file.file_type} #{sprintf('%04d',file.contents.length)} #{file.filename}\n&quot;</span>
+                }
+                <span class="ruby-identifier">s</span>
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/DOSDisk.src/M000128.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>file_system (DOSDisk)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 96</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">file_system</span>
+                <span class="ruby-identifier">:dos</span>
+        <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/DOSDisk.src/{M000012.html → M000129.html}

@@ -10,9 +10,9 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 94</span>
-        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">file_bytes</span>)
-                <span class="ruby-keyword kw">super</span>(<span class="ruby-identifier">file_bytes</span>)
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 101</span>
+        <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">file_bytes</span>,<span class="ruby-identifier">sector_order</span>)
+                <span class="ruby-keyword kw">super</span>(<span class="ruby-identifier">file_bytes</span>,<span class="ruby-identifier">sector_order</span>)
                 <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">read_vtoc</span>
         <span class="ruby-keyword kw">end</span></pre>
 </body>

data/doc/classes/DOSDisk.src/M000130.html

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>make_file (DOSDisk)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 108</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">make_file</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">file_options</span>={})
+    <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Tokenisation not currently supported for DOS files&quot;</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">file_options</span>[<span class="ruby-identifier">:tokenise</span>])
+    <span class="ruby-identifier">file_type</span> = <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">file_options</span>[<span class="ruby-identifier">:filetype</span>]
+      <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">then</span> <span class="ruby-value">0x00</span>
+      <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'T'</span> <span class="ruby-keyword kw">then</span> <span class="ruby-value">0x00</span>
+      <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'I'</span> <span class="ruby-keyword kw">then</span> <span class="ruby-value">0x01</span>
+      <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'A'</span> <span class="ruby-keyword kw">then</span> <span class="ruby-value">0x02</span>
+      <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'B'</span> <span class="ruby-keyword kw">then</span> <span class="ruby-value">0x04</span>
+      <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">file_options</span>[<span class="ruby-identifier">:filetype</span>].<span class="ruby-identifier">tr</span>(<span class="ruby-value str">&quot;$&quot;</span>,<span class="ruby-value str">&quot;&quot;</span>).<span class="ruby-identifier">hex</span>
+      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">file_type</span><span class="ruby-operator">==</span><span class="ruby-value">4</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">file_options</span>[<span class="ruby-identifier">:base</span>].<span class="ruby-identifier">nil?</span>) <span class="ruby-keyword kw">then</span>
+        <span class="ruby-identifier">base</span>=<span class="ruby-identifier">file_options</span>[<span class="ruby-identifier">:base</span>].<span class="ruby-identifier">tr</span>(<span class="ruby-value str">&quot;$&quot;</span>,<span class="ruby-value str">&quot;&quot;</span>).<span class="ruby-identifier">hex</span>
+        <span class="ruby-identifier">s</span>=<span class="ruby-value str">&quot;\0\0\0\0&quot;</span>
+        <span class="ruby-identifier">s</span>[<span class="ruby-value">0</span>]=<span class="ruby-identifier">base</span><span class="ruby-operator">%</span><span class="ruby-value">256</span>
+        <span class="ruby-identifier">s</span>[<span class="ruby-value">1</span>]=<span class="ruby-identifier">base</span><span class="ruby-operator">/</span><span class="ruby-value">256</span>
+        <span class="ruby-identifier">s</span>[<span class="ruby-value">2</span>]=<span class="ruby-identifier">contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">%</span><span class="ruby-value">256</span>
+        <span class="ruby-identifier">s</span>[<span class="ruby-value">3</span>]=<span class="ruby-identifier">contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">/</span><span class="ruby-value">256</span>
+        <span class="ruby-identifier">contents</span>=<span class="ruby-identifier">s</span><span class="ruby-operator">+</span><span class="ruby-identifier">contents</span>
+      <span class="ruby-keyword kw">end</span>
+    <span class="ruby-identifier">new_file</span>=<span class="ruby-constant">DOSFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-keyword kw">false</span>,<span class="ruby-identifier">file_type</span>)
+  <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">new_file</span>
+<span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/DOSDisk.src/{M000043.html → M000131.html}

@@ -10,11 +10,13 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 100</span>
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 133</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">read_vtoc</span>
+    <span class="ruby-ivar">@files</span>={}
                 <span class="ruby-identifier">vtoc_sector</span>=<span class="ruby-identifier">get_sector</span>(<span class="ruby-value">17</span>,<span class="ruby-value">0</span>)
                 <span class="ruby-identifier">catalog_sector</span>=<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">vtoc_sector</span>[<span class="ruby-value">01</span>],<span class="ruby-identifier">vtoc_sector</span>[<span class="ruby-value">02</span>])
                 <span class="ruby-identifier">done</span>=<span class="ruby-keyword kw">false</span>
+                <span class="ruby-identifier">visited_sectors</span>={}
                 <span class="ruby-keyword kw">while</span> <span class="ruby-operator">!</span><span class="ruby-identifier">done</span>
                         <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">catalog_sector</span>.<span class="ruby-identifier">nil?</span>
                         (<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">6</span>).<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">file_number</span><span class="ruby-operator">|</span>
@@ -23,7 +25,8 @@
                                 <span class="ruby-keyword kw">break</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0</span>]<span class="ruby-operator">==</span><span class="ruby-value">0x</span><span class="ruby-constant">FF</span>) <span class="ruby-comment cmt"># skip deleted files</span>
                                 <span class="ruby-identifier">filename</span>=<span class="ruby-value str">&quot;&quot;</span>
                                 <span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">3</span><span class="ruby-operator">..</span><span class="ruby-value">32</span>].<span class="ruby-identifier">to_s</span>.<span class="ruby-identifier">each_byte</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">b</span><span class="ruby-operator">|</span> <span class="ruby-identifier">filename</span><span class="ruby-operator">+=</span>(<span class="ruby-identifier">b</span>.<span class="ruby-operator">%</span><span class="ruby-value">128</span>).<span class="ruby-identifier">chr</span>}
-                                <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">sub!</span>(<span class="ruby-regexp re">/ *$/</span>,<span class="ruby-value str">&quot;&quot;</span>) <span class="ruby-comment cmt">#strip off trailing spaces</span>
+                                <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/ *$/</span>,<span class="ruby-value str">&quot;&quot;</span>) <span class="ruby-comment cmt">#strip off trailing spaces</span>
+                                <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">tr!</span>(<span class="ruby-value str">&quot;\x00-\x1f&quot;</span>,<span class="ruby-value str">&quot;\x40-\x5f&quot;</span>) <span class="ruby-comment cmt">#convert non-printable chars to corresponding uppercase letter</span>
                                 <span class="ruby-identifier">locked</span>=(<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">2</span>]<span class="ruby-operator">&gt;=</span><span class="ruby-value">0x80</span>)
                                 <span class="ruby-identifier">sector_count</span>=<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x21</span>]<span class="ruby-operator">+</span><span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x22</span>]<span class="ruby-operator">*</span><span class="ruby-value">256</span>
                 
@@ -49,24 +52,30 @@
                                         <span class="ruby-keyword kw">end</span>
                                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">contents</span>.<span class="ruby-identifier">length</span><span class="ruby-operator">&gt;</span><span class="ruby-value">0</span> <span class="ruby-keyword kw">then</span>
                                                 <span class="ruby-ivar">@files</span>[<span class="ruby-identifier">filename</span>]= <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">file_type_code</span>
-                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x00</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">TextFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>)
-                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x01</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">SCAsmFile</span>.<span class="ruby-identifier">can_be_scasm_file?</span>(<span class="ruby-identifier">contents</span>)<span class="ruby-operator">?</span> <span class="ruby-constant">SCAsmFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>)<span class="ruby-operator">:</span> <span class="ruby-constant">IntegerBasicFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>)
-                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x02</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">AppleSoftFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>)
-                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x04</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">BinaryFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>)
+                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x00</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">TextFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>)
+                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x01</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">SCAsmFile</span>.<span class="ruby-identifier">can_be_scasm_file?</span>(<span class="ruby-identifier">contents</span>)<span class="ruby-operator">?</span> <span class="ruby-constant">SCAsmFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>)<span class="ruby-operator">:</span> <span class="ruby-constant">IntegerBasicFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>)
+                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x02</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">AppleSoftFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>)
+                                                        <span class="ruby-keyword kw">when</span> <span class="ruby-value">0x04</span> <span class="ruby-keyword kw">then</span> <span class="ruby-constant">BinaryFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>)
         <span class="ruby-comment cmt">#                                              when 0x08 then &quot;S&quot;      #S type file</span>
         <span class="ruby-comment cmt">#                                              when 0x10 then &quot;R&quot;      #RELOCATABLE object module file</span>
         <span class="ruby-comment cmt">#                                              when 0x20 then &quot;a&quot;      #??</span>
         <span class="ruby-comment cmt">#                                              when 0x40 then &quot;b&quot;      #??</span>
-                                                        <span class="ruby-keyword kw">else</span> <span class="ruby-constant">DOSFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">sector_count</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">sprintf</span>(<span class="ruby-value str">&quot;$%02X&quot;</span>,<span class="ruby-identifier">file_type_code</span>))
+                                                        <span class="ruby-keyword kw">else</span> <span class="ruby-constant">DOSFile</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">filename</span>,<span class="ruby-identifier">contents</span>,<span class="ruby-identifier">locked</span>,<span class="ruby-identifier">file_type_code</span>)
                                                 <span class="ruby-keyword kw">end</span>
                                         <span class="ruby-keyword kw">end</span>
                                 <span class="ruby-keyword kw">end</span>
                         }
                         <span class="ruby-identifier">next_track</span>=<span class="ruby-identifier">catalog_sector</span>[<span class="ruby-value">1</span>]         
-                        <span class="ruby-identifier">next_sector</span>=<span class="ruby-identifier">catalog_sector</span>[<span class="ruby-value">2</span>]
+                        <span class="ruby-identifier">next_sector</span>=<span class="ruby-identifier">catalog_sector</span>[<span class="ruby-value">2</span>]<span class="ruby-operator">%</span><span class="ruby-value">0x10</span>
                         <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">next_track</span><span class="ruby-operator">==</span><span class="ruby-value">0</span>) <span class="ruby-operator">&amp;&amp;</span>( <span class="ruby-identifier">next_sector</span><span class="ruby-operator">==</span><span class="ruby-value">0</span>) <span class="ruby-keyword kw">then</span>
                                 <span class="ruby-identifier">done</span>=<span class="ruby-keyword kw">true</span>
                         <span class="ruby-keyword kw">else</span> 
+                                <span class="ruby-comment cmt">#check we haven't got into an endless loop</span>
+                                <span class="ruby-identifier">s</span>=<span class="ruby-node">&quot;#{next_track}/#{next_sector}&quot;</span>
+                                <span class="ruby-keyword kw">if</span> (<span class="ruby-operator">!</span><span class="ruby-identifier">visited_sectors</span>[<span class="ruby-identifier">s</span>].<span class="ruby-identifier">nil?</span>) <span class="ruby-keyword kw">then</span>
+                                        <span class="ruby-identifier">done</span>=<span class="ruby-keyword kw">true</span>
+                                <span class="ruby-keyword kw">end</span>
+                                <span class="ruby-identifier">visited_sectors</span>[<span class="ruby-identifier">s</span>]=<span class="ruby-keyword kw">true</span>
                                 <span class="ruby-identifier">catalog_sector</span>=<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">next_track</span>,<span class="ruby-identifier">next_sector</span>)
                         <span class="ruby-keyword kw">end</span>
                 <span class="ruby-keyword kw">end</span>

data/doc/classes/DOSDisk.src/M000132.html

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>find_catalog_slot (DOSDisk)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/DOSDisk.rb, line 204</span>
+<span class="ruby-keyword kw">def</span> <span class="ruby-identifier">find_catalog_slot</span>(<span class="ruby-identifier">filename</span>)
+  <span class="ruby-identifier">vtoc_sector</span>=<span class="ruby-identifier">get_sector</span>(<span class="ruby-value">17</span>,<span class="ruby-value">0</span>)
+  <span class="ruby-identifier">catalog_filename</span>=<span class="ruby-constant">DOSFile</span>.<span class="ruby-identifier">catalog_filename</span>(<span class="ruby-identifier">filename</span>.<span class="ruby-identifier">upcase</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">nil?</span>
+  <span class="ruby-identifier">catalog_track_no</span>=<span class="ruby-identifier">vtoc_sector</span>[<span class="ruby-value">01</span>]
+  <span class="ruby-identifier">catalog_sector_no</span>=<span class="ruby-identifier">vtoc_sector</span>[<span class="ruby-value">02</span>]
+  
+  <span class="ruby-keyword kw">while</span> (<span class="ruby-identifier">catalog_track_no</span><span class="ruby-operator">+</span><span class="ruby-identifier">catalog_sector_no</span><span class="ruby-operator">&gt;</span><span class="ruby-value">0</span>) <span class="ruby-keyword kw">do</span>
+    <span class="ruby-identifier">catalog</span>=<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">catalog_track_no</span>,<span class="ruby-identifier">catalog_sector_no</span>)    
+    (<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">7</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">slot_no</span><span class="ruby-operator">|</span>
+      <span class="ruby-identifier">slot_start</span>=<span class="ruby-identifier">slot_no</span><span class="ruby-operator">*</span><span class="ruby-value">0x23</span><span class="ruby-operator">+</span><span class="ruby-value">0x0</span><span class="ruby-constant">B</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">filename</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">&amp;&amp;</span> (<span class="ruby-identifier">catalog</span>[<span class="ruby-identifier">slot_start</span>]<span class="ruby-operator">==</span><span class="ruby-value">0x00</span>)<span class="ruby-operator">||</span> (<span class="ruby-identifier">catalog</span>[<span class="ruby-identifier">slot_start</span>]<span class="ruby-operator">==</span><span class="ruby-value">0x</span><span class="ruby-constant">FF</span>) <span class="ruby-keyword kw">then</span>        
+        <span class="ruby-keyword kw">return</span> <span class="ruby-constant">DSKTrackSector</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">catalog_track_no</span>,<span class="ruby-identifier">catalog_sector_no</span>,<span class="ruby-identifier">slot_start</span>)
+      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">if</span> (<span class="ruby-operator">!</span><span class="ruby-identifier">filename</span>.<span class="ruby-identifier">nil?</span>) <span class="ruby-operator">&amp;&amp;</span> (<span class="ruby-identifier">catalog</span>[<span class="ruby-identifier">slot_start</span><span class="ruby-operator">+</span><span class="ruby-value">0x03</span><span class="ruby-operator">..</span><span class="ruby-identifier">slot_start</span><span class="ruby-operator">+</span><span class="ruby-value">0x20</span>]<span class="ruby-operator">==</span><span class="ruby-identifier">catalog_filename</span>) <span class="ruby-keyword kw">then</span>
+        <span class="ruby-keyword kw">return</span> <span class="ruby-constant">DSKTrackSector</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">catalog_track_no</span>,<span class="ruby-identifier">catalog_sector_no</span>,<span class="ruby-identifier">slot_start</span>)
+      <span class="ruby-keyword kw">end</span>
+    <span class="ruby-keyword kw">end</span>
+    <span class="ruby-identifier">catalog_track_no</span>=<span class="ruby-identifier">catalog</span>[<span class="ruby-value">01</span>]
+    <span class="ruby-identifier">catalog_sector_no</span>=<span class="ruby-identifier">catalog</span>[<span class="ruby-value">02</span>]    
+  <span class="ruby-keyword kw">end</span>
+  <span class="ruby-keyword kw">nil</span>
+<span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>