X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FInitRD%2FGenerateInitRD.php;h=44c005abe9ceba9787a74b1e2e24964c3d1a5d2d;hb=c5680ddd7aa4934759203aac95f14ac40e5c456b;hp=ca7be3d5d3527f37847f2d08c418d8a90dce3be2;hpb=11dbd684e9a3d907d43d71a3145205f1a86992fb;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
index ca7be3d5..44c005ab 100644
--- a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
+++ b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
@@ -1,4 +1,6 @@
 <?php
+date_default_timezone_set("UTC");
+
 $lGenDate = date("Y-m-d H:i");
 $gOutput = <<<EOF
 /*
@@ -45,8 +47,12 @@ foreach($lines as $line)
 		continue;
 	}
 	// File
-	if(preg_match('/^File\s+"([^"]+)"\s+"([^"]+)"$/', $line, $matches))
+	if(preg_match('/^File\s+"([^"]+)"(?:\s+"([^"]+)")?$/', $line, $matches))
 	{
+		if( !isset($matches[2]) ) {
+			$matches[2] = $matches[1];
+			$matches[1] = basename($matches[2]);
+		}
 		$lStack[$lDepth][1][] = array($matches[1], $matches[2]);
 		continue;
 	}
@@ -123,36 +129,9 @@ EOF;
 			}
 			$size = filesize($path);
 	
-/*		
-			$_sym = $prefix."_".$i."_data";
-			$fp = fopen($path, "rb");
-			
-			$gOutput .= "Uint8 $_sym[] = {\n";
-			for( $j = 0; $j + 16 < $size; $j += 16 ) {
-				$gOutput .= "\t";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",";
-				$gOutput .= hd8($fp).",".hd8($fp).",\n";
-			}
-			$gOutput .= "\t";
-			for( ; $j < $size; $j ++ ) {
-				if( $j & 15 )	$gOutput .= ",";
-				$gOutput .= hd8($fp);
-			}
-			fclose($fp);
-			$gOutput .= "\n};\n";
-*/
-			
-//*
 			$_sym = "_binary_".str_replace(array("/","-","."), "_", $path)."_start";
 			$gOutput .= "extern Uint8 {$_sym}[];";
 			$gSymFiles[] = $path;
-//*/
 			$gOutput .= <<<EOF
 tVFS_Node {$prefix}_{$i} = {
 	.NumACLs = 1,