[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <a5ca799d990a500fead02d8a5ca6bc6e@smtp.hushmail.com>
Date: Tue, 19 Mar 2013 20:39:50 +0100
From: magnum <john.magnum@...hmail.com>
To: john-dev@...ts.openwall.com
Subject: Re: basename portability 'fix'.
Committed, to both branches. Thanks!
magnum
On 19 Mar, 2013, at 18:11 , jfoug <jfoug@....net> wrote:
> Here is a new version of the patch. It installs right on top of the current
> bleed tree, so this one fully replaces the last patch.
>
> This one removed the name variable from jtr_basename_r (it was unused), and
> changes 1st param from _name to name.
> Also, I added a #define to misc.h, for: #define basename(a) jtr_basename(a)
> and changed the 2 files using jtr_basename, to once again use basename.
> I also made sure there were not \r\n crap in the patch, sorry ;)
>
> So now, the change to rar2john is simply this (from current bleeding)
>
> diff -urpN bleed2/src/rar2john.c bleed/src/rar2john.c
> --- bleed2/src/rar2john.c 2013-03-19 11:55:30.806000000 -0500
> +++ bleed/src/rar2john.c 2013-03-19 12:00:51.277000000 -0500
> @@ -49,7 +49,6 @@
> #include <errno.h>
> #include <string.h>
> #include <assert.h>
> -#include <libgen.h>
>
> #include "misc.h"
> #include "common.h"
>
> Doesn't get much easier than that.
>
> Jim.
>
>> -----Original Message-----
>> From: magnum [mailto:john.magnum@...hmail.com]
>>
>> Parts of your patch has CRLF and parts of it does not. This made git
> disregard most of it as "whitespace errors" :-) Also, I get this:
>>
>> misc.c: In function 'jtr_basename_r':
>> misc.c:199:19: warning: variable 'name' set but not used
> [-Wunused-but-set-variable]
>> misc.c: In function 'jtr_basename_r':
>> misc.c:199:19: warning: variable 'name' set but not used
> [-Wunused-but-set-variable]
>>
>> I guess we can just drop all statements that declare or set name?
> <bleeding_basename_portability_fix-2.patch>
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
