One less recursion and other minor fixes in rcons

Author: trufae

libr/cons/grep.c

@@ -11,15 +11,20 @@
 #define I(x) r_cons_singleton ()->x
 
 static char *strchr_ns(char *s, const char ch) {
-	char *p = strchr (s, ch);
-	if (p && p > s) {
-		char *prev = p - 1;
-		if (*prev == '\\') {
-			memmove (prev, p, strlen (p) + 1);
-			return strchr_ns (p, ch);
+	if (!s) {
+		return NULL;
+	}
+
+	char *p;
+	while ((p = strchr (s, ch)) != NULL) {
+		if (p > s && *(p - 1) == '\\') {
+			memmove (p - 1, p, strlen (p) + 1);
+			s = p;
+		} else {
+			return p;
 		}
 	}
-	return p;
+	return NULL;
 }
 
 static void r_cons_grep_word_free(RConsGrepWord *gw) {
@@ -369,8 +374,9 @@ R_API void r_cons_grep_expression(const char *str) {
 			if (!grep->str) {
 				grep->str = (char *)strdup (ptr);
 			} else {
-				grep->str = r_str_append (grep->str, ",");
-				grep->str = r_str_append (grep->str, ptr);
+				char *s = r_str_newf (",%s", ptr);
+				grep->str = r_str_append (grep->str, s);
+				free (s);
 			}
 			do {
 				optr = ptr;
@@ -483,7 +489,14 @@ static int cmp(const void *a, const void *b) {
 	const char *ca = r_str_trim_head_ro (a);
 	const char *cb = r_str_trim_head_ro (b);
 	if (!a || !b) {
-		return (int) (size_t) ((char *) a - (char *) b);
+		ptrdiff_t diff = (char*)a - (char*)b;
+		if (diff > INT_MAX) {
+			return INT_MAX;
+		}
+		if (diff < INT_MIN) {
+			return INT_MIN;
+		}
+		return (int)diff;
 	}
 	RConsContext *ctx = r_cons_context ();
 	if (ctx->sorted_column > 0) {
@@ -730,6 +743,9 @@ R_API void r_cons_grepbuf(void) {
 		char *sbuf = r_str_ndup (cons->context->buffer, cons->context->buffer_len);
 		if (sbuf) {
 			char *res = r_str_tokenize_json (sbuf);
+			if (!res) {
+				return;
+			}
 			char *nres = r_print_json_indent (res, I(context->color_mode), "  ", NULL);
 			free (res);
 			res = r_str_newf ("%s\n", nres);