From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD,URIBL_RED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 710021F855 for ; Tue, 2 Aug 2016 00:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755464AbcHBAAq (ORCPT ); Mon, 1 Aug 2016 20:00:46 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:53065 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755393AbcHBAAo (ORCPT ); Mon, 1 Aug 2016 20:00:44 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id D5F9532D48; Mon, 1 Aug 2016 19:03:42 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=BL8qdjJxUJmIQLmSEz4uOlmjp8M=; b=nCDX0I iHyTBqMCuoLW5sB1TintOZuY8R514jYF38kgmseN9EHTB82NLI6RVi3aZsl/xlu7 PkfuWFvhUCRZsMxUslvKP0knAH/fDxc7Hi5WPbJ14Wjld9Fh7YwhIj/whbAmIpJB L+5cS5/vLFy9cr2egs5qQY7/ZpF5s1cHRoHfs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=bYRZAj7uK0EkD+MLDINYQm7ygBitG1Rk wOv3S6WS+AKL8RlY7h7FA9izyiix78WtUkwRvMbRNMCsqjdU+aV7qjI5/DaeKbYD aE5GjPl78ItfAh2iIlbz8SpuLaxfRKFmffBEyeVTs3wpv6LT4htB1AYXDxeEMJnw 5sZV1ltnLi8= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id CDB9932D47; Mon, 1 Aug 2016 19:03:42 -0400 (EDT) Received: from pobox.com (unknown [104.132.0.95]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 4225032D46; Mon, 1 Aug 2016 19:03:42 -0400 (EDT) From: Junio C Hamano To: Eric Wong Cc: Jeff King , "Kyle J. McKay" , git@vger.kernel.org, "brian m. carlson" , =?utf-8?B?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= Duy , Jakub =?utf-8?Q?Nar=C4=99bski?= Subject: Re: [PATCH 1/1 v2] pager: move pager-specific setup into the build References: <20160801214937.4752-1-e@80x24.org> <20160801214937.4752-2-e@80x24.org> Date: Mon, 01 Aug 2016 16:03:40 -0700 In-Reply-To: <20160801214937.4752-2-e@80x24.org> (Eric Wong's message of "Mon, 1 Aug 2016 21:49:37 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 30EC63B2-583C-11E6-AC53-EE617A1B28F4-77302942!pb-smtp2.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Eric Wong writes: > From: Junio C Hamano > > Allowing PAGER_ENV to be set at build-time allows us to move > pager-specific knowledge out of our build. Currently, this > allows us to set a better default for FreeBSD where more(1) > is the same binary as less(1). Thanks for resurrecting, but I am not sure what "a better default" is from the above description and with the patch. Even though a naive reading of the above (i.e. "less" and "more" are the same) makes me expect that the patch will give the same set of default environment settings to those on FreeBSD, you give LESS=FRX and MORE=-R, i.e. they are configured differently. > This also prepares us for introducing a run-time config knob to > override the build-time environment in the next commit. This is now gone, judging from 1/1 on the subject line being not 1/2, right? > > Originally-from: > https://public-inbox.org/git/xmqq61piw4yf.fsf@gitster.dls.corp.google.com/ > > Signed-off-by: Eric Wong > --- > Makefile | 20 +++++++++++++++++++- > config.mak.uname | 1 + > git-sh-setup.sh | 8 +++++--- > pager.c | 29 +++++++++++++++++++++++++---- > 4 files changed, 50 insertions(+), 8 deletions(-) > > diff --git a/Makefile b/Makefile > index 6a13386..0b36b5e 100644 > --- a/Makefile > +++ b/Makefile > @@ -370,6 +370,14 @@ all:: > # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function. > # > # Define HAVE_GETDELIM if your system has the getdelim() function. > +# > +# Define PAGER_ENV to a SP separated VAR=VAL pairs to define > +# default environment variables to be passed when a pager is spawned, e.g. > +# > +# PAGER_ENV = LESS=FRX LV=-c > +# > +# to say "export LESS=FRX (and LV=-c) if the environment variable > +# LESS (and LV) is not set, respectively". > > GIT-VERSION-FILE: FORCE > @$(SHELL_PATH) ./GIT-VERSION-GEN > @@ -1500,6 +1508,10 @@ ifeq ($(PYTHON_PATH),) > NO_PYTHON = NoThanks > endif > > +ifndef PAGER_ENV > +PAGER_ENV = LESS=FRX LV=-c > +endif > + > QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir > QUIET_SUBDIR1 = > > @@ -1629,6 +1641,10 @@ ifdef DEFAULT_HELP_FORMAT > BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' > endif > > +PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))" > +PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ)) > +BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)' > + > ALL_CFLAGS += $(BASIC_CFLAGS) > ALL_LDFLAGS += $(BASIC_LDFLAGS) > > @@ -1753,7 +1769,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt) > > SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\ > $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ > - $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP) > + $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV) > define cmd_munge_script > $(RM) $@ $@+ && \ > sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ > @@ -1766,6 +1782,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ > -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \ > -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ > -e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \ > + -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \ > $@.sh >$@+ > endef > > @@ -2173,6 +2190,7 @@ GIT-BUILD-OPTIONS: FORCE > @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+ > @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+ > @echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+ > + @echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+ > ifdef TEST_OUTPUT_DIRECTORY > @echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+ > endif > diff --git a/config.mak.uname b/config.mak.uname > index 17fed2f..2484dfb 100644 > --- a/config.mak.uname > +++ b/config.mak.uname > @@ -209,6 +209,7 @@ ifeq ($(uname_S),FreeBSD) > HAVE_PATHS_H = YesPlease > GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes > HAVE_BSD_SYSCTL = YesPlease > + PAGER_ENV = LESS=FRX LV=-c MORE=-R > endif > ifeq ($(uname_S),OpenBSD) > NO_STRCASESTR = YesPlease > diff --git a/git-sh-setup.sh b/git-sh-setup.sh > index 0c34aa6..0f5a56f 100644 > --- a/git-sh-setup.sh > +++ b/git-sh-setup.sh > @@ -163,9 +163,11 @@ git_pager() { > else > GIT_PAGER=cat > fi > - : "${LESS=-FRX}" > - : "${LV=-c}" > - export LESS LV > + for vardef in @@PAGER_ENV@@ > + do > + var=${vardef%%=*} > + eval ": \${$vardef} && export $var" > + done > > eval "$GIT_PAGER" '"$@"' > } > diff --git a/pager.c b/pager.c > index 4bc0481..cd1ac54 100644 > --- a/pager.c > +++ b/pager.c > @@ -63,14 +63,35 @@ const char *git_pager(int stdout_is_tty) > return pager; > } > > +static void setup_pager_env(struct argv_array *env) > +{ > + const char *pager_env = PAGER_ENV; > + > + while (*pager_env) { > + struct strbuf buf = STRBUF_INIT; > + const char *cp = strchrnul(pager_env, '='); > + > + if (!*cp) > + die("malformed build-time PAGER_ENV"); > + strbuf_add(&buf, pager_env, cp - pager_env); > + cp = strchrnul(pager_env, ' '); > + if (!getenv(buf.buf)) { > + strbuf_reset(&buf); > + strbuf_add(&buf, pager_env, cp - pager_env); > + argv_array_push(env, strbuf_detach(&buf, NULL)); > + } > + strbuf_reset(&buf); > + while (*cp && *cp == ' ') > + cp++; > + pager_env = cp; > + } > +} > + > void prepare_pager_args(struct child_process *pager_process, const char *pager) > { > argv_array_push(&pager_process->args, pager); > pager_process->use_shell = 1; > - if (!getenv("LESS")) > - argv_array_push(&pager_process->env_array, "LESS=FRX"); > - if (!getenv("LV")) > - argv_array_push(&pager_process->env_array, "LV=-c"); > + setup_pager_env(&pager_process->env_array); > } > > void setup_pager(void)