|
@@ -48,7 +48,8 @@ int check_pager_config(const char *cmd)
|
|
return c.val;
|
|
return c.val;
|
|
}
|
|
}
|
|
|
|
|
|
-static void commit_pager_choice(void) {
|
|
|
|
|
|
+static void commit_pager_choice(void)
|
|
|
|
+{
|
|
switch (use_pager) {
|
|
switch (use_pager) {
|
|
case 0:
|
|
case 0:
|
|
setenv("PERF_PAGER", "cat", 1);
|
|
setenv("PERF_PAGER", "cat", 1);
|
|
@@ -70,7 +71,7 @@ static void set_debugfs_path(void)
|
|
"tracing/events");
|
|
"tracing/events");
|
|
}
|
|
}
|
|
|
|
|
|
-static int handle_options(const char*** argv, int* argc, int* envchanged)
|
|
|
|
|
|
+static int handle_options(const char ***argv, int *argc, int *envchanged)
|
|
{
|
|
{
|
|
int handled = 0;
|
|
int handled = 0;
|
|
|
|
|
|
@@ -109,7 +110,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
|
|
*envchanged = 1;
|
|
*envchanged = 1;
|
|
} else if (!strcmp(cmd, "--perf-dir")) {
|
|
} else if (!strcmp(cmd, "--perf-dir")) {
|
|
if (*argc < 2) {
|
|
if (*argc < 2) {
|
|
- fprintf(stderr, "No directory given for --perf-dir.\n" );
|
|
|
|
|
|
+ fprintf(stderr, "No directory given for --perf-dir.\n");
|
|
usage(perf_usage_string);
|
|
usage(perf_usage_string);
|
|
}
|
|
}
|
|
setenv(PERF_DIR_ENVIRONMENT, (*argv)[1], 1);
|
|
setenv(PERF_DIR_ENVIRONMENT, (*argv)[1], 1);
|
|
@@ -124,7 +125,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
|
|
*envchanged = 1;
|
|
*envchanged = 1;
|
|
} else if (!strcmp(cmd, "--work-tree")) {
|
|
} else if (!strcmp(cmd, "--work-tree")) {
|
|
if (*argc < 2) {
|
|
if (*argc < 2) {
|
|
- fprintf(stderr, "No directory given for --work-tree.\n" );
|
|
|
|
|
|
+ fprintf(stderr, "No directory given for --work-tree.\n");
|
|
usage(perf_usage_string);
|
|
usage(perf_usage_string);
|
|
}
|
|
}
|
|
setenv(PERF_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
|
|
setenv(PERF_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
|
|
@@ -168,7 +169,7 @@ static int handle_alias(int *argcp, const char ***argv)
|
|
{
|
|
{
|
|
int envchanged = 0, ret = 0, saved_errno = errno;
|
|
int envchanged = 0, ret = 0, saved_errno = errno;
|
|
int count, option_count;
|
|
int count, option_count;
|
|
- const char** new_argv;
|
|
|
|
|
|
+ const char **new_argv;
|
|
const char *alias_command;
|
|
const char *alias_command;
|
|
char *alias_string;
|
|
char *alias_string;
|
|
|
|
|
|
@@ -210,11 +211,11 @@ static int handle_alias(int *argcp, const char ***argv)
|
|
if (!strcmp(alias_command, new_argv[0]))
|
|
if (!strcmp(alias_command, new_argv[0]))
|
|
die("recursive alias: %s", alias_command);
|
|
die("recursive alias: %s", alias_command);
|
|
|
|
|
|
- new_argv = realloc(new_argv, sizeof(char*) *
|
|
|
|
|
|
+ new_argv = realloc(new_argv, sizeof(char *) *
|
|
(count + *argcp + 1));
|
|
(count + *argcp + 1));
|
|
/* insert after command name */
|
|
/* insert after command name */
|
|
- memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
|
|
|
|
- new_argv[count+*argcp] = NULL;
|
|
|
|
|
|
+ memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
|
|
|
|
+ new_argv[count + *argcp] = NULL;
|
|
|
|
|
|
*argv = new_argv;
|
|
*argv = new_argv;
|
|
*argcp += count - 1;
|
|
*argcp += count - 1;
|
|
@@ -450,8 +451,8 @@ int main(int argc, const char **argv)
|
|
setup_path();
|
|
setup_path();
|
|
|
|
|
|
while (1) {
|
|
while (1) {
|
|
- static int done_help = 0;
|
|
|
|
- static int was_alias = 0;
|
|
|
|
|
|
+ static int done_help;
|
|
|
|
+ static int was_alias;
|
|
|
|
|
|
was_alias = run_argv(&argc, &argv);
|
|
was_alias = run_argv(&argc, &argv);
|
|
if (errno != ENOENT)
|
|
if (errno != ENOENT)
|