[Nym3-commit] r430 - in trunk/nymbaron: Client Server

[jr at conuropsis.org]

Author: jr
Date: 2005-11-28 00:52:14 +0100 (Mon, 28 Nov 2005)
New Revision: 430

Modified:
   trunk/nymbaron/Client/Main.py
   trunk/nymbaron/Server/Main.py
Log:
- check for KeyboardInterrupt when reading stdin [client] [server]


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-11-26 20:53:46 UTC (rev 429)
+++ trunk/nymbaron/Client/Main.py	2005-11-27 23:52:14 UTC (rev 430)
@@ -128,7 +128,12 @@
 
     def promptblock(self, s):
 	print s
-	return sys.stdin.read()
+	try:
+	    return sys.stdin.read()
+	except KeyboardInterrupt:
+	    print "Interrupted by the user"
+	    sys.exit(2)
+	
 
 def decode_secring(config, ui):
     try:
@@ -956,7 +961,12 @@
 	    except IOError:
 		ui.display("Can't read requested file")
 		sys.exit(1)
-	else: msg = sys.stdin.read()
+	else:
+	    try:
+		msg = sys.stdin.read()
+	    except KeyboardInterrupt:
+		print "Interrupted by the user"
+		sys.exit(2)
 	processMessage(msg, config, ui, nick)
 	sys.exit(0)
 
@@ -1109,7 +1119,12 @@
 	    except IOError:
 		ui.display("Can't read requested file")
 		sys.exit(1)
-	else: msg = sys.stdin.read()
+	else:
+	    try:
+		msg = sys.stdin.read()
+	    except KeyboardInterrupt:
+		print "Interrupted by the user"
+		sys.exit(2)
 	(fd, name) = tempfile.mkstemp()
 	os.write(fd, msg)
 	os.close(fd)

Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2005-11-26 20:53:46 UTC (rev 429)
+++ trunk/nymbaron/Server/Main.py	2005-11-27 23:52:14 UTC (rev 430)
@@ -287,11 +287,19 @@
 	
     for o, a in optlist:
 	if o == "-d": # mail delivery
-	    processIncoming(a, sys.stdin.read())
+	    try:
+		processIncoming(a, sys.stdin.read())
+	    except KeyboardInterrupt:
+		print "Interrupted by the User"
+		sys.exit(2)
 	    sys.exit(0)
 	if o == "-m":
-	    msg = sys.stdin.read()
 	    try:
+		msg = sys.stdin.read()
+	    except KeyboardInterrupt:
+		print "Interrupted by the User"
+		sys.exit(2)
+	    try:
 		processMessage(msg)
 	    except Exception:
 		# see if we got a base64 encoded message.