diff options
author | dsmith <dsmith> | 2007-07-26 20:27:17 +0000 |
---|---|---|
committer | dsmith <dsmith> | 2007-07-26 20:27:17 +0000 |
commit | fc52ef5baf3208370014471fc7608712e1e4cb18 (patch) | |
tree | 7a80665b8d49ca00bd416fba73b6e1adfff1bff4 /main.cxx | |
parent | 39dd928d212737c6b5c7e42ed71a0c699c0faf11 (diff) | |
download | systemtap-steved-fc52ef5baf3208370014471fc7608712e1e4cb18.tar.gz systemtap-steved-fc52ef5baf3208370014471fc7608712e1e4cb18.tar.xz systemtap-steved-fc52ef5baf3208370014471fc7608712e1e4cb18.zip |
2007-07-26 David Smith <dsmith@redhat.com>
PR 4295
* main.cxx (main): If '-m MODNAME' is used, the generated module
is saved in the current directory.
* stap.1.in: Updated '-m' description.
Diffstat (limited to 'main.cxx')
-rw-r--r-- | main.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -191,6 +191,7 @@ main (int argc, char * const argv []) string script_file; // FILE bool have_script = false; bool release_changed = false; + bool save_module = false; // Initialize defaults systemtap_session s; @@ -330,6 +331,7 @@ main (int argc, char * const argv []) case 'm': s.module_name = string (optarg); + save_module = true; { string::size_type len = s.module_name.length(); @@ -769,10 +771,25 @@ main (int argc, char * const argv []) cerr << "Pass 4: compilation failed. " << "Try again with more '-v' (verbose) options." << endl; - else if (s.use_cache) + else { // Update cache. - add_to_cache(s); + if (s.use_cache) + add_to_cache(s); + + // Copy module to the current directory. + if (save_module) + { + string module_src_path = s.tmpdir + "/" + s.module_name + ".ko"; + string module_dest_path = s.module_name + ".ko"; + + if (s.verbose > 1) + clog << "Copying " << module_src_path << " to " + << module_dest_path << endl; + if (copy_file(module_src_path.c_str(), module_dest_path.c_str()) != 0) + cerr << "Copy failed (\"" << module_src_path << "\" to \"" + << module_dest_path << "\"): " << strerror(errno) << endl; + } } if (rc || s.last_pass == 4) goto cleanup; |