[haiku-commits] Re: r34017 - haiku/trunk/src/bin/bash
- From: Jérôme Duval <korli@xxxxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 13 Nov 2009 12:29:41 +0100
2009/11/13 Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>:
> korli@xxxxxxxxxxxxxxxx wrote:
>> +/* The default file for hostname completion. */
>> +#define DEFAULT_HOSTS_FILE "/etc/hosts"
>
> If that definition is actually used somewhere, it won't work anymore.
AFAICT this was already defined this way before the update.
>
> And also:
>> Log:
>> merge bash-4.0 to trunk. kept most haiku stuff.
>
> Do you remember briefly what that was? :-)
Are kept: builtins/mkbuiltins.c, a lot of #if defined(__BEOS__) ||
defined(__HAIKU__) or #if defined(__BEOS__) && !defined(__HAIKU__).
Also I was mistaken a few times with the merge because the 2.05b in
the vendor branch doesn't take patches into account. At least one is
still in current (ulimit.def).
I dropped this change on lib/readline/histfile.c. Is it still valid with Haiku ?
@@ -400,12 +400,6 @@
if (bp > buffer && ((file = open (filename, O_WRONLY|O_TRUNC|O_BINARY,
0600)) != -1))
{
write (file, bp, chars_read - (bp - buffer));
#if defined (__BEOS__)
/* BeOS ignores O_TRUNC. */
ftruncate (file, chars_read - (bp - buffer));
#endif
close (file);
}
Anyway, please have a look at the full diff against the 4.0:
http://svn.berlios.de/wsvn/haiku/?op=comp with /haiku/vendor/bash/4.0
and /haiku/trunk/src/bin/bash as compare paths.
Obviously I should cleanup a few unused generated files which live in
the trunk bash.
Bye,
Jérôme
Other related posts:
