zfec/zunfec: make the cmdline programs take input from stdin

[tahoe-lafs/zfec.git] / zfec / cmdline_zunfec.py

diff --git a/zfec/cmdline_zunfec.py b/zfec/cmdline_zunfec.py
index 8fc0c040dfd7a325ff2a6fe1cba0b093852aab0a..514b468daad08ac60bac2bb9da3b15804387c9e5 100755 (executable)
--- a/zfec/cmdline_zunfec.py
+++ b/zfec/cmdline_zunfec.py
@@ -30,7 +30,9 @@ def main():
         print "At least two sharefiles are required."
         return 1
 
-    if args.force:
+    if args.outputfile == '-':
+        outf = sys.stdout
+    elif args.force:
         outf = open(args.outputfile, 'wb')
     else:
         try:
@@ -49,7 +51,7 @@ def main():
     for fn in args.sharefiles:
         sharefs.append(open(fn, 'rb'))
     try:
-        ret = filefec.decode_from_files(outf, sharefs, args.verbose)
+        ret = filefec.decode_from_files(outf, sharefs, args.verbose, sys.stdout==outf)
     except filefec.InsufficientShareFilesError, e:
         print str(e)
         return 3