Bugfixing initrd and ld-acess

[tpg/acess2.git] / Modules / Filesystems / InitRD / GenerateInitRD.php

diff --git a/Modules/Filesystems/InitRD/GenerateInitRD.php b/Modules/Filesystems/InitRD/GenerateInitRD.php
index d89d6e9..031ad59 100644 (file)
--- a/Modules/Filesystems/InitRD/GenerateInitRD.php
+++ b/Modules/Filesystems/InitRD/GenerateInitRD.php
@@ -1,10 +1,15 @@
+<?php
+$lGenDate = date("Y-m-d H:i");
+$gOutput = <<<EOF
 /*
  * Acess2 InitRD
  * InitRD Data
- * Generated <?php echo date("Y-m-d H:i"),"\n"; ?>
+ * Generated $lGenDate
  */
 #include "initrd.h"
-<?php
+
+EOF;
+
 $lines = file($argv[1]);
 
 $lDepth = 0;
@@ -31,6 +36,8 @@ foreach($lines as $line)
                $lStack[$lDepth][1][] = array($matches[1], $matches[2]);
                continue;
        }
+       echo "ERROR: $line\n";
+       exit(0);
 }
 
 function hd($fp)
@@ -40,22 +47,23 @@ function hd($fp)
 
 function ProcessFolder($prefix, $items)
 {
+       global  $gOutput;
        foreach($items as $i=>$item)
        {
-               if(is_array($item[1])) {
-                       
+               if(is_array($item[1]))
+               {
                        ProcessFolder("{$prefix}_{$i}", $item[1]);
                        
-                       echo "tInitRD_File {$prefix}_{$i}_entries[] = {\n";
+                       $gOutput .= "tInitRD_File {$prefix}_{$i}_entries[] = {\n";
                        foreach($item[1] as $j=>$child)
                        {
-                               if($j)  echo ",\n";
-                               echo "\t{\"".addslashes($child[0])."\",&{$prefix}_{$i}_{$j}}";
+                               if($j)  $gOutput .= ",\n";
+                               $gOutput .= "\t{\"".addslashes($child[0])."\",&{$prefix}_{$i}_{$j}}";
                        }
-                       echo "\n};\n";
+                       $gOutput .= "\n};\n";
                        
                        $size = count($item[1]);
-                       echo <<<EOF
+                       $gOutput .= <<<EOF
 tVFS_Node {$prefix}_{$i} = {
        .NumACLs = 1,
        .ACLs = &gVFS_ACL_EveryoneRX,
@@ -69,31 +77,35 @@ tVFS_Node {$prefix}_{$i} = {
 EOF;
                }
                else {
+                       if(!file_exists($item[1])) {
+                               echo "ERROR: '{$item[1]}' does not exist\n", 
+                               exit(1);
+                       }
                        $size = filesize($item[1]);
                        
-                       echo "Uint8 {$prefix}_{$i}_data[] = {\n";
+                       $gOutput .= "Uint8 {$prefix}_{$i}_data[] = {\n";
                        $fp = fopen($item[1], "rb");
                        for( $j = 0; $j + 16 < $size; $j += 16 )
                        {
-                               echo "\t";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",";
-                               echo hd($fp),",",hd($fp),",\n";
+                               $gOutput .= "\t";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",";
+                               $gOutput .= hd($fp).",".hd($fp).",\n";
                        }
-                       echo "\t";
+                       $gOutput .= "\t";
                        for( ; $j < $size; $j ++ )
                        {
-                               if( $j & 15 )   echo ",";
-                               echo hd($fp);
+                               if( $j & 15 )   $gOutput .= ",";
+                               $gOutput .= hd($fp);
                        }
                        fclose($fp);
-                       echo "\n};\n";
-                       echo <<<EOF
+                       $gOutput .= "\n};\n";
+                       $gOutput .= <<<EOF
 tVFS_Node {$prefix}_{$i} = {
        .NumACLs = 1,
        .ACLs = &gVFS_ACL_EveryoneRX,
@@ -108,22 +120,32 @@ EOF;
        }
 }
 
+//print_r($lStack);
+//exit(1);
+
 ProcessFolder("gInitRD_Files", $lStack[0][1]);
 
-echo "tInitRD_File gInitRD_Root_Files[] = {\n";
+$gOutput .= "tInitRD_File gInitRD_Root_Files[] = {\n";
 foreach($lStack[0][1] as $j=>$child)
 {
-       if($j)  echo ",\n";
-       echo "\t{\"".addslashes($child[0])."\",&gInitRD_Files_{$j}}";
+       if($j)  $gOutput .= ",\n";
+       $gOutput .= "\t{\"".addslashes($child[0])."\",&gInitRD_Files_{$j}}";
 }
-echo "\n};\n";
-?>
+$gOutput .= "\n};\n";
+$nRootFiles = count($lStack[0][1]);
+$gOutput .= <<<EOF
 tVFS_Node gInitRD_RootNode = {
        .NumACLs = 1,
        .ACLs = &gVFS_ACL_EveryoneRX,
        .Flags = VFS_FFLAG_DIRECTORY,
-       .Size = <?php echo count($lStack[0][1]);?>,
+       .Size = $nRootFiles,
        .ImplPtr = gInitRD_Root_Files,
        .ReadDir = InitRD_ReadDir,
        .FindDir = InitRD_FindDir
 };
+EOF;
+
+$fp = fopen($argv[2], "w");
+fputs($fp, $gOutput);
+fclose($fp);
+?>