#include <iostream>
-#include "os_path.hpp"
+#include "os_string.hpp"
#include "os_process.hpp"
+#include "trace_resource.hpp"
#include "trace_tools.hpp"
#endif
-os::Path
-findFile(const char *relPath,
- const char *absPath,
- bool verbose)
-{
- os::Path complete;
-
- /* First look in the same directory from which this process is
- * running, (to support developers running a compiled program that
- * has not been installed. */
- os::Path process_dir = os::getProcessName();
-
- process_dir.trimFilename();
-
- complete = process_dir;
- complete.join(relPath);
-
- if (complete.exists())
- return complete;
-
- /* Second, look in the directory for installed wrappers. */
- complete = absPath;
- if (complete.exists())
- return complete;
-
- if (verbose) {
- std::cerr << "error: cannot find " << relPath << " or " << absPath << "\n";
- }
-
- return "";
-}
-
-
int
traceProgram(API api,
char * const *argv,
return 1;
}
- os::Path wrapper;
+ os::String wrapper;
wrapper = findFile(relPath, absPath, verbose);
if (!wrapper.length()) {
}
/* FIXME: Don't modify the current environment */
- setenv(TRACE_VARIABLE, wrapper.str(), 1);
+ os::setEnvironment(TRACE_VARIABLE, wrapper.str());
if (output) {
- setenv("TRACE_FILE", output, 1);
+ os::setEnvironment("TRACE_FILE", output);
}
if (verbose) {
int status = os::execute(argv);
- unsetenv(TRACE_VARIABLE);
+ os::unsetEnvironment(TRACE_VARIABLE);
if (output) {
- unsetenv("TRACE_FILE");
+ os::unsetEnvironment("TRACE_FILE");
}
return status;