Fix #17194 - Fix 'e scr.pager=..' to set the internal pager ##cons

radareorg · May 30, 2023 · eef7e3e · eef7e3e
1 parent bb644b3
commit eef7e3e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libr/config/config.c b/libr/config/config.c
@@ -637,7 +637,7 @@ static void eval_config_string(RConfig *cfg, char *name) {
  (void) r_config_set (cfg, name, eq);
  }
  } else {
- if (r_str_endswith (name, ".")) {
+ if (r_str_endswith (name, ".") && !r_str_endswith (name, "..")) {
  r_config_list (cfg, name, 0);
  } else {
  const char *v = r_config_get (cfg, name);

diff --git a/libr/core/cconfig.c b/libr/core/cconfig.c
@@ -2405,7 +2405,7 @@ static bool cb_pager(void *user, void *data) {
  RCore *core = (RCore *) user;
  RConfigNode *node = (RConfigNode *) data;
  if (*node->value == '?') {
- eprintf ("scr.pager must be '..' for internal less, or the path to a program in $PATH\n");
+ R_LOG_INFO ("scr.pager must be '..' for internal less, or the path to a program in $PATH");
  return false;
  }
  /* Let cons know we have a new pager. */

diff --git a/libr/core/cmd_eval.c b/libr/core/cmd_eval.c
@@ -766,7 +766,7 @@ static int cmd_eval(void *data, const char *input) {
  break;
  case '.': // "e "
  case ' ': // "e "
- if (r_str_endswith (input, ".")) {
+ if (r_str_endswith (input, ".") && !r_str_endswith (input, "..")) {
  r_config_list (core->config, input + 1, 0);
  } else {
  // XXX we cant do "e cmd.gprompt=dr=", because the '=' is a token, and quotes dont affect him