From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id CE9B83858401; Wed, 10 Aug 2022 16:12:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE9B83858401 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: bfd-cvs@sourceware.org Subject: [binutils-gdb] objdump: fix extended (256) disassembler colors X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: f8053219836de69ceb8ff0e3e311b0585b1187b3 X-Git-Newrev: daf2618a918f2fd338e2519b51d7599943ccb3e8 Message-Id: <20220810161209.CE9B83858401@sourceware.org> Date: Wed, 10 Aug 2022 16:12:09 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2022 16:12:09 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Ddaf2618a918f= 2fd338e2519b51d7599943ccb3e8 commit daf2618a918f2fd338e2519b51d7599943ccb3e8 Author: Andrew Burgess Date: Wed Aug 10 12:42:35 2022 +0100 objdump: fix extended (256) disassembler colors =20 After commit: =20 commit a88c79b77036e4778e70d62081c3cfd1044bb8e3 Date: Tue Aug 9 14:57:48 2022 +0100 =20 Default to enabling colored disassembly if output is to a termina= l. =20 The 256 extended-color support for --disassembler-color was broken. This is fixed in this commit. =20 PR 29457 * objdump (objdump_styled_sprintf): Check disassembler_color against an enum value, don't treat it as a bool. Diff: --- binutils/objdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binutils/objdump.c b/binutils/objdump.c index 08c335476ff..9259c76c716 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -2247,7 +2247,7 @@ objdump_styled_sprintf (SFILE *f, enum disassembler_s= tyle style, { size_t space =3D f->alloc - f->pos; =20 - if (disassembler_color) + if (disassembler_color =3D=3D on) n =3D snprintf (f->buffer + f->pos, space, "\033[%dm", color); else n =3D snprintf (f->buffer + f->pos, space, "\033[38;5;%dm", color);