diff options
| author | Ondrej Oprala | 2014-01-23 13:03:45 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-11 09:38:09 +0100 |
| commit | d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c (patch) | |
| tree | e3022408c0a770a666be7ff829e3f9291883cf59 /include | |
| parent | tests: check commands needed for running a test exist (diff) | |
| download | kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.gz kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.xz kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.zip | |
lib/colors: check for /etc/terminal-colors.d/[util].disable
[kzak@redhat.com: - move paths to pathnames.h,
- use static path buffer]
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/colors.h | 5 | ||||
| -rw-r--r-- | include/pathnames.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/colors.h b/include/colors.h index 16db01075..42881d5e3 100644 --- a/include/colors.h +++ b/include/colors.h @@ -43,6 +43,7 @@ enum colortmode { UL_COLORMODE_AUTO = 0, UL_COLORMODE_NEVER, UL_COLORMODE_ALWAYS, + UL_COLORMODE_UNDEF, __UL_NCOLORMODES /* last */ }; @@ -50,8 +51,8 @@ enum colortmode { extern int colormode_from_string(const char *str); extern int colormode_or_err(const char *str, const char *errmsg); -/* Initialize the global variable OUT_IS_TERM */ -extern int colors_init(int mode); +/* Initialize the global variable UL_COLOR_TERM_OK */ +extern int colors_init(int mode, const char *util_name); /* Returns 1 or 0 */ extern int colors_wanted(void); diff --git a/include/pathnames.h b/include/pathnames.h index 2957dacb5..94cc412a7 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -50,6 +50,9 @@ #define _PATH_SECURE "/etc/securesingle" #define _PATH_USERTTY "/etc/usertty" +#define _PATH_TERMCOLORS_DIR "/etc/terminal-colors.d/" +#define _PATH_TERMCOLORS_DISABLE _PATH_TERMCOLORS_DIR "disable" + /* used in login-utils/shutdown.c */ /* used in login-utils/setpwnam.h and login-utils/islocal.c */ |