Commit a64f213d authored by Lars Schneider's avatar Lars Schneider Committed by Junio C Hamano

refactor "dumb" terminal determination

Move the code to detect "dumb" terminals into a single location. This
avoids duplicating the terminal detection code yet again in a subsequent
commit.
Signed-off-by: default avatarLars Schneider <larsxschneider@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 5a1f5c30
......@@ -1438,6 +1438,7 @@ extern const char *ident_default_name(void);
extern const char *ident_default_email(void);
extern const char *git_editor(void);
extern const char *git_pager(int stdout_is_tty);
extern int is_terminal_dumb(void);
extern int git_ident_config(const char *, const char *, void *);
extern void reset_ident_date(void);
......
......@@ -329,8 +329,7 @@ static int check_auto_color(void)
if (color_stdout_is_tty < 0)
color_stdout_is_tty = isatty(1);
if (color_stdout_is_tty || (pager_in_use() && pager_use_color)) {
char *term = getenv("TERM");
if (term && strcmp(term, "dumb"))
if (!is_terminal_dumb())
return 1;
}
return 0;
......
......@@ -7,11 +7,16 @@
#define DEFAULT_EDITOR "vi"
#endif
int is_terminal_dumb(void)
{
const char *terminal = getenv("TERM");
return !terminal || !strcmp(terminal, "dumb");
}
const char *git_editor(void)
{
const char *editor = getenv("GIT_EDITOR");
const char *terminal = getenv("TERM");
int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
int terminal_is_dumb = is_terminal_dumb();
if (!editor && editor_program)
editor = editor_program;
......
......@@ -20,13 +20,12 @@
int recv_sideband(const char *me, int in_stream, int out)
{
const char *term, *suffix;
const char *suffix;
char buf[LARGE_PACKET_MAX + 1];
struct strbuf outbuf = STRBUF_INIT;
int retval = 0;
term = getenv("TERM");
if (isatty(2) && term && strcmp(term, "dumb"))
if (isatty(2) && !is_terminal_dumb())
suffix = ANSI_SUFFIX;
else
suffix = DUMB_SUFFIX;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment