From owner-svn-src-all@freebsd.org Wed Apr 25 02:15:36 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8815FFBA9B5; Wed, 25 Apr 2018 02:15:36 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E3787D8D6; Wed, 25 Apr 2018 02:15:36 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9CF5121B23; Tue, 24 Apr 2018 22:15:35 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 24 Apr 2018 22:15:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=/ZWLU/0cA/4uaW9pcNDBxeaqdMO8B 948nVKIYnIPugo=; b=LJW+I0vvHe58xBEo0AZyaEC5Ifc8yl7qBHM/kHlZG6WzN KG7TXV+AYmc1uQtImJwwntwMpQCTyHASovgGMJfI/UCK4wrStJtLzAuzNsFGrAwE muqQuiaNIh0k9CIkg+O0Tb2NadPYSHL6TarhHOKdJDbYp/LkDEcUQidypHNO3ZXb /q3Fb3qrUXco3EuXxHi+M2jJoYRYldUQfJDOAa9q5Fgh6QWZ2Cg0JVQoRKBGFzqL JRgBVUZUJkek79d4JADfHTN++/3i7BZk2xmcYTQXp56wued2iCQsCmlqTUVUFj6k EcqpPOEV2YVbaPHMVqsODNQWnR6Ld6VMFMotSXPoA== X-ME-Sender: Received: from [10.0.0.153] (c-73-121-138-58.hsd1.tn.comcast.net [73.121.138.58]) by mail.messagingengine.com (Postfix) with ESMTPA id AE11A1025E; Tue, 24 Apr 2018 22:15:34 -0400 (EDT) From: Benno Rice Message-Id: <4E691A4E-6391-4A7D-BD8E-C2773C564AC2@FreeBSD.org> Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\)) Subject: Re: svn commit: r332980 - in stable/11/usr.sbin/makefs: . cd9660 ffs Date: Tue, 24 Apr 2018 22:15:33 -0400 In-Reply-To: Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org To: Pedro Giffuni References: <201804250135.w3P1Z6Xt084500@repo.freebsd.org> X-Mailer: Apple Mail (2.3445.6.18) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 02:15:36 -0000 > On Apr 24, 2018, at 9:50 PM, Pedro Giffuni wrote: >=20 >=20 >=20 > 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 >>=20 >> 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 or , 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. >> =20 > Nope. > ... >=20 >> Modified: stable/11/usr.sbin/makefs/mtree.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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 >> #include >> #include >> +#include >> #include >> #include >> #include "makefs.h" >> + >> +#ifndef ENOATTR >> +#define ENOATTR ENOMSG >> +#endif >> #define IS_DOT(nm) ((nm)[0] =3D=3D '.' && (nm)[1] =3D=3D = '\0') >> #define IS_DOTDOT(nm) ((nm)[0] =3D=3D '.' && (nm)[1] =3D=3D = '.' && (nm)[2] =3D=3D '\0') >=20 > This should be ENODATA, see r326282 for reference. This is an old change I MFC=E2=80=99ed 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=E2=80=99m more than = happy if someone wants to fix this up in head. Thanks, Benno.=