From nobody Thu Nov 25 01:54:55 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9F9EC18A80A3; Thu, 25 Nov 2021 01:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J01Cg2XZnz3DY7; Thu, 25 Nov 2021 01:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 37B5D14FC0; Thu, 25 Nov 2021 01:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AP1st2K082299; Thu, 25 Nov 2021 01:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AP1stBP082298; Thu, 25 Nov 2021 01:54:55 GMT (envelope-from git) Date: Thu, 25 Nov 2021 01:54:55 GMT Message-Id: <202111250154.1AP1stBP082298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: 971677d5fd4c - main - sh: Avoid some headers when NO_HISTORY is set. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 971677d5fd4cc6e776468cb80e0a05fdd3f4da49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637805295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FgYQph1TWtzvyd5wJpKw/st577c1TF9JLFz61dBeCbE=; b=SM7Ra3vYMdAvfKTiQyI4rtTeFMUmw92WtXFMaCAux4v0MZro+vIeuGtkpikIxHjA3yVmxi xfuXMc/NC3M9HHvSCl23zh6JgZdwINwahXeWWuXOzTFeSqYc4ne9iUE5mVNyYzckI1VExf XUJyWzbAxNZ7k/5vjxgXdf//Pjas6PtWpFK+ma8iI8+lRo4JtGzmVHR71m1hCELz3BBP2R TtkcC3l4rpzLhQY9hy2MWchr9h2ocS+nO3vnZUlWrb/HRtM1FG9pxhrNIzQhbEWpp9kzxG Nu1dg63KfNzwt4HzTyfRWwPXcM7d7zr8epl9Bowa1wS7cdF7fPDQ4ZXsdIE7iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637805295; a=rsa-sha256; cv=none; b=YHJ+qJUuoxV21i23hqhnviVCjZiISGTNN2h+/sGKil0SoJidydmASfGx5quxNQJlBKqheW nPUDhYZFwQc8M1WUYWy5uLR77MIF+LBgYqNcwFsbS1kHNjNKtLj++cg8wjppdYQYRMoY2f szpnef9HEgf0MX3UUGL8pHokNd4xt++C1h+uEwfgLwKS6nOqFRwEZzRkaoVb7K8IwmFXxs 3D1l4o9ZiD//I+9qzbIrBmj1Nam2x4MK72+2DwJXJWXnVgvOcVId48NTESZ2F7umxDGPER /ubOnz5cohmF6vUgFRnuN1GQmdd9lb8oIA9ElzMIfGcTHOcuC4ya2P9z7Py5ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=971677d5fd4cc6e776468cb80e0a05fdd3f4da49 commit 971677d5fd4cc6e776468cb80e0a05fdd3f4da49 Author: Bryan Drewery AuthorDate: 2021-11-25 01:52:11 +0000 Commit: Bryan Drewery CommitDate: 2021-11-25 01:53:39 +0000 sh: Avoid some headers when NO_HISTORY is set. This is more simpler compatibility with using this source on older systems before libedit was made to install filecomplete.h in commit b315a7296d2. --- bin/sh/input.c | 2 ++ bin/sh/trap.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/sh/input.c b/bin/sh/input.c index 3933287524a4..12faa33d0f1b 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -59,7 +59,9 @@ __FBSDID("$FreeBSD$"); #include "error.h" #include "alias.h" #include "parser.h" +#ifndef NO_HISTORY #include "myhistedit.h" +#endif #include "trap.h" #define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */ diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 2dd394035ca4..7a6ed2f4368a 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -58,7 +58,9 @@ __FBSDID("$FreeBSD$"); #include "trap.h" #include "mystring.h" #include "builtins.h" +#ifndef NO_HISTORY #include "myhistedit.h" +#endif /*