Don't have ./bup depend on main.py, etc.

[bup.git] / cmd / mux-cmd.py

diff --git a/cmd/mux-cmd.py b/cmd/mux-cmd.py
index 299dec9da5b854d9b056c817e0bab329daa31042..b70c0a8eeaa538c3ca1026afe1753e756d6257dd 100755 (executable)
--- a/cmd/mux-cmd.py
+++ b/cmd/mux-cmd.py
@@ -3,8 +3,14 @@ import os, sys, subprocess, struct
 from bup import options
 from bup.helpers import *
 
+# Give the subcommand exclusive access to stdin.
+orig_stdin = os.dup(0)
+devnull = os.open('/dev/null', os.O_RDONLY)
+os.dup2(devnull, 0)
+os.close(devnull)
+
 optspec = """
-bup mux command [command arguments...]
+bup mux command [arguments...]
 --
 """
 o = options.Options(optspec)
@@ -12,9 +18,7 @@ o = options.Options(optspec)
 if len(extra) < 1:
     o.fatal('command is required')
 
-cmdpath, cmdfn = os.path.split(__file__)
 subcmd = extra
-subcmd[0] = os.path.join(cmdpath, 'bup-' + subcmd[0])
 
 debug2('bup mux: starting %r\n' % (extra,))
 
@@ -23,7 +27,9 @@ errr, errw = os.pipe()
 def close_fds():
     os.close(outr)
     os.close(errr)
-p = subprocess.Popen(subcmd, stdout=outw, stderr=errw, preexec_fn=close_fds)
+
+p = subprocess.Popen(subcmd, stdin=orig_stdin, stdout=outw, stderr=errw,
+                     preexec_fn=close_fds)
 os.close(outw)
 os.close(errw)
 sys.stdout.write('BUPMUX')