Add version information to libr_main

libr/include/r_main.h

@@ -5,6 +5,8 @@
 
 #include <r_types.h>
 
+R_LIB_VERSION_HEADER(r_main);
+
 typedef struct r_main_t {
 	char *name;
 	int (*main)(int argc, char **argv);
@@ -15,7 +17,7 @@ R_API RMain *r_main_new(const char *name);
 R_API void r_main_free(RMain *m);
 R_API int r_main_run(RMain *m, int argc, char **argv);
 
-R_API int r_main_version(const char *program);
+R_API int r_main_version_print(const char *program);
 R_API int r_main_rax2(int argc, char **argv);
 R_API int r_main_rarun2(int argc, char **argv);
 R_API int r_main_rahash2(int argc, char **argv);

libr/main/main.c

@@ -5,6 +5,8 @@
 #include <r_main.h>
 #include <r_util.h>
 
+R_LIB_VERSION(r_main);
+
 static RMain foo[] = {
 	{ "r2", r_main_radare2 },
 	{ "rax2", r_main_rax2 },

libr/main/r2agent.c

@@ -27,7 +27,7 @@ static int usage (int v) {
 }
 
 static int showversion() {
-	return r_main_version ("r2agent");
+	return r_main_version_print ("r2agent");
 }
 
 R_API int r_main_r2agent(int argc, char **argv) {

libr/main/rabin2.c

@@ -768,7 +768,7 @@ R_API int r_main_rabin2(int argc, char **argv) {
 		case 'r': rad = true; break;
 		case 'v': 
 			  r_core_fini (&core);
-			  return r_main_version ("rabin2");
+			  return r_main_version_print ("rabin2");
 		case 'L':
 			set_action (R_BIN_REQ_LISTPLUGINS);
 			break;

libr/main/radare2.c

@@ -57,6 +57,7 @@ static int r_main_version_verify(int show) {
 		{ "r_crypto", &r_crypto_version },
 		{ "r_bp", &r_bp_version },
 		{ "r_debug", &r_debug_version },
+		{ "r_main", &r_main_version },
 		{ "r_hash", &r_hash_version },
 		{ "r_fs", &r_fs_version },
 		{ "r_io", &r_io_version },
@@ -689,7 +690,7 @@ R_API int r_main_radare2(int argc, char **argv) {
 			} else {
 				r_main_version_verify (0);
 				LISTS_FREE ();
-				return r_main_version ("radare2");
+				return r_main_version_print ("radare2");
 			}
 		case 'V':
 			return r_main_version_verify (1);

libr/main/radiff2.c

@@ -795,7 +795,7 @@ R_API int r_main_radiff2(int argc, char **argv) {
 			diffmode = 'U';
 			break;
 		case 'v':
-			return r_main_version ("radiff2");
+			return r_main_version_print ("radiff2");
 		case 'q':
 			quiet = true;
 			break;

libr/main/rafind2.c

@@ -345,7 +345,7 @@ R_API int r_main_rafind2(int argc, char **argv) {
 			quiet = true;
 			break;
 		case 'v':
-			return r_main_version ("rafind2");
+			return r_main_version_print ("rafind2");
 		case 'h':
 			return show_help(argv[0], 0);
 		case 'z':

libr/main/ragg2.c

@@ -298,7 +298,7 @@ R_API int r_main_ragg2(int argc, char **argv) {
 		case 'v':
 			free (sequence);
 			r_egg_free (egg);
-			return r_main_version ("ragg2");
+			return r_main_version_print ("ragg2");
 		case 'z':
 			show_str = 1;
 			break;

libr/main/rahash2.c

@@ -463,7 +463,7 @@ int r_main_rahash2(int argc, char **argv) {
 		case 'b': bsize = (int) r_num_math (NULL, r_optarg); break;
 		case 'f': from = r_num_math (NULL, r_optarg); break;
 		case 't': to = 1 + r_num_math (NULL, r_optarg); break;
-		case 'v': return r_main_version ("rahash2");
+		case 'v': return r_main_version_print ("rahash2");
 		case 'h': return do_help (0);
 		case 's': setHashString (r_optarg, 0); break;
 		case 'x': setHashString (r_optarg, 1); break;

libr/main/rarun2.c

@@ -31,7 +31,7 @@ R_API int r_main_rarun2(int argc, char **argv) {
 		return 1;
 	}
 	if (!strcmp (argv[1], "-v")) {
-		return r_main_version ("rarun2");
+		return r_main_version_print ("rarun2");
 	}
 	file = argv[1];
 	if (!strcmp (file, "-t")) {

libr/main/rasm2.c

@@ -655,7 +655,7 @@ R_API int r_main_rasm2(int argc, char *argv[]) {
 			if (as->quiet) {
 				printf ("%s\n", R2_VERSION);
 			} else {
-				ret = r_main_version ("rasm2");
+				ret = r_main_version_print ("rasm2");
 			}
 			goto beach;
 		case 'w':

libr/main/rax2.c

@@ -169,7 +169,7 @@ static int rax(char *str, int len, int last) {
 			case 'L': flags ^= 1 << 19; break;
 			case 'i': flags ^= 1 << 21; break;
 			case 'o': flags ^= 1 << 22; break;
-			case 'v': return r_main_version ("rax2");
+			case 'v': return r_main_version_print ("rax2");
 			case '\0': return !use_stdin ();
 			default:
 				/* not as complete as for positive numbers */

libr/main/version.c

@@ -15,7 +15,7 @@
 #define R2_BIRTH "unknown"
 #endif
 
-R_API int r_main_version(const char *program) {
+R_API int r_main_version_print(const char *program) {
 	printf ("%s "R2_VERSION" %d @ "
 			R_SYS_OS"-"
 			R_SYS_ARCH"-%d git.%s\n",