Bypass Python 3 glibc argv problems by routing args through env

[bup.git] / lib / cmd / server-cmd.py

diff --git a/lib/cmd/server-cmd.py b/lib/cmd/server-cmd.py
index 2c8cc051a9febdf583e967e5ee378e5176a9baea..5b918140af4d98337d316865388a8e095e5a439b 100755 (executable)
--- a/lib/cmd/server-cmd.py
+++ b/lib/cmd/server-cmd.py
@@ -1,7 +1,16 @@
 #!/bin/sh
 """": # -*-python-*-
+# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
+export "BUP_ARGV_0"="$0"
+arg_i=1
+for arg in "$@"; do
+    export "BUP_ARGV_${arg_i}"="$arg"
+    shift
+    arg_i=$((arg_i + 1))
+done
+# Here to end of preamble replaced during install
 bup_python="$(dirname "$0")/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+exec "$bup_python" "$0"
 """
 # end of bup preamble
 
@@ -9,7 +18,7 @@ from __future__ import absolute_import
 from binascii import hexlify, unhexlify
 import os, sys, struct, subprocess
 
-from bup import options, git, vfs, vint
+from bup import compat, options, git, vfs, vint
 from bup.compat import environ, hexstr
 from bup.git import MissingObject
 from bup.helpers import (Conn, debug1, debug2, linereader, lines_until_sentinel,
@@ -265,7 +274,7 @@ optspec = """
 bup server
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+(opt, flags, extra) = o.parse(compat.argv[1:])
 
 if extra:
     o.fatal('no arguments expected')