From 46b6051129b59f27e1011555e8be082e17dec655 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Sat, 26 Aug 2017 03:49:54 +0200
Subject: [PATCH] Add quiet files list (oq, omq)

---
 libr/core/cmd_open.c | 20 ++++++++++++++++++--
 libr/core/visual.c   |  5 ++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/libr/core/cmd_open.c b/libr/core/cmd_open.c
index c888ce4b74..1cad8e91b7 100644
--- a/libr/core/cmd_open.c
+++ b/libr/core/cmd_open.c
@@ -10,8 +10,9 @@
 static const char *help_msg_o[] = {
 	"Usage: o","[com- ] [file] ([offset])","",
 	"o","","list opened files",
-	"o=","","list opened files (ascii-art bars)",
+	"oq","","list all open files",
 	"o*","","list opened files in r2 commands",
+	"o=","","list opened files (ascii-art bars)",
 	"oa","[?] [addr]","Open bin info from the given address",
 	"ob","[?] [lbdos] [...]","list open binary files backed by fd",
 	"oc"," [file]","open core file, like relaunching r2",
@@ -67,6 +68,7 @@ static const char *help_msg_oj[] = {
 static const char *help_msg_om[] = {
 	"Usage:", "om[-] [arg]", " # map opened files",
 	"om", "", "list all defined IO maps",
+	"omq", "", "list all maps and their fds",
 	"om*", "", "list all maps in r2 commands format",
 	"om=", "", "list all maps in ascii art",
 	"omj", "", "list all maps in json format",
@@ -368,11 +370,14 @@ static void map_list(RIO *io, int mode, RPrint *print, int fd) {
 		print->cb_printf ("[");
 	}
 	bool first = true;
-	ls_foreach_prev (io->maps, iter, map) {
+	ls_foreach (io->maps, iter, map) {
 		if (fd != -1 && map->fd != fd) {
 			continue;
 		}
 		switch (mode) {
+		case 'q':
+			print->cb_printf ("%d %d\n", map->fd, map->id);
+			break;
 		case 'j':
 			if (!first) {
 				print->cb_printf (",");
@@ -569,6 +574,7 @@ static void cmd_open_map (RCore *core, const char *input) {
 	case '\0': // "om"
 	case 'j': // "omj"
 	case '*': // "om*"
+	case 'q': // "omq"
 		map_list (core->io, input[1], core->print, -1);
 		break;
 	case '=': // "om="
@@ -701,6 +707,13 @@ static bool desc_list_visual_cb(void *user, void *data, ut32 id) {
 	return true;
 }
 
+static bool desc_list_quiet_cb(void *user, void *data, ut32 id) {
+	RPrint *p = (RPrint *)user;
+	RIODesc *desc = (RIODesc *)data;
+	p->cb_printf ("%d\n", desc->fd);
+	return true;
+}
+
 static bool desc_list_cb(void *user, void *data, ut32 id) {
 	RPrint *p = (RPrint *)user;
 	RIODesc *desc = (RIODesc *)data;
@@ -726,6 +739,9 @@ static int cmd_open(void *data, const char *input) {
 		r_id_storage_foreach (core->io->files, init_desc_list_visual_cb, core->print);
 		r_id_storage_foreach (core->io->files, desc_list_visual_cb, core->print);
 		break;
+	case 'q':
+		r_id_storage_foreach (core->io->files, desc_list_quiet_cb, core->print);
+		break;
 	case '\0':
 		r_id_storage_foreach (core->io->files, desc_list_cb, core->print);
 		break;
diff --git a/libr/core/visual.c b/libr/core/visual.c
index 0ce301fd85..95fbedbda7 100644
--- a/libr/core/visual.c
+++ b/libr/core/visual.c
@@ -1365,7 +1365,7 @@ R_API int r_core_visual_cmd(RCore *core, const char *arg) {
 	int i, ret, cols = core->print->cols, delta = 0;
 	int wheelspeed;
 	if ((ut8)ch == KEY_ALTQ) {
-		r_cons_readchar();
+		r_cons_readchar ();
 		ch = 'q';
 	}
 	ch = r_cons_arrow_to_hjkl (ch);
@@ -2804,6 +2804,9 @@ dodo:
 		}
 		if (!skip) {
 			ch = r_cons_readchar ();
+			if (r_cons_is_breaked()) {
+				break;
+			}
 			r_core_visual_show_char (core, ch);
 			if (ch == -1 || ch == 4) {
 				break;                  // error or eof