Fixes for r2-indent

* Supports r2pm's uncrustify without having to r2pm -r
* Add r2-indent -a to run indent-whitelist.sh
* Add --fix option in whitelist script

Author: radare

doc/uncrustify.cfg

@@ -35,6 +35,7 @@ indent_with_tabs                = 1
 indent_cmt_with_tabs            = false
 indent_align_string             = false
 indent_xml_string               = 0
+indent_ternary_operator = 2
 indent_brace                    = 0
 indent_braces                   = false
 indent_braces_no_func           = false
@@ -246,13 +247,13 @@ sp_before_oc_block_caret        = ignore
 sp_after_oc_block_caret         = ignore
 sp_after_oc_msg_receiver        = ignore
 sp_after_oc_property            = ignore
-sp_cond_colon                   = ignore
-sp_cond_colon_before            = ignore
-sp_cond_colon_after             = ignore
-sp_cond_question                = ignore
-sp_cond_question_before         = ignore
-sp_cond_question_after          = ignore
-sp_cond_ternary_short           = ignore
+sp_cond_colon                   = remove
+sp_cond_colon_before            = remove
+sp_cond_colon_after             = force
+sp_cond_question                = force
+sp_cond_question_before         = remove
+sp_cond_question_after          = force
+sp_cond_ternary_short           = remove
 sp_case_label                   = remove
 sp_range                        = ignore
 sp_after_for_colon              = force

libr/util/mem.c

@@ -47,8 +47,8 @@ R_API int r_mem_cmp_mask(const ut8 *dest, const ut8 *orig, const ut8 *mask, int
 		return ret;
 	}
 	for (i = 0; i < len; i++) {
-		mdest[i] = dest[i]&mask[i];
-		morig[i] = orig[i]&mask[i];
+		mdest[i] = dest[i] & mask[i];
+		morig[i] = orig[i] & mask[i];
 	}
 	ret = memcmp (mdest, morig, len);
 	free (mdest);
@@ -58,7 +58,7 @@ R_API int r_mem_cmp_mask(const ut8 *dest, const ut8 *orig, const ut8 *mask, int
 
 R_API void r_mem_copybits(ut8 *dst, const ut8 *src, int bits) {
 	ut8 srcmask, dstmask;
-	int bytes = (int)(bits / 8);
+	int bytes = (int) (bits / 8);
 	bits = bits % 8;
 	memcpy (dst, src, bytes);
 	if (bits) {
@@ -81,40 +81,42 @@ R_API void r_mem_copybits_delta(ut8 *dst, int doff, const ut8 *src, int soff, in
 	int nbits = bits;
 #if 0
 	int dofb, sofb;
-	int bdoff = (doff/8);
-	int bsoff = (soff/8);
+	int bdoff = (doff / 8);
+	int bsoff = (soff / 8);
 	int nbits = 0;
 	ut8 mask;
-	int sdelta = soff-doff;
+	int sdelta = soff - doff;
 	/* apply delta offsets */
-	src = src+bsoff;
-	dst = dst+bdoff;
-	dofb=doff%8;
-	sofb=soff%8;
-	if (sofb||dofb) {
+	src = src + bsoff;
+	dst = dst + bdoff;
+	dofb = doff % 8;
+	sofb = soff % 8;
+	if (sofb || dofb) {
 		// TODO : this algorithm is not implemented
-		int mask = (1<<sofb);
-		int nmask = 0xff^mask;
-		int s = src[0]<<sofb;
-		int d = dst[0]<<dofb;
-		if (soff == doff && bits==1) {
-			mask = 0xff^(1<<dofb);
-			dst[0] = ((src[0]&mask) | (dst[0]&mask));
-		} else printf("TODO: Oops. not supported method of bitcopy\n");
+		int mask = (1 << sofb);
+		int nmask = 0xff ^ mask;
+		int s = src[0] << sofb;
+		int d = dst[0] << dofb;
+		if (soff == doff && bits == 1) {
+			mask = 0xff ^ (1 << dofb);
+			dst[0] = ((src[0] & mask) | (dst[0] & mask));
+		} else {
+			printf ("TODO: Oops. not supported method of bitcopy\n");
+		}
 /*
-	1) shift algin src i dst
-	2) copy (8-dofb) bits from dst to src
-	3) dst[0] = dst[0]&^(0x1<<nbits) | (src&(1<<nbits))
-*/
+        1) shift algin src i dst
+        2) copy (8-dofb) bits from dst to src
+        3) dst[0] = dst[0]&^(0x1<<nbits) | (src&(1<<nbits))
+ */
 		src++;
 		dst++;
 	}
 /*
-doff  v
-dst |__________|___________|
-soff     v
-src |__________|_________|
-*/
+   doff  v
+   dst |__________|___________|
+   soff     v
+   src |__________|_________|
+ */
 #endif
 	r_mem_copybits (dst, src, nbits);
 }
@@ -135,17 +137,17 @@ R_API ut64 r_mem_get_num(const ut8 *b, int size) {
 }
 
 // TODO: SEE: R_API ut64 r_reg_get_value(RReg *reg, RRegItem *item) { .. dupped code?
-R_API int r_mem_set_num (ut8 *dest, int dest_size, ut64 num) {
+R_API int r_mem_set_num(ut8 *dest, int dest_size, ut64 num) {
 	// LITTLE ENDIAN is the default for streams
 	switch (dest_size) {
 	case 1:
-		r_write_le8 (dest, (ut8)(num & UT8_MAX));
+		r_write_le8 (dest, (ut8) (num & UT8_MAX));
 		break;
 	case 2:
-		r_write_le16 (dest, (ut16)(num & UT16_MAX));
+		r_write_le16 (dest, (ut16) (num & UT16_MAX));
 		break;
 	case 4:
-		r_write_le32 (dest, (ut32)(num & UT32_MAX));
+		r_write_le32 (dest, (ut32) (num & UT32_MAX));
 		break;
 	case 8:
 		r_write_le64 (dest, num);
@@ -159,7 +161,7 @@ R_API int r_mem_set_num (ut8 *dest, int dest_size, ut64 num) {
 // The default endian is LE for streams.
 // This function either swaps or copies len bytes depending on bool big_endian
 // TODO: Remove completely
-R_API void r_mem_swaporcopy(ut8* dest, const ut8* src, int len, bool big_endian) {
+R_API void r_mem_swaporcopy(ut8 *dest, const ut8 *src, int len, bool big_endian) {
 	if (big_endian) {
 		r_mem_swapendian (dest, src, len);
 	} else {
@@ -211,15 +213,17 @@ R_API void r_mem_swapendian(ut8 *dest, const ut8 *orig, int size) {
 	}
 }
 
-//R_DOC r_mem_mem: Finds the needle of nlen size into the haystack of hlen size
-//R_UNIT printf("%s\n", r_mem_mem("food is pure lame", 20, "is", 2));
+// R_DOC r_mem_mem: Finds the needle of nlen size into the haystack of hlen size
+// R_UNIT printf("%s\n", r_mem_mem("food is pure lame", 20, "is", 2));
 R_API const ut8 *r_mem_mem(const ut8 *haystack, int hlen, const ut8 *needle, int nlen) {
-	int i, until = hlen-nlen+1;
-	if (hlen<1 || nlen<1)
+	int i, until = hlen - nlen + 1;
+	if (hlen < 1 || nlen < 1) {
 		return NULL;
-	for (i=0; i<until; i++) {
-		if (!memcmp (haystack+i, needle, nlen))
-			return haystack+i;
+	}
+	for (i = 0; i < until; i++) {
+		if (!memcmp (haystack + i, needle, nlen)) {
+			return haystack + i;
+		}
 	}
 	return NULL;
 }
@@ -237,8 +241,8 @@ R_API const ut8 *r_mem_mem_aligned(const ut8 *haystack, int hlen, const ut8 *nee
 		until -= (until % align);
 	}
 	for (i = 0; i < until; i += align) {
-		if (!memcmp (haystack+i, needle, nlen)) {
-			return haystack+i;
+		if (!memcmp (haystack + i, needle, nlen)) {
+			return haystack + i;
 		}
 	}
 	return NULL;
@@ -247,17 +251,24 @@ R_API const ut8 *r_mem_mem_aligned(const ut8 *haystack, int hlen, const ut8 *nee
 R_API int r_mem_protect(void *ptr, int size, const char *prot) {
 #if __UNIX__
 	int p = 0;
-	if (strchr (prot, 'x')) p |= PROT_EXEC;
-	if (strchr (prot, 'r')) p |= PROT_READ;
-	if (strchr (prot, 'w')) p |= PROT_WRITE;
-	if (mprotect (ptr, size, p)==-1)
+	if (strchr (prot, 'x')) {
+		p |= PROT_EXEC;
+	}
+	if (strchr (prot, 'r')) {
+		p |= PROT_READ;
+	}
+	if (strchr (prot, 'w')) {
+		p |= PROT_WRITE;
+	}
+	if (mprotect (ptr, size, p) == -1) {
 		return false;
+	}
 #elif __WINDOWS__ || __CYGWIN__
 	int r, w, x;
 	DWORD p = PAGE_NOACCESS;
 	r = strchr (prot, 'r')? 1: 0;
 	w = strchr (prot, 'w')? 1: 0;
-	x = strchr (prot, 'x')? 1: 0;;
+	x = strchr (prot, 'x')? 1: 0;
 	if (w && x) {
 		return false;
 	}
@@ -272,12 +283,12 @@ R_API int r_mem_protect(void *ptr, int size, const char *prot) {
 		return false;
 	}
 #else
-	#warning Unknown platform
+#warning Unknown platform
 #endif
 	return true;
 }
 
-R_API void *r_mem_dup (void *s, int l) {
+R_API void *r_mem_dup(void *s, int l) {
 	void *d = malloc (l);
 	if (!d) {
 		return NULL;
@@ -296,9 +307,9 @@ R_API void r_mem_reverse(ut8 *b, int l) {
 	}
 }
 
-R_API bool r_mem_is_printable (const ut8 *a, int la) {
+R_API bool r_mem_is_printable(const ut8 *a, int la) {
 	int i;
-	for (i = 0; i< la; i++) {
+	for (i = 0; i < la; i++) {
 		if (a[i] != '\n' && a[i] != '\t' && !IS_PRINTABLE (a[i])) {
 			return false;
 		}

sys/indent-whitelist.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 FILES="
+libr/util/mem.c
 libr/util/base64.c
 libr/util/name.c
 libr/util/idpool.c
@@ -65,17 +66,27 @@ binr/rabin2/rabin2.c
 binr/rasm2/rasm2.c
 binr/rax2/rax2.c
 "
+
+chk() {
+	if [ -z "$2" ]; then
+		return 0
+	fi
+	echo "$1" | grep -q "$2"
+}
+
 case "$1" in
-"help"|-h)
-	echo "Usage. sys/indent-whitelist.sh [commit] [apply]"
-	;;
-"commit")
-	sys/indent.sh -i ${FILES}
-	git commit sys/indent* ${FILES}
+help|-h)
+	echo "Usage. sys/indent-whitelist.sh [--fix] [regex]"
 	;;
-"apply")
-	sys/indent.sh -i ${FILES}
+--fix)
+	for f in $FILES ; do
+		chk $f $2 || continue
+		r2pm -r sys/indent.sh -i $f
+	done
 	;;
 *)
-	sys/indent.sh -u ${FILES}
+	for f in $FILES ; do
+		chk $f $1 || continue
+		r2pm -r sys/indent.sh -u $f
+	done
 esac

sys/indent.sh

@@ -8,22 +8,33 @@
 
 IFILE="$1"
 P=`readlink $0`
+[ -z "$P" ] && P="$0"
 cd `dirname $P`/..
 
 if [ -z "${IFILE}" ]; then
 	echo "Usage: r2-indent [-i|-u] [file] [...]"
+	echo " -a    indent all whitelisted files"
 	echo " -i    indent in place (modify file)"
 	echo " -u    unified diff of the file"
 	exit 1
 fi
 
 CWD="$PWD"
 INPLACE=0
+ALLWHITE=0
 UNIFIED=0
 ROOTDIR=/
 
 UNCRUST=1
 
+if [ "${IFILE}" = "-a" ]; then
+	shift
+	ALLWHITE=1
+	IFILE="$1"
+	$CWD/sys/indent-whitelist.sh $@
+	exit 0
+fi
+
 if [ "${IFILE}" = "-i" ]; then
 	shift
 	INPLACE=1
@@ -42,7 +53,7 @@ fi
 
 if [ "${UNCRUST}" = 1 ]; then
 	# yell, rather than overwrite an innocent file
-	if ! type uncrustify >/dev/null; then
+	if ! r2pm -r type uncrustify >/dev/null; then
 		echo "This script requires uncrustify to function. Check r2pm -i uncrustify"
 		exit 1
 	fi
@@ -64,7 +75,7 @@ indentFile() {
 	if [ "${UNCRUST}" = 1 ]; then
 		cp -f doc/clang-format ${CWD}/.clang-format
 		cd "$CWD"
-		uncrustify -c ${CWD}/doc/uncrustify.cfg -f "${IFILE}" > .tmp-format
+		r2pm -r uncrustify -c ${CWD}/doc/uncrustify.cfg -f "${IFILE}" > .tmp-format || exit 1
 	else
 		cp -f doc/clang-format ${CWD}/.clang-format
 		cd "$CWD"