svn commit: r332980 - in stable/11/usr.sbin/makefs: . cd9660 ffs

[Pedro Giffuni]

On 04/24/18 21:15, Benno Rice wrote:
>
>
>> On Apr 24, 2018, at 9:50 PM, Pedro Giffuni <pfg at FreeBSD.org 
>> <mailto:pfg at FreeBSD.org>> wrote:
>>
>>
>>
>> On 24/04/2018 20:35, Benno Rice wrote:
>>> Author: benno
>>> Date: Wed Apr 25 01:35:06 2018
>>> New Revision: 332980
>>> URL: https://svnweb.freebsd.org/changeset/base/332980
>>>
>>> Log:
>>>   MFC r307927
>>>       Be more precise when including headers so that we're less 
>>> likely to
>>>    depend on namespace pollution and as such become more portable. This
>>>    means including headers like <sys/types.h> or <stdlib.h>, but also
>>>    making sure we include system/host headers before local headers.
>>>       While here: define ENOATTR as ENOMSG in mtree.c. There is no 
>>> ENOATTR
>>>    on Linux.
>>>
>> Nope.
>> ...
>>
>>> Modified: stable/11/usr.sbin/makefs/mtree.c
>>> ==============================================================================
>>> --- stable/11/usr.sbin/makefs/mtree.cWed Apr 25 01:30:29 2018(r332979)
>>> +++ stable/11/usr.sbin/makefs/mtree.cWed Apr 25 01:35:06 2018(r332980)
>>> @@ -46,10 +46,15 @@ __FBSDID("$FreeBSD$");
>>>  #include <stdlib.h>
>>>  #include <string.h>
>>>  #include <strings.h>
>>> +#include <time.h>
>>>  #include <unistd.h>
>>>  #include <vis.h>
>>>    #include "makefs.h"
>>> +
>>> +#ifndef ENOATTR
>>> +#defineENOATTRENOMSG
>>> +#endif
>>>    #defineIS_DOT(nm)((nm)[0] == '.' && (nm)[1] == '\0')
>>>  #defineIS_DOTDOT(nm)((nm)[0] == '.' && (nm)[1] == '.' && (nm)[2] == 
>>> '\0')
>>
>> This should be ENODATA, see r326282 for reference.
>
> This is an old change I MFC’ed but did not originally author. Merging 
> it reduced conflicts with other changes I needed to merge in order to 
> merge the EFI changes for El Torito. I’m more than happy if someone 
> wants to fix this up in head.
>
I see, good find then ;).

Thanks,

Pedro.