Make RCons.is_interactive() into the RConsContext and improve loading projects in tasks ##cons (#13132)

binr/rabin2/rabin2.c

@@ -1060,7 +1060,7 @@ int main(int argc, char **argv) {
 	bin->cb_printf = r_cons_printf;
 	filter.offset = at;
 	filter.name = name;
-	r_cons_new ()->is_interactive = false;
+	r_cons_new ()->context->is_interactive = false;
 
 	if (isradjson) {
 		r_cons_print ("{");

binr/radare2/radare2.c

@@ -391,7 +391,7 @@ static bool mustSaveHistory(RConfig *c) {
 	if (!r_config_get_i (c, "scr.histsave")) {
 		return false;
 	}
-	if (!r_config_get_i (c, "scr.interactive")) {
+	if (!r_cons_is_interactive ()) {
 		return false;
 	}
 	return true;
@@ -1369,7 +1369,7 @@ int main(int argc, char **argv, char **envp) {
 			snprintf (f, sizeof (f), "%s.r2", pfile);
 			if (r_file_exists (f)) {
 				// TODO: should 'q' unset the interactive bit?
-				bool isInteractive = r_config_get_i (r.config, "scr.interactive");
+				bool isInteractive = r_cons_is_interactive ();
 				if (isInteractive && r_cons_yesno ('n', "Do you want to run the '%s' script? (y/N) ", f)) {
 					r_core_cmd_file (&r, f);
 				}
@@ -1500,7 +1500,7 @@ int main(int argc, char **argv, char **envp) {
 #endif
 			ret = r.num->value;
 			debug = r_config_get_i (r.config, "cfg.debug");
-			if (ret != -1 && r_config_get_i (r.config, "scr.interactive")) {
+			if (ret != -1 && r_cons_is_interactive ()) {
 				char *question;
 				bool no_question_debug = ret & 1;
 				bool no_question_save = (ret & 2) >> 1;

libr/cons/cons.c

@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2008-2018 - pancake, Jody Frankowski */
+/* radare2 - LGPL - Copyright 2008-2019 - pancake, Jody Frankowski */
 
 #include <r_cons.h>
 #include <r_util.h>
@@ -106,6 +106,7 @@ static void cons_context_init(RConsContext *context, R_NULLABLE RConsContext *pa
 	context->buffer_sz = 0;
 	context->lastEnabled = true;
 	context->buffer_len = 0;
+	context->is_interactive = false;
 	context->cons_stack = r_stack_newf (6, cons_stack_free);
 	context->break_stack = r_stack_newf (6, break_stack_free);
 	context->event_interrupt = NULL;
@@ -335,6 +336,10 @@ R_API void r_cons_break_pop() {
 	r_cons_context_break_pop (I.context, true);
 }
 
+R_API bool r_cons_is_interactive() {
+	return I.context->is_interactive;
+}
+
 R_API bool r_cons_is_breaked() {
 	if (I.cb_break) {
 		I.cb_break (I.user);
@@ -449,7 +454,6 @@ R_API RCons *r_cons_new() {
 	I.force_columns = 0;
 	I.event_resize = NULL;
 	I.event_data = NULL;
-	I.is_interactive = true;
 	I.noflush = false;
 	I.linesleep = 0;
 	I.fdin = stdin;
@@ -793,7 +797,7 @@ R_API void r_cons_flush(void) {
 		CTX (lastMode) = false;
 	}
 	r_cons_filter ();
-	if (I.is_interactive && I.fdout == 1) {
+	if (r_cons_is_interactive () && I.fdout == 1) {
 		/* Use a pager if the output doesn't fit on the terminal window. */
 		if (CTX (pageable) && CTX (buffer) && I.pager && *I.pager && CTX (buffer_len) > 0 && r_str_char_count (CTX (buffer), '\n') >= I.rows) {
 			I.context->buffer[I.context->buffer_len - 1] = 0;
@@ -846,7 +850,7 @@ R_API void r_cons_flush(void) {
 	r_cons_highlight (I.highlight);
 
 	// is_html must be a filter, not a write endpoint
-	if (I.is_interactive && !r_sandbox_enable (false)) {
+	if (r_cons_is_interactive () && !r_sandbox_enable (false)) {
 		if (I.linesleep > 0 && I.linesleep < 1000) {
 			int i = 0;
 			int pagesize = R_MAX (1, I.pagesize);
@@ -1365,15 +1369,16 @@ R_API void r_cons_column(int c) {
 	free (b);
 }
 
-static int lasti = 0; /* last interactive mode */
+//  XXX deprecate must be push/pop context state
+static bool lasti = false; /* last interactive mode */
 
 R_API void r_cons_set_interactive(bool x) {
-	lasti = r_cons_singleton ()->is_interactive;
-	r_cons_singleton ()->is_interactive = x;
+	lasti = r_cons_singleton ()->context->is_interactive;
+	r_cons_singleton ()->context->is_interactive = x;
 }
 
 R_API void r_cons_set_last_interactive() {
-	r_cons_singleton ()->is_interactive = lasti;
+	r_cons_singleton ()->context->is_interactive = lasti;
 }
 
 R_API void r_cons_set_title(const char *str) {

libr/cons/input.c

@@ -549,6 +549,10 @@ R_API bool r_cons_yesno(int def, const char *fmt, ...) {
 	va_list ap;
 	ut8 key = (ut8)def;
 	va_start (ap, fmt);
+
+	if (!r_cons_is_interactive ()) {
+		return def == 'y';
+	}
 	vfprintf (stderr, fmt, ap);
 	va_end (ap);
 	fflush (stderr);

libr/core/cconfig.c

@@ -1958,7 +1958,7 @@ static int cb_scrint(void *user, void *data) {
 	if (node->i_value && r_sandbox_enable (0)) {
 		return false;
 	}
-	r_cons_singleton ()->is_interactive = node->i_value;
+	r_cons_singleton ()->context->is_interactive = node->i_value;
 	return true;
 }
 

libr/core/cmd.c

@@ -1090,7 +1090,7 @@ static int cmd_kuery(void *data, const char *input) {
 		if (core->http_up) {
 			return false;
 		}
-		if (!r_config_get_i (core->config, "scr.interactive")) {
+		if (!r_cons_is_interactive ()) {
 			return false;
 		}
 		if (input[1] == ' ') {
@@ -1374,7 +1374,7 @@ static int cmd_visual(void *data, const char *input) {
 	if (core->http_up) {
 		return false;
 	}
-	if (!r_config_get_i (core->config, "scr.interactive")) {
+	if (!r_cons_is_interactive ()) {
 		return false;
 	}
 #if 0
@@ -1398,7 +1398,7 @@ static int cmd_pipein(void *user, const char *input) {
 	return 0;
 }
 
-static int cmd_thread(void *data, const char *input) {
+static int cmd_tasks(void *data, const char *input) {
 	RCore *core = (RCore*) data;
 	switch (input[0]) {
 	case '\0': // "&"
@@ -1828,7 +1828,7 @@ R_API int r_core_cmd_pipe(RCore *core, char *radare_cmd, char *shell_cmd) {
 		eprintf ("Pipes are not allowed in sandbox mode\n");
 		return -1;
 	}
-	si = r_config_get_i (core->config, "scr.interactive");
+	si = r_cons_is_interactive ();
 	r_config_set_i (core->config, "scr.interactive", 0);
 	if (!r_config_get_i (core->config, "scr.color.pipe")) {
 		pipecolor = r_config_get_i (core->config, "scr.color");
@@ -1992,7 +1992,7 @@ static int r_core_cmd_subst(RCore *core, char *cmd) {
 		goto beach;
 	} else {
 		if (rep > INTERACTIVE_MAX_REP) {
-			if (r_config_get_i (core->config, "scr.interactive")) {
+			if (r_cons_is_interactive ()) {
 				if (!r_cons_yesno ('n', "Are you sure to repeat this %"PFMT64d" times? (y/N)", rep)) {
 					goto beach;
 				}
@@ -4115,7 +4115,7 @@ R_API void r_core_cmd_init(RCore *core) {
 		{"#",        "calculate hash", cmd_hash},
 		{"$",        "alias", cmd_alias},
 		{"%",        "short version of 'env' command", cmd_env},
-		{"&",        "threading capabilities", cmd_thread},
+		{"&",        "tasks", cmd_tasks},
 		{"(",        "macro", cmd_macro, cmd_macro_init},
 		{"*",        "pointer read/write", cmd_pointer},
 		{"-",        "open cfg.editor and run script", cmd_stdin},

libr/core/cmd_anal.c

@@ -1718,7 +1718,7 @@ static int bb_cmp(const void *a, const void *b) {
 	return ba->addr - bb->addr;
 }
 
-static int anal_fcn_list_bb(RCore *core, const char *input, bool one) {
+static bool anal_fcn_list_bb(RCore *core, const char *input, bool one) {
 	RDebugTracepoint *tp = NULL;
 	RListIter *iter;
 	RAnalBlock *b;
@@ -1750,7 +1750,7 @@ static int anal_fcn_list_bb(RCore *core, const char *input, bool one) {
 	if (mode == 'j') {
 		pj = pj_new ();
 		if (!pj) {
-			return NULL;
+			return false;
 		}
 		pj_a (pj);
 	}
@@ -3826,7 +3826,6 @@ static void cmd_address_info(RCore *core, const char *addrstr, int fmt) {
 		addr = r_num_math (core->num, addrstr);
 	}
 	type = r_core_anal_address (core, addr);
-	int isp = 0;
 	switch (fmt) {
 	case 'j': {
 		PJ *pj = pj_new ();
@@ -6771,7 +6770,7 @@ static void cmd_agraph_print(RCore *core, const char *input) {
 			core->graph->force_update_seek = true;
 			core->graph->need_set_layout = true;
 			core->graph->layout = r_config_get_i (core->config, "graph.layout");
-			int ov = r_config_get_i (core->config, "scr.interactive");
+			int ov = r_cons_is_interactive ();
 			core->graph->need_update_dim = true;
 			r_core_visual_graph (core, core->graph, NULL, true);
 			r_config_set_i (core->config, "scr.interactive", ov);
@@ -7719,7 +7718,7 @@ static int cmd_anal_all(RCore *core, const char *input) {
 			char *dh_orig = NULL;
 			if (!strncmp (input, "aaaaa", 5)) {
 				eprintf ("An r2 developer is coming to your place to manually analyze this program. Please wait for it\n");
-				if (r_config_get_i (core->config, "scr.interactive")) {
+				if (r_cons_is_interactive ()) {
 					r_cons_any_key (NULL);
 				}
 				goto jacuzzi;

libr/core/cmd_debug.c

@@ -3892,7 +3892,7 @@ static bool cmd_dcu (RCore *core, const char *input) {
 			from = r_num_math (core->num, input + 3);
 		}
 	}
-	if (core->num->nc.errors && r_cons_singleton ()->is_interactive) {
+	if (core->num->nc.errors && r_cons_is_interactive ()) {
 		eprintf ("Cannot continue until unknown address '%s'\n", core->num->nc.calc_buf);
 		return false;
 	}

libr/core/cmd_eval.c

@@ -514,7 +514,7 @@ static int cmd_eval(void *data, const char *input) {
 			free (file);
 		} else {
 			char *file = r_str_home (".radare2rc");
-			if (r_config_get_i (core->config, "scr.interactive")) {
+			if (r_cons_is_interactive ()) {
 				r_file_touch (file);
 				char * res = r_cons_editor (file, NULL);
 				if (res) {

libr/core/cmd_hash.c

@@ -541,7 +541,7 @@ static int cmd_hash_bang (RCore *core, const char *input) {
 				r_lang_run_file (core->lang, p);
 			}
 		} else {
-			if (r_config_get_i (core->config, "scr.interactive")) {
+			if (r_cons_is_interactive ()) {
 				r_lang_prompt (core->lang);
 			} else {
 				eprintf ("Error: scr.interactive required to run the rlang prompt\n");

libr/core/cmd_help.c

@@ -973,7 +973,7 @@ static int cmd_help(void *data, const char *input) {
 		break;
 	case 'i': // "?i" input num
 		r_cons_set_raw(0);
-		if (!r_config_get_i (core->config, "scr.interactive")) {
+		if (!r_cons_is_interactive ()) {
 			eprintf ("Not running in interactive mode\n");
 		} else {
 			switch (input[1]) {

libr/core/cmd_info.c

@@ -309,7 +309,7 @@ static void playMsg(RCore *core, const char *n, int len) {
 
 static int cmd_info(void *data, const char *input) {
 	RCore *core = (RCore *) data;
-	bool newline = r_config_get_i (core->config, "scr.interactive");
+	bool newline = r_cons_is_interactive ();
 	int fd = r_io_fd_get_current (core->io);
 	RIODesc *desc = r_io_desc_get (core->io, fd);
 	int i, va = core->io->va || core->io->debug;

libr/core/cmd_log.c

@@ -245,7 +245,7 @@ static int cmd_log(void *data, const char *input) {
 		r_core_cmd_help (core, help_msg_T);
 		break;
 	case 'T': // "TT" Ts ? as ms?
-		if (r_config_get_i (core->config, "scr.interactive")) {
+		if (r_cons_is_interactive ()) {
 			textlog_chat (core);
 		} else {
 			eprintf ("Only available when the screen is interactive\n");

libr/core/cmd_project.c

@@ -73,7 +73,7 @@ static int cmd_project(void *data, const char *input) {
 	case 'o':
 		//	if (r_file_is_regular (file))
 		if (input[1] == '&') {
-			r_core_project_open (core, file, true);
+			r_core_cmdf (core, "& Po %s", file);
 		} else if (input[1]) {
 			r_core_project_open (core, file, false);
 		} else {

libr/core/cmd_seek.c

@@ -417,7 +417,7 @@ static int cmd_seek(void *data, const char *input) {
 	{
 		ut64 addr = r_num_math (core->num, input + 1);
 		if (core->num->nc.errors) {
-			if (r_cons_singleton ()->is_interactive) {
+			if (r_cons_singleton ()->context->is_interactive) {
 				eprintf ("Cannot seek to unknown address '%s'\n", core->num->nc.calc_buf);
 			}
 			break;

libr/core/core.c

@@ -3135,7 +3135,7 @@ R_API int r_core_search_cb(RCore *core, ut64 from, ut64 to, RCoreSearchCallback
 }
 
 R_API char *r_core_editor (const RCore *core, const char *file, const char *str) {
-	const bool interactive = r_config_get_i (core->config, "scr.interactive");
+	const bool interactive = r_cons_is_interactive ();
 	const char *editor = r_config_get (core->config, "cfg.editor");
 	char *name = NULL, *ret = NULL;
 	int len, fd;

libr/core/disasm.c

@@ -589,7 +589,7 @@ static RDisasmState * ds_init(RCore *core) {
 		ds->atabs = 0;
 	}
 	ds->filter = r_config_get_i (core->config, "asm.filter");
-	ds->interactive = r_config_get_i (core->config, "scr.interactive");
+	ds->interactive = r_cons_is_interactive ();
 	ds->jmpsub = r_config_get_i (core->config, "asm.jmpsub");
 	ds->varsub = r_config_get_i (core->config, "asm.var.sub");
 	core->parser->relsub = r_config_get_i (core->config, "asm.relsub");

libr/core/graph.c

@@ -3889,7 +3889,7 @@ static void rotateColor(RCore *core) {
 
 R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int is_interactive) {
 	int o_asmqjmps_letter = core->is_asmqjmps_letter;
-	int o_scrinteractive = r_config_get_i (core->config, "scr.interactive");
+	int o_scrinteractive = r_cons_is_interactive ();
 	int o_vmode = core->vmode;
 	int exit_graph = false, is_error = false;
 	struct agraph_refresh_data *grd;

libr/core/project.c

@@ -360,7 +360,7 @@ R_API RThread *r_core_project_load_bg(RCore *core, const char *prjName, const ch
 /*** ^^^ thready ***/
 
 R_API bool r_core_project_open(RCore *core, const char *prjfile, bool thready) {
-	int askuser = 1;
+	bool askuser = true;
 	int ret, close_current_session = 1;
 	char *oldbin;
 	const char *newbin;
@@ -368,6 +368,10 @@ R_API bool r_core_project_open(RCore *core, const char *prjfile, bool thready) {
 	if (!prjfile || !*prjfile) {
 		return false;
 	}
+	if (thready) {
+		eprintf ("Loading projects in a thread has been deprecated. Use tasks\n");
+		return false;
+	}
 	char *prj = projectScriptPath (core, prjfile);
 	if (!prj) {
 		eprintf ("Invalid project name '%s'\n", prjfile);
@@ -403,7 +407,7 @@ R_API bool r_core_project_open(RCore *core, const char *prjfile, bool thready) {
 	oldbin = strdup (file_path);
 	if (!strcmp (prjfile, r_config_get (core->config, "prj.name"))) {
 		// eprintf ("Reloading project\n");
-		askuser = 0;
+		askuser = false;
 #if 0
 		free (prj);
 		free (filepath);
@@ -411,7 +415,7 @@ R_API bool r_core_project_open(RCore *core, const char *prjfile, bool thready) {
 #endif
 	}
 	if (askuser) {
-		if (r_config_get_i (core->config, "scr.interactive")) {
+		if (r_cons_is_interactive ()) {
 			close_current_session = r_cons_yesno ('y', "Close current session? (Y/n)");
 		}
 	}
@@ -554,7 +558,7 @@ static bool simpleProjectSaveScript(RCore *core, const char *file, int opts) {
 
 	fdold = r_cons_singleton ()->fdout;
 	r_cons_singleton ()->fdout = fd;
-	r_cons_singleton ()->is_interactive = false;
+	r_cons_singleton ()->context->is_interactive = false; // NOES must use api
 
 	r_str_write (fd, "# r2 rdb project file\n");
 
@@ -591,7 +595,7 @@ static bool simpleProjectSaveScript(RCore *core, const char *file, int opts) {
 	}
 
 	r_cons_singleton ()->fdout = fdold;
-	r_cons_singleton ()->is_interactive = true;
+	r_cons_singleton ()->context->is_interactive = true;
 
 	if (ohl) {
 		r_cons_highlight (ohl);
@@ -627,7 +631,7 @@ static bool projectSaveScript(RCore *core, const char *file, int opts) {
 
 	fdold = r_cons_singleton ()->fdout;
 	r_cons_singleton ()->fdout = fd;
-	r_cons_singleton ()->is_interactive = false;
+	r_cons_singleton ()->context->is_interactive = false;
 
 	r_str_write (fd, "# r2 rdb project file\n");
 
@@ -700,7 +704,7 @@ static bool projectSaveScript(RCore *core, const char *file, int opts) {
 	}
 
 	r_cons_singleton ()->fdout = fdold;
-	r_cons_singleton ()->is_interactive = true;
+	r_cons_singleton ()->context->is_interactive = true;
 
 	if (ohl) {
 		r_cons_highlight (ohl);
@@ -876,7 +880,7 @@ R_API char *r_core_project_notes_file(RCore *core, const char *prjName) {
 
 R_API bool r_core_project_load(RCore *core, const char *prjName, const char *rcpath) {
 	const bool cfg_fortunes = r_config_get_i (core->config, "cfg.fortunes");
-	const bool scr_interactive = r_config_get_i (core->config, "scr.interactive");
+	const bool scr_interactive = r_cons_is_interactive ();
 	const bool scr_prompt = r_config_get_i (core->config, "scr.prompt");
 	(void) projectLoadRop (core, prjName);
 	bool ret = r_core_cmd_file (core, rcpath);

libr/core/task.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2014-2018 - pancake, thestr4ng3r */
+/* radare - LGPL - Copyright 2014-2019 - pancake, thestr4ng3r */
 
 #include <r_core.h>
 
@@ -38,6 +38,7 @@ typedef struct oneshot_t {
 R_API void r_core_task_print (RCore *core, RCoreTask *task, int mode) {
 	switch (mode) {
 	case 'j':
+		{
 		r_cons_printf ("{\"id\":%d,\"state\":\"", task->id);
 		switch (task->state) {
 		case R_CORE_TASK_STATE_BEFORE_START:
@@ -59,6 +60,7 @@ R_API void r_core_task_print (RCore *core, RCoreTask *task, int mode) {
 		} else {
 			r_cons_printf ("null}");
 		}
+		}
 		break;
 	default: {
 		const char *info = task->cmd;
@@ -70,9 +72,9 @@ R_API void r_core_task_print (RCore *core, RCoreTask *task, int mode) {
 					   task->transient ? "(t)" : "",
 					   r_core_task_status (task),
 					   info ? info : "");
+		}
 		break;
 	}
-	}
 }
 
 R_API void r_core_task_list(RCore *core, int mode) {
@@ -330,7 +332,7 @@ static void task_wakeup(RCoreTask *current) {
 
 	tasks_lock_leave (core, &old_sigset);
 
-	if(!single) {
+	if (!single) {
 		r_th_cond_wait (current->dispatch_cond, current->dispatch_lock);
 	}
 

libr/core/visual.c

@@ -1945,7 +1945,7 @@ R_API void r_core_visual_browse(RCore *core, const char *input) {
 			if (r_sandbox_enable (0)) {
 				eprintf ("sandbox not enabled\n");
 			} else {
-				if (r_config_get_i (core->config, "scr.interactive")) {
+				if (r_cons_is_interactive ()) {
 					r_core_cmd0 (core, "TT");
 				}
 			}

libr/include/r_cons.h

@@ -409,6 +409,7 @@ typedef struct r_cons_context_t {
 	int lastLength;
 	bool lastMode;
 	bool lastEnabled;
+	bool is_interactive;
 	bool pageable;
 
 	RConsColorMode color;
@@ -420,7 +421,6 @@ typedef struct r_cons_t {
 	RConsContext *context;
 	char *lastline;
 	int is_html;
-	int is_interactive;
 	int lines;
 	int rows;
 	int echo; // dump to stdout in realtime
@@ -684,6 +684,7 @@ R_API char *r_cons_lastline_utf8_ansi_len(int *len);
 typedef void (*RConsBreak)(void *);
 R_API void r_cons_break_end(void);
 R_API bool r_cons_is_breaked(void);
+R_API bool r_cons_is_interactive(void);
 R_API void r_cons_break_timeout(int timeout);
 R_API void r_cons_breakword(const char *s);
 R_API void *r_cons_sleep_begin(void);