X-Git-Url: https://git.ozlabs.org/?p=bitfield;a=blobdiff_plain;f=bitfield;h=6f1bcefb2b2fd872fa47870816a05d870bb5fcd9;hp=c70c6c6af86f2682906936f7d5338245031eb87d;hb=fe79f168f6c8ee1b4e492ebd00fcc05e69019072;hpb=a0b58e793af6e3337d8425dc7035d949cc2ac857;ds=sidebyside

diff --git a/bitfield b/bitfield
index c70c6c6..6f1bcef 100644
--- a/bitfield
+++ b/bitfield
@@ -15,8 +15,9 @@ from getopt import getopt, GetoptError
 
 # List of paths to look for configuration files. If a directory is specified,
 # it will be (recursively) scanned for .conf files.
-configs = [os.path.join(os.getenv("HOME"), ".bitfields.conf"),
-		os.path.join(os.getenv("HOME"), ".bitfields.d")]
+configs = [os.path.join(os.getenv("HOME"), ".bitfield.conf"),
+		os.path.join(os.getenv("HOME"), ".bitfield.d"),
+		"/etc/bitfield.d", "/etc/bitfield", ]
 
 class bitfield:
 	def __init__(self, bits, name):
@@ -226,7 +227,7 @@ def decode_value(reg, value, options):
 			"for %d-bit register '%s'") % (value, reg.width, reg.id)
 		return
 
-	print reg.decode(i, options.has_key('non_zero'))
+	print reg.decode(i, options['non-zero'])
 
 
 def main():