Date: Tue, 24 Apr 2018 22:15:33 -0400 From: Benno Rice <benno@FreeBSD.org> To: Pedro Giffuni <pfg@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r332980 - in stable/11/usr.sbin/makefs: . cd9660 ffs Message-ID: <4E691A4E-6391-4A7D-BD8E-C2773C564AC2@FreeBSD.org> In-Reply-To: <c60bd5b3-cf63-a309-31cf-ee1baaf49c14@FreeBSD.org> References: <201804250135.w3P1Z6Xt084500@repo.freebsd.org> <c60bd5b3-cf63-a309-31cf-ee1baaf49c14@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
> On Apr 24, 2018, at 9:50 PM, Pedro Giffuni <pfg@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.c Wed Apr 25 01:30:29 2018 (r332979) >> +++ stable/11/usr.sbin/makefs/mtree.c Wed 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 >> +#define ENOATTR ENOMSG >> +#endif >> #define IS_DOT(nm) ((nm)[0] == '.' && (nm)[1] == '\0') >> #define IS_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. Thanks, Benno.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E691A4E-6391-4A7D-BD8E-C2773C564AC2>