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: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 6440e2bf21f5800db98f82fcedff46478188674e..02174627ea889f6b550f2d4155bb2de33a321e4a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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 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);
 
 extern int git_ident_config(const char *, const char *, void *);
 extern void reset_ident_date(void);
 

diff --git a/color.c b/color.c
index 9a9261ac164f503e2a9240806f4f44bedf9b8192..d48dd947c987cdca13f103fd8b4a2e56eceab238 100644 (file)
--- a/color.c
+++ b/color.c
@@ -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)) {
        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;
                        return 1;
        }
        return 0;

diff --git a/editor.c b/editor.c
index 7519edecdc297a0c0fdbbb2f3c68cb55abf2e8b2..c65ea698eb70ec828b3b3265a5630fca664f5810 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -7,11 +7,16 @@
 #define DEFAULT_EDITOR "vi"
 #endif
 
 #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 *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;
 
        if (!editor && editor_program)
                editor = editor_program;

diff --git a/sideband.c b/sideband.c
index 1e4d684d6c5dcdeee94f6eb64cfa6e2f17d44674..6d7f943e4384fa90001fbb73cc5b63e2c0cfa639 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -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];
        struct strbuf outbuf = STRBUF_INIT;
        int retval = 0;
 
        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;
                suffix = ANSI_SUFFIX;
        else
                suffix = DUMB_SUFFIX;