summaryrefslogtreecommitdiffstats
path: root/stap-client
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2010-01-15 03:06:52 -0500
committerFrank Ch. Eigler <fche@elastic.org>2010-01-15 03:44:54 -0500
commitcf4a6df840531c1b30f8cfa7d10981d071911b98 (patch)
tree5b03e917ee3d639acf15c3bdd5b87d34be0fa323 /stap-client
parent9e6bf24eef9d73afbccf9d46fa85a27587d6443b (diff)
downloadsystemtap-steved-cf4a6df840531c1b30f8cfa7d10981d071911b98.tar.gz
systemtap-steved-cf4a6df840531c1b30f8cfa7d10981d071911b98.tar.xz
systemtap-steved-cf4a6df840531c1b30f8cfa7d10981d071911b98.zip
PR11105: robustify stap-server
* main.cxx (main): Always downgrade client-provided -p5 to -p4. * stap-client (unpack_response): Sanitize stdout due to same. * stap-server-connect.c: Eliminate a bunch of globals. (handle_connection): Make things locals instead. Base tmp files on $TMPDIR. (spawn_and_wait): New helper function. (handleRequest): New monster function to inline rest of old stap-server-request.
Diffstat (limited to 'stap-client')
-rwxr-xr-xstap-client5
1 files changed, 5 insertions, 0 deletions
diff --git a/stap-client b/stap-client
index fc3d9908..f8be3838 100755
--- a/stap-client
+++ b/stap-client
@@ -544,6 +544,11 @@ function unpack_response {
# Remove the output line due to the synthetic server-side -k
sed -i "/^Keeping temporary directory.*/ d" $tmpdir_server/stderr
fi
+
+ if test $p_phase = 5; then
+ # Remove the output line due to the synthetic server-side -p4
+ sed -i "/^.*\.ko$/ d" $tmpdir_server/stdout
+ fi
}
# function: find_and_connect_to_server