diff --git a/README.md b/README.md index 4b38d66f1950c..96548fb357ffe 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Tests Status](https://github.com/radareorg/radare2/workflows/CI/badge.svg?branch=master)](https://github.com/radareorg/radare2/actions/workflows/ci.yml?query=branch%3Amaster) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/741/badge)](https://bestpractices.coreinfrastructure.org/projects/741) [![Build Status](https://scan.coverity.com/projects/416/badge.svg)](https://scan.coverity.com/projects/416) [![Total alerts](https://img.shields.io/lgtm/alerts/g/radareorg/radare2.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/radareorg/radare2/alerts/) [![TODO counter](https://img.shields.io/github/search/radareorg/radare2/TODO.svg)](https://github.com/radareorg/radare2/search?q=TODO) [![XXX counter](https://img.shields.io/github/search/radareorg/radare2/XXX.svg)](https://github.com/radareorg/radare2/search?q=XXX) -Next release will be 5.5.2, current git is 5.5.0 and the [![latest packaged version(s)](https://repology.org/badge/latest-versions/radare2.svg)](https://repology.org/project/radare2/versions) See the [Release](https://github.com/radareorg/radare2/releases) downloads page. +Next release will be 5.5.4, current git is 5.5.3 and the [![latest packaged version(s)](https://repology.org/badge/latest-versions/radare2.svg)](https://repology.org/project/radare2/versions) See the [Release](https://github.com/radareorg/radare2/releases) downloads page. r2 is a rewrite from scratch of radare. It provies a set of libraries, tools and plugins to ease reverse engineering tasks. diff --git a/configure b/configure index b46abe54b1efb..89367da94054f 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# This script was automatically generated by ACR v1.9.8 +# This script was automatically generated by ACR v1.9.9 # @author: pancake # @url: http://www.nopcode.org # @repo: git clone https://github.com/radare/acr @@ -133,12 +133,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='radare2' ; VERSION='5.5.1' ; VERSION_MAJOR=5; VERSION_MINOR=5; VERSION_PATCH=1; VERSION_NUMBER=50501; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='radare2' ; VERSION='5.5.2' ; VERSION_MAJOR=5; VERSION_MINOR=5; VERSION_PATCH=2; VERSION_NUMBER=50502; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -274,7 +274,7 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: radare2" -echo "VERSION: 5.5.1" +echo "VERSION: 5.5.2" echo "LANGS: c" echo "REQUIRED: libdl" echo "OPTIONAL: libmagic libz libzip libxxhash libssl liblibuv>=1.0.0" diff --git a/configure.acr b/configure.acr index fa99494494c2f..b9c6887d97a03 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME radare2 -VERSION 5.5.1 +VERSION 5.5.2 CONTACT pancake ; pancake@nopcode.org LANG_C! diff --git a/libr/core/panels.c b/libr/core/panels.c index 06de9b17881fc..bc0ab1a1fb61d 100644 --- a/libr/core/panels.c +++ b/libr/core/panels.c @@ -5381,7 +5381,7 @@ static RList *__sorted_list(RCore *core, const char *menu[], int count) { return list; } -static void __init_menu_color_settings_layout (void *_core, const char *parent) { +static void __init_menu_color_settings_layout(void *_core, const char *parent) { RCore *core = (RCore *)_core; const char *color = core->cons->context->pal.graph_box2; char *now = r_core_cmd_str (core, "eco."); @@ -5404,7 +5404,7 @@ static void __init_menu_color_settings_layout (void *_core, const char *parent) r_strbuf_free (buf); } -static void __init_menu_disasm_settings_layout (void *_core, const char *parent) { +static void __init_menu_disasm_settings_layout(void *_core, const char *parent) { RCore *core = (RCore *)_core; int i = 0; RList *list = __sorted_list (core, menus_settings_disassembly, COUNT (menus_settings_disassembly)); @@ -5479,12 +5479,11 @@ static bool __init_panels_menu(RCore *core) { __load_config_menu (core); - int i = 0; - while (menus[i]) { + int i; + for (i = 0; menus[i]; i++) { __add_menu (core, NULL, menus[i], __open_menu_cb); - i++; } - char *parent = "File"; + const char *parent = "File"; i = 0; while (menus_File[i]) { if (!strcmp (menus_File[i], "Open")) { @@ -5638,8 +5637,7 @@ static bool __init_panels_menu(RCore *core) { i++; } parent = "Help"; - i = 0; - while (menus_Help[i]) { + for (i = 0; menus_Help[i]; i++) { if (!strcmp (menus_Help[i], "License")) { __add_menu (core, parent, menus_Help[i], __license_cb); } else if (!strcmp (menus_Help[i], "Version")) { @@ -5655,25 +5653,21 @@ static bool __init_panels_menu(RCore *core) { } parent = "File.ReOpen"; - i = 0; - while (menus_ReOpen[i]) { + for (i = 0; menus_ReOpen[i]; i++) { if (!strcmp (menus_ReOpen[i], "In RW")) { __add_menu (core, parent, menus_ReOpen[i], __rw_cb); } else if (!strcmp (menus_ReOpen[i], "In Debugger")) { __add_menu (core, parent, menus_ReOpen[i], __debugger_cb); } - i++; } parent = "File.Load Layout"; - i = 0; - while (menus_loadLayout[i]) { + for (i = 0; menus_loadLayout[i]; i++) { if (!strcmp (menus_loadLayout[i], "Saved")) { __add_menu (core, parent, menus_loadLayout[i], __open_menu_cb); } else if (!strcmp (menus_loadLayout[i], "Default")) { __add_menu (core, parent, menus_loadLayout[i], __load_layout_default_cb); } - i++; } __init_menu_saved_layout (core, "File.Load Layout.Saved"); @@ -5697,14 +5691,12 @@ static bool __init_panels_menu(RCore *core) { __init_menu_screen_settings_layout (core, "Settings.Screen"); parent = "Edit.io.cache"; - i = 0; - while (menus_iocache[i]) { + for (i = 0; menus_iocache[i]; i++) { if (!strcmp (menus_iocache[i], "On")) { __add_menu (core, parent, menus_iocache[i], __io_cache_on_cb); } else if (!strcmp (menus_iocache[i], "Off")) { __add_menu (core, parent, menus_iocache[i], __io_cache_off_cb); } - i++; } panels_menu->history = calloc (8, sizeof (RPanelsMenuItem *)); diff --git a/meson.build b/meson.build index 81445fa8ca0d3..dbdd503672129 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('radare2', 'c', license : 'LGPL3', meson_version : '>=0.49', version : '5.5.1') +project('radare2', 'c', license : 'LGPL3', meson_version : '>=0.49', version : '5.5.2') py3_exe = import('python').find_installation('python3') git_exe = find_program('git', required: false)