Index: Makefile
===================================================================
--- Makefile	(revision 619e7c9b0af31177bf441bbb64d080b4ba93bd4a)
+++ Makefile	(revision 8c25a4ab901eeb3ee0eb25b1c0b5d5ffda31cc36)
@@ -135,5 +135,5 @@
 	-$(MAKE) -C uspace distclean
 	-$(MAKE) -C boot distclean
-	-rm Makefile.config
+	rm -f Makefile.config tools/*.pyc
 
 clean:
@@ -143,5 +143,5 @@
 
 cscope:
-	-rm cscope.out
-	-find kernel boot uspace -regex '^.*\.[chsS]$$' -print >srclist
-	-cscope -bi srclist
+	find kernel boot uspace -regex '^.*\.[chsS]$$' -print > srclist
+	rm -f cscope.out
+	cscope -bi srclist
Index: tools/mkhord.py
===================================================================
--- tools/mkhord.py	(revision 619e7c9b0af31177bf441bbb64d080b4ba93bd4a)
+++ tools/mkhord.py	(revision 8c25a4ab901eeb3ee0eb25b1c0b5d5ffda31cc36)
@@ -39,5 +39,4 @@
 	return (((size) + ((alignment) - 1)) & ~((alignment) - 1))
 
-
 def usage(prname):
 	"Print usage syntax"
@@ -61,8 +60,7 @@
 	inf = file(fs_image, "rb")
 	outf = file(sys.argv[3], "wb")
-
+	
 	header_size = align_up(18, align)
 	aligned_size = align_up(os.path.getsize(fs_image), align)
-
 	
 	outf.write(struct.pack("<4sBBLQ", "HORD", 1, 1, header_size, aligned_size))
Index: tools/mktmpfs.py
===================================================================
--- tools/mktmpfs.py	(revision 619e7c9b0af31177bf441bbb64d080b4ba93bd4a)
+++ tools/mktmpfs.py	(revision 8c25a4ab901eeb3ee0eb25b1c0b5d5ffda31cc36)
@@ -34,13 +34,20 @@
 import os
 import struct
+import xstruct
+
+HEADER = xstruct.convert("little: char[5]")
+DENTRY = xstruct.convert("little: uint8_t uint32_t")
+SIZE = xstruct.convert("little: uint32_t")
+
+DENTRY_NONE = 0
+DENTRY_FILE = 1
+DENTRY_DIRECTORY = 2
 
 def usage(prname):
 	"Print usage syntax"
-	print prname + " <ALIGNMENT> <PATH> <IMAGE>"
+	print prname + " <PATH> <IMAGE>"
 
 def recursion(root, outf):
 	"Recursive directory walk"
-	
-	payload_size = 0
 	
 	for name in os.listdir(root):
@@ -48,10 +55,9 @@
 		
 		if (os.path.isfile(canon)):
-			outf.write(struct.pack("<BL" + ("%d" % len(name)) + "s", 1, len(name), name))
-			payload_size += 5 + len(name)
+			outf.write(struct.pack(DENTRY, DENTRY_FILE, len(name)))
+			outf.write(xstruct.little_string(name))
 			size = os.path.getsize(canon)
 			rd = 0;
-			outf.write(struct.pack("<L", size))
-			payload_size += 4
+			outf.write(struct.pack(SIZE, size))
 			
 			inf = file(canon, "r")
@@ -59,16 +65,12 @@
 				data = inf.read(4096);
 				outf.write(data)
-				payload_size += len(data)
 				rd += len(data)
 			inf.close()
 		
 		if (os.path.isdir(canon)):
-			outf.write(struct.pack("<BL" + ("%d" % len(name)) + "s", 2, len(name), name))
-			payload_size += 5 + len(name)
-			payload_size += recursion(canon, outf)
-			outf.write(struct.pack("<BL", 0, 0))
-			payload_size += 5
-	
-	return payload_size
+			outf.write(struct.pack(DENTRY, DENTRY_DIRECTORY, len(name)))
+			outf.write(xstruct.little_string(name))
+			recursion(canon, outf)
+			outf.write(struct.pack(DENTRY, DENTRY_NONE, 0))
 
 def main():
@@ -84,7 +86,7 @@
 	outf = file(sys.argv[2], "w")
 	
-	outf.write(struct.pack("<5s", "TMPFS"))
+	outf.write(struct.pack(HEADER, "TMPFS"))
 	recursion(path, outf)
-	outf.write(struct.pack("<BL", 0, 0))
+	outf.write(struct.pack(DENTRY, DENTRY_NONE, 0))
 
 	outf.close()
Index: tools/xstruct.py
===================================================================
--- tools/xstruct.py	(revision 8c25a4ab901eeb3ee0eb25b1c0b5d5ffda31cc36)
+++ tools/xstruct.py	(revision 8c25a4ab901eeb3ee0eb25b1c0b5d5ffda31cc36)
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2008 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+"""
+Convert descriptive structure definitions to struct formats
+"""
+
+import struct
+
+def convert(definition):
+	"Convert structure defition to struct format"
+	
+	tokens = definition.split(None)
+	
+	# Initial byte order tag
+	struct = {
+		"little:":  lambda: "<",
+		"big:":     lambda: ">",
+		"network:": lambda: "!"
+	}[tokens[0]]()
+		
+	# Member tags
+	
+	for token in tokens[1:]:
+		if (token[0:5] == "char["):
+			size = token[5:].split("]")[0]
+			struct += ("%d" % int(size)) + "s"
+		else:
+			struct += {
+				"uint8_t":  lambda: "B",
+				"uint16_t": lambda: "H",
+				"uint32_t": lambda: "L",
+				"uint64_t": lambda: "Q",
+				
+				"int8_t":   lambda: "b",
+				"int16_t":  lambda: "h",
+				"int32_t":  lambda: "l",
+				"int64_t":  lambda: "q"
+			}[token]()
+	
+	return struct
+
+def little_string(string):
+	return struct.pack("<" + ("%d" % len(string)) + "s", string)