Control: tags 500422 -moreinfo
Control: tags 500422 pending
Hi Aaron!
The new patch worked fine! The configure part is not needed if using
autoreconf. So, I attached the final version that I will use for
Debian. I will upload the package to 1-day/DELAY queue now.
Thanks a lot for your help.
Regards,
Eriberto
2016-03-28 11:42 GMT-03:00 Aaron Small <aaron.small....@gmail.com>:
> Here's a fixed patch. I guess that when I made the first patch, I had
> changed the makefile but not configure.in, so had missed that it also needed
> a change when I made the patch - at least that's my guess, I really don't
> remember what I was doing 8 years ago :)
>
> Thanks,
> Aaron
>
> On Sun, Mar 27, 2016 at 2:00 PM, Eriberto Mota <eribe...@debian.org> wrote:
>>
>> Ok, thanks.
>>
>> Today I will upload a new revision. I will wait your debug to do a next
>> upload.
>>
>> Regards,
>>
>> Eriberto
>>
>>
>> 2016-03-27 14:39 GMT-03:00 Aaron Small <aaron.small....@gmail.com>:
>> > I get the same result as you when applying the patch, it doesn't work
>> > for me
>> > either. I don't have time to debug into it right now, but will try to
>> > sometime in the next week or two.
>> >
>> > Thanks,
>> > Aaron
>> >
>> > On Sun, Mar 27, 2016 at 10:48 AM, Eriberto Mota <eribe...@debian.org>
>> > wrote:
>> >>
>> >> Hi Aaron,
>> >>
>> >> Thanks for your quick reply.
>> >>
>> >> 2016-03-27 9:36 GMT-03:00 Aaron Small <aaron.small....@gmail.com>:
>> >> > Hi, unfortunately it does still occur. I just tried it with this
>> >> > file:
>> >> >
>> >> > $ ls
>> >> > 00 - 回家.m4a
>> >> >
>> >> > And see the following at the bottom of the screen when opening it in
>> >> > hexedit:
>> >> > --- 00 - å~[~^家.m4a
>> >>
>> >>
>> >> Thanks! I did this same test now and I can see the same result.
>> >>
>> >> However, using your patch (I attached it in diff -Naur format), inside
>> >> of hexedit, I see:
>> >>
>> >> --- 00 - M-e~[~^M-eM-.M-6.m4a
>> >>
>> >> So, the patch is not efficient in my system.
>> >>
>> >>
>> >> > I'm using stretch:
>> >> > $ dpkg -l hexedit
>> >> > Desired=Unknown/Install/Remove/Purge/Hold
>> >> > |
>> >> >
>> >> >
>> >> > Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
>> >> > |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
>> >> > ||/ Name Version
>> >> > Architecture Description
>> >> >
>> >> >
>> >> > +++-==================================================-==============================-==============================-==========================================================================================================
>> >> > ii hexedit 1.2.13-1+b1
>> >> > amd64 view and edit files in hexadecimal or
>> >> > in
>> >> > ASCII
>> >>
>> >>
>> >> I am using Sid, LANG=pt_BR.UTF-8
>> >>
>> >> Do you have a new idea about the problem? If yes, I can upload a new
>> >> revision using your solution.
>> >>
>> >> Have anice day!
>> >>
>> >> Regards,
>> >>
>> >> Eriberto
>> >
>> >
>
>
Description: fix interpretation of non-ASCII characters in filenames.
(Closes: #500422)
On Debian systems, this patch requires libncursesw5-dev.
Author: Aaron Small <aaron.small....@gmail.com>
Last-Update: 2016-03-28
Index: hexedit-1.2.13/configure.in
===================================================================
--- hexedit-1.2.13.orig/configure.in
+++ hexedit-1.2.13/configure.in
@@ -34,8 +34,10 @@ AC_PROG_CC
AC_PROG_INSTALL
dnl Checks for libraries.
-AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses",
- AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses")
+AC_CHECK_LIB(ncursesw, initscr, LIBS="$LIBS -lncursesw" CFLAGS="$CFLAGS -DWIDE_CURSES",
+ [AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses",
+ [AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses")]
+ )]
)
AC_CHECK_FUNC(use_default_colors,
AC_DEFINE(HAVE_COLORS, , "Define if you want colored (fruit salad) display option")
Index: hexedit-1.2.13/hexedit.c
===================================================================
--- hexedit-1.2.13.orig/hexedit.c
+++ hexedit-1.2.13/hexedit.c
@@ -15,7 +15,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
#include "hexedit.h"
-
+#include "locale.h"
/*******************************************************************************/
/* Global variables */
@@ -53,6 +53,7 @@ char * usage = "usage: %s [-s | --sector
/*******************************************************************************/
int main(int argc, char **argv)
{
+ setlocale(LC_ALL, "");
progName = basename(argv[0]);
argv++; argc--;
Index: hexedit-1.2.13/hexedit.h
===================================================================
--- hexedit-1.2.13.orig/hexedit.h
+++ hexedit-1.2.13/hexedit.h
@@ -13,7 +13,11 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef WIDE_CURSES
+#include <ncursesw/curses.h>
+#else
#include <curses.h>
+#endif
#include <ctype.h>
#include <signal.h>
#if HAVE_SYS_WAIT_H
