*********************************************************************/
#include <string.h>
+#include <getopt.h>
+
#include <iostream>
#include "cli.hpp"
-#include "os_path.hpp"
-#include "trace_tools.hpp"
+#include "os_string.hpp"
+#include "os_process.hpp"
+#include "cli_resources.hpp"
static const char *synopsis = "Identify differences between two state dumps.";
" Both input files should be the result of running 'glretrace -D XYZ <trace>'.\n";
}
+const static char *
+shortOptions = "h";
+
+const static struct option
+longOptions[] = {
+ {"help", no_argument, 0, 'h'},
+ {0, 0, 0, 0}
+};
+
static int
command(int argc, char *argv[])
{
- int i;
-
- for (i = 0; i < argc; ++i) {
- const char *arg = argv[i];
-
- if (arg[0] != '-') {
- break;
- }
-
- if (!strcmp(arg, "--")) {
- i++;
- break;
- } else if (!strcmp(arg, "--help")) {
+ int opt;
+ while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) {
+ switch (opt) {
+ case 'h':
usage();
return 0;
- } else {
- std::cerr << "error: unknown option " << arg << "\n";
+ default:
+ std::cerr << "error: unexpected option `" << (char)opt << "`\n";
usage();
return 1;
}
}
- if (argc - i != 2) {
+ if (argc != optind + 2) {
std::cerr << "Error: diff-state requires exactly two state-dump files as arguments.\n";
usage();
return 1;
char *file1, *file2;
- file1 = argv[i];
- file2 = argv[i+1];
-
-#define CLI_DIFF_STATE_COMMAND "jsondiff.py"
-
- os::Path command = trace::findFile("scripts/" CLI_DIFF_STATE_COMMAND,
- APITRACE_SCRIPTS_INSTALL_DIR "/" CLI_DIFF_STATE_COMMAND,
- true);
-
- char* args[4];
+ file1 = argv[optind];
+ file2 = argv[optind + 1];
- args[0] = (char *) command.str();
- args[1] = file1;
- args[2] = file2;
- args[3] = NULL;
+ os::String command = findScript("jsondiff.py");
-#ifdef _WIN32
- std::cerr << "The 'apitrace diff-state' command is not yet supported on this O/S.\n";
-#else
- execv(command.str(), args);
-#endif
+ char *args[5];
- std::cerr << "Error: Failed to execute " << argv[0] << "\n";
+ args[0] = const_cast<char *>("python");
+ args[1] = const_cast<char *>(command.str());
+ args[2] = file1;
+ args[3] = file2;
+ args[4] = NULL;
- return 1;
+ return os::execute(args);
}
const Command diff_state_command = {