Merge pull request #17 from zhovner/master

Read only first line from config. Do not parse comments as arguments - Thanks!

rfidiot/__init__.py

@@ -125,15 +125,15 @@ def printoptions():
 if os.environ.has_key(OptsEnv):
 	try:
 		configfile= open(os.environ[OptsEnv])
-		extraopts= string.split(configfile.read())
+		extraopts= string.split(configfile.readline())
 	except:
     		print "*** warning: config file set by ENV not found (%s) or empty!" % (os.environ[OptsEnv])
 		print "*** not checking for other option files!"
 else:
 	for path in ['.','/etc']:
 		try:
 			configfile= open(path + '/RFIDIOtconfig.opts')
-			extraopts= string.split(configfile.read())
+			extraopts= string.split(configfile.readline())
 			break
 		except:
 			pass

send_apdu.py

@@ -1,51 +1,51 @@
-#!/usr/bin/python
-
-#
-# send_apdu.py - Python code for Sending raw APDU commands
-# version 0.1
-# Nick von Dadelszen (nick@lateralsecurity.com)
-# Lateral Security (www.lateralsecurity.com)
-
-#
-# This code is copyright (c) Lateral Security, 2011, All rights reserved.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import rfidiot
-import sys
-import os
-
-try:
-        card= rfidiot.card
-except:
-	print "Couldn't open reader!"
-        os._exit(True)
-
-card.info('send_apdu v0.1a')
-card.select()
-print '\nID: ' + card.uid
-print '  Data:'
-
-cont = True
-while cont:
-	apdu = raw_input("enter the apdu to send now, send \'close\' to finish :")
-	if apdu == 'close':
-		cont = False
-	else:
-		r = card.pcsc_send_apdu(apdu)
-		print card.data + card.errorcode
-
-print 'Ending now ...'
-
+#!/usr/bin/python
+
+#
+# send_apdu.py - Python code for Sending raw APDU commands
+# version 0.1
+# Nick von Dadelszen (nick@lateralsecurity.com)
+# Lateral Security (www.lateralsecurity.com)
+
+#
+# This code is copyright (c) Lateral Security, 2011, All rights reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import rfidiot
+import sys
+import os
+
+try:
+        card= rfidiot.card
+except:
+	print "Couldn't open reader!"
+        os._exit(True)
+
+card.info('send_apdu v0.1a')
+card.select()
+print '\nID: ' + card.uid
+print '  Data:'
+
+cont = True
+while cont:
+	apdu = raw_input("enter the apdu to send now, send \'close\' to finish :")
+	if apdu == 'close':
+		cont = False
+	else:
+		r = card.pcsc_send_apdu(apdu)
+		print card.data + card.errorcode
+
+print 'Ending now ...'
+