From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>, Yuri <yuri@rawbw.com>
Subject: [PATCH 1/3] setup_pager: refactor LESS/LV environment setting
Date: Thu, 16 Jan 2014 23:21:02 -0500 [thread overview]
Message-ID: <20140117042101.GA23443@sigill.intra.peff.net> (raw)
In-Reply-To: <20140117041430.GB19551@sigill.intra.peff.net>
The way the code is structured now, we have to repeat
ourselves in fetching the environment variables (which will
get annoying as we add more). Instead, let's use an
argv_array. That removes a lot of the extra conditionals
and makes it easier to add new variables.
It does means we'll leak the memory for the array, but:
1. This function is only called once per program.
2. We're now leaking heap memory instead of wasting BSS on
the static array.
Signed-off-by: Jeff King <peff@peff.net>
---
I actually think we can free pager_process.env after
start_command is run. You _cannot_ do so with argv, though,
and I'd rather leak this tiny bit than have a hard-to-track
assumption on memory lifetime buried here.
| 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
--git a/pager.c b/pager.c
index 0cc75a8..90d237e 100644
--- a/pager.c
+++ b/pager.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "run-command.h"
#include "sigchain.h"
+#include "argv-array.h"
#ifndef DEFAULT_PAGER
#define DEFAULT_PAGER "less"
@@ -63,6 +64,7 @@ const char *git_pager(int stdout_is_tty)
void setup_pager(void)
{
const char *pager = git_pager(isatty(1));
+ struct argv_array env = ARGV_ARRAY_INIT;
if (!pager || pager_in_use())
return;
@@ -80,17 +82,13 @@ void setup_pager(void)
pager_process.use_shell = 1;
pager_process.argv = pager_argv;
pager_process.in = -1;
- if (!getenv("LESS") || !getenv("LV")) {
- static const char *env[3];
- int i = 0;
-
- if (!getenv("LESS"))
- env[i++] = "LESS=FRSX";
- if (!getenv("LV"))
- env[i++] = "LV=-c";
- env[i] = NULL;
- pager_process.env = env;
- }
+
+ if (!getenv("LESS"))
+ argv_array_push(&env, "LESS=FRSX");
+ if (!getenv("LV"))
+ argv_array_push(&env, "LV=-c");
+ pager_process.env = argv_array_detach(&env, NULL);
+
if (start_command(&pager_process))
return;
--
1.8.5.2.500.g8060133
next prev parent reply other threads:[~2014-01-17 4:21 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 0:34 'git log' escape symbols shown as ESC[33 and ESC[m Yuri
2014-01-17 1:47 ` Jeff King
2014-01-17 2:02 ` Yuri
2014-01-17 2:13 ` Jeff King
2014-01-17 2:28 ` Yuri
2014-01-17 2:32 ` Jeff King
2014-01-17 2:46 ` Yuri
2014-01-17 2:29 ` Jonathan Nieder
2014-01-17 2:35 ` Jeff King
2014-01-17 3:21 ` Jeff King
2014-01-17 4:14 ` [PATCH 0/3] improved out-of-the-box color settings Jeff King
2014-01-17 4:21 ` Jeff King [this message]
2014-01-17 4:21 ` [PATCH 2/3] setup_pager: set MORE=R Jeff King
2014-01-17 7:26 ` Kyle J. McKay
2014-01-17 19:11 ` Junio C Hamano
2014-01-21 5:30 ` Jeff King
2014-01-21 8:42 ` Kyle J. McKay
2014-01-23 2:14 ` Jeff King
2014-01-23 17:22 ` Junio C Hamano
2014-01-17 19:17 ` Junio C Hamano
2014-01-17 19:57 ` Junio C Hamano
2014-01-17 23:42 ` Junio C Hamano
2014-01-21 6:13 ` Jeff King
2014-01-21 19:28 ` Junio C Hamano
2014-01-21 5:49 ` Jeff King
2014-01-21 19:23 ` Junio C Hamano
2014-02-04 22:12 ` Jeff King
2014-02-04 22:17 ` Junio C Hamano
2014-02-04 22:25 ` Jeff King
2014-02-04 22:45 ` Yuri
2014-02-04 22:48 ` Jeff King
2014-02-04 22:54 ` Junio C Hamano
2014-02-04 23:00 ` Yuri
2014-02-05 2:11 ` Kyle J. McKay
2014-01-17 4:24 ` [PATCH 3/3] pager: disable colors for some known-bad configurations Jeff King
2014-01-17 9:13 ` [PATCH 0/3] improved out-of-the-box color settings Yuri
2014-01-17 20:15 ` 'git log' escape symbols shown as ESC[33 and ESC[m Yuri
2014-02-05 1:24 ` Yuri
2014-02-05 1:33 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140117042101.GA23443@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=yuri@rawbw.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).