From 1601fb373835146f38e0b9516b7bb7bd41eddfaa Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 9 Jun 2005 19:02:32 +0000
Subject: [PATCH] fixes and remove debug code

---
 refpolicy/support/sedoctool.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/refpolicy/support/sedoctool.py b/refpolicy/support/sedoctool.py
index ee20546e5..7b672878a 100755
--- a/refpolicy/support/sedoctool.py
+++ b/refpolicy/support/sedoctool.py
@@ -20,12 +20,19 @@ from xml.dom.ext import *
 from xml.dom.ext.reader import Sax2
 
 def read_policy_xml(filename):
+	try:
+		xml_fh = open(filename)
+	except:
+		error("error opening " + filename)
+
 	try:
 		reader = Sax2.Reader()
-		doc = reader.fromStream(filename)
+		doc = reader.fromString(xml_fh.read())
 	except: 
+		xml_fh.close()
 		error("Error while parsing xml")
-	
+
+	xml_fh.close()	
 	return doc
 
 def gen_tunable_conf(doc, file):
@@ -185,12 +192,13 @@ def gen_docs(doc, dir, templatedir):
 			for args in interface.getElementsByTagName("parameter"):
 				paramdesc = args.firstChild.data
 				paramname = None
-				paramopt = False
+				paramopt = "No"
 				for name,val in args.attributes.items():
 					if name[1] == "name":
 						paramname = val.value
 					if name[1] == "optional":
-						paramopt = val.value
+						if val.value == "true":
+							paramopt = "yes"
 				parameter = { "name" : paramname,
 					      "desc" : paramdesc,
 					      "optional" : paramopt }
@@ -228,7 +236,6 @@ def error(error):
         sys.stderr.write("%s exiting for: " % sys.argv[0])
         sys.stderr.write("%s\n" % error)
         sys.stderr.flush()
-	raise
         sys.exit(1)
 
 def usage():
@@ -247,7 +254,7 @@ except getopt.GetoptError:
 	usage()
 	sys.exit(1)
 
-tunables = modules = docs = None
+tunables = modules = docsdir = None
 templatedir = "templates/"
 xmlfile = "policy.xml"
 
@@ -263,10 +270,6 @@ for opt, val in opts:
 	if opt in ("-T", "--templates"):
 		templatedir = val
 
-if xmlfile == None:
-	usage()
-	sys.exit(1)
-
 doc = read_policy_xml(xmlfile)
 		
 if tunables: