|
Lines 45-75
Link Here
|
| 45 |
|
45 |
|
| 46 |
whoseargs="client" |
46 |
whoseargs="client" |
| 47 |
while [ x"$1" != x ]; do |
47 |
while [ x"$1" != x ]; do |
|
|
48 |
arg=`echo "$1" | sed "/'/ { s/'/'\\\\''/} ; s/.*/'&'/"` |
| 48 |
case "$1" in |
49 |
case "$1" in |
| 49 |
/''*|\.*) if [ "$whoseargs" = "client" ]; then |
50 |
/''*|\.*) if [ "$whoseargs" = "client" ]; then |
| 50 |
if [ "x$clientargs" = x ]; then |
51 |
if [ "x$clientargs" = x ]; then |
| 51 |
clientargs="$1" |
52 |
clientargs="$arg" |
| 52 |
else |
53 |
else |
| 53 |
clientargs="$clientargs $1" |
54 |
clientargs="$clientargs $arg" |
| 54 |
fi |
55 |
fi |
| 55 |
else |
56 |
else |
| 56 |
if [ "x$serverargs" = x ]; then |
57 |
if [ "x$serverargs" = x ]; then |
| 57 |
serverargs="$1" |
58 |
serverargs="$arg" |
| 58 |
else |
59 |
else |
| 59 |
serverargs="$serverargs $1" |
60 |
serverargs="$serverargs $arg" |
| 60 |
fi |
61 |
fi |
| 61 |
fi ;; |
62 |
fi ;; |
| 62 |
--) whoseargs="server" ;; |
63 |
--) whoseargs="server" ;; |
| 63 |
*) if [ "$whoseargs" = "client" ]; then |
64 |
*) if [ "$whoseargs" = "client" ]; then |
| 64 |
if [ "x$clientargs" = x ]; then |
65 |
if [ "x$clientargs" = x ]; then |
| 65 |
clientargs="$defaultclientargs $1" |
66 |
clientargs="$defaultclientargs $arg" |
| 66 |
else |
67 |
else |
| 67 |
clientargs="$clientargs $1" |
68 |
clientargs="$clientargs $arg" |
| 68 |
fi |
69 |
fi |
| 69 |
else |
70 |
else |
| 70 |
case "$1" in |
71 |
case "$1" in |
| 71 |
:[0-9]*) display="$1"; serverargs="$serverargs $1";; |
72 |
:[0-9]*) display="$1"; serverargs="$serverargs $arg";; |
| 72 |
*) serverargs="$serverargs $1" ;; |
73 |
*) serverargs="$serverargs $arg" ;; |
| 73 |
esac |
74 |
esac |
| 74 |
fi ;; |
75 |
fi ;; |
| 75 |
esac |
76 |
esac |
|
Lines 147-153
Link Here
|
| 147 |
|
148 |
|
| 148 |
trap cleanup 0 |
149 |
trap cleanup 0 |
| 149 |
|
150 |
|
| 150 |
xinit $clientargs -- $serverargs -deferglyphs 16 & |
151 |
eval xinit $clientargs -- $serverargs -deferglyphs 16 & |
| 151 |
|
152 |
|
| 152 |
PID=$! |
153 |
PID=$! |
| 153 |
|
154 |
|
