undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor "dumb" terminal determination

Browse Source 
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: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Schneider 2017-11-29 15:37:51 +01:00 committed by Junio C Hamano
parent 5a1f5c3060
commit a64f213d3f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -1438,6 +1438,7 @@ extern const char *ident_default_name(void);
extern const char *ident_default_email(void); extern const char *ident_default_email(void);
extern const char *git_editor(void); extern const char *git_editor(void);
extern const char *git_pager(int stdout_is_tty); 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 int git_ident_config(const char *, const char *, void *);
extern void reset_ident_date(void); extern void reset_ident_date(void);

3
color.c
View File

@ -329,8 +329,7 @@ static int check_auto_color(void)
if (color_stdout_is_tty < 0) if (color_stdout_is_tty < 0)
color_stdout_is_tty = isatty(1); color_stdout_is_tty = isatty(1);
if (color_stdout_is_tty || (pager_in_use() && pager_use_color)) { if (color_stdout_is_tty || (pager_in_use() && pager_use_color)) {
char *term = getenv("TERM"); if (!is_terminal_dumb())
if (term && strcmp(term, "dumb"))
return 1; return 1;
} }
return 0; return 0;

9
editor.c
View File

@ -7,11 +7,16 @@
#define DEFAULT_EDITOR "vi" #define DEFAULT_EDITOR "vi"
#endif #endif
int is_terminal_dumb(void)
{
const char *terminal = getenv("TERM");
return !terminal || !strcmp(terminal, "dumb");
}
const char *git_editor(void) const char *git_editor(void)
{ {
const char *editor = getenv("GIT_EDITOR"); const char *editor = getenv("GIT_EDITOR");
const char *terminal = getenv("TERM"); int terminal_is_dumb = is_terminal_dumb();
int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
if (!editor && editor_program) if (!editor && editor_program)
editor = editor_program; editor = editor_program;

5
sideband.c
View File

@ -20,13 +20,12 @@
int recv_sideband(const char *me, int in_stream, int out) int recv_sideband(const char *me, int in_stream, int out)
{ {
const char *term, *suffix; const char *suffix;
char buf[LARGE_PACKET_MAX + 1]; char buf[LARGE_PACKET_MAX + 1];
struct strbuf outbuf = STRBUF_INIT; struct strbuf outbuf = STRBUF_INIT;
int retval = 0; int retval = 0;
term = getenv("TERM"); if (isatty(2) && !is_terminal_dumb())
if (isatty(2) && term && strcmp(term, "dumb"))
suffix = ANSI_SUFFIX; suffix = ANSI_SUFFIX;
else else
suffix = DUMB_SUFFIX; suffix = DUMB_SUFFIX;