Add more ANSI colors to libzfs
Signed-off-by: Ethan Coe-Renner <coerenner1@llnl.gov> Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
This commit is contained in:
parent
b15ab50c4d
commit
564e6a3d23
|
@ -169,10 +169,16 @@ struct zfs_cmd;
|
||||||
/*
|
/*
|
||||||
* List of colors to use
|
* List of colors to use
|
||||||
*/
|
*/
|
||||||
|
#define ANSI_BLACK "\033[0;30m"
|
||||||
#define ANSI_RED "\033[0;31m"
|
#define ANSI_RED "\033[0;31m"
|
||||||
#define ANSI_GREEN "\033[0;32m"
|
#define ANSI_GREEN "\033[0;32m"
|
||||||
#define ANSI_YELLOW "\033[0;33m"
|
#define ANSI_YELLOW "\033[0;33m"
|
||||||
#define ANSI_BLUE "\033[0;34m"
|
#define ANSI_BLUE "\033[0;34m"
|
||||||
|
#define ANSI_BOLD_BLUE "\033[1;34m" /* light blue */
|
||||||
|
#define ANSI_MAGENTA "\033[0;35m"
|
||||||
|
#define ANSI_CYAN "\033[0;36m"
|
||||||
|
#define ANSI_GRAY "\033[0;37m"
|
||||||
|
|
||||||
#define ANSI_RESET "\033[0m"
|
#define ANSI_RESET "\033[0m"
|
||||||
#define ANSI_BOLD "\033[1m"
|
#define ANSI_BOLD "\033[1m"
|
||||||
|
|
||||||
|
|
|
@ -55,10 +55,10 @@
|
||||||
#define ZDIFF_REMOVED '-'
|
#define ZDIFF_REMOVED '-'
|
||||||
#define ZDIFF_RENAMED "R"
|
#define ZDIFF_RENAMED "R"
|
||||||
|
|
||||||
#define ZDIFF_ADDED_COLOR ANSI_GREEN
|
#define ZDIFF_ADDED_COLOR ANSI_GREEN
|
||||||
#define ZDIFF_MODIFIED_COLOR ANSI_YELLOW
|
#define ZDIFF_MODIFIED_COLOR ANSI_YELLOW
|
||||||
#define ZDIFF_REMOVED_COLOR ANSI_RED
|
#define ZDIFF_REMOVED_COLOR ANSI_RED
|
||||||
#define ZDIFF_RENAMED_COLOR ANSI_BLUE
|
#define ZDIFF_RENAMED_COLOR ANSI_BOLD_BLUE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Given a {dsname, object id}, get the object path
|
* Given a {dsname, object id}, get the object path
|
||||||
|
|
|
@ -2011,10 +2011,11 @@ use_color(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* color_start() and color_end() are used for when you want to colorize a block
|
* The functions color_start() and color_end() are used for when you want
|
||||||
* of text. For example:
|
* to colorize a block of text.
|
||||||
*
|
*
|
||||||
* color_start(ANSI_RED_FG)
|
* For example:
|
||||||
|
* color_start(ANSI_RED)
|
||||||
* printf("hello");
|
* printf("hello");
|
||||||
* printf("world");
|
* printf("world");
|
||||||
* color_end();
|
* color_end();
|
||||||
|
@ -2022,7 +2023,7 @@ use_color(void)
|
||||||
void
|
void
|
||||||
color_start(const char *color)
|
color_start(const char *color)
|
||||||
{
|
{
|
||||||
if (use_color()) {
|
if (color && use_color()) {
|
||||||
fputs(color, stdout);
|
fputs(color, stdout);
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
|
@ -2038,7 +2039,9 @@ color_end(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* printf() with a color. If color is NULL, then do a normal printf. */
|
/*
|
||||||
|
* printf() with a color. If color is NULL, then do a normal printf.
|
||||||
|
*/
|
||||||
int
|
int
|
||||||
printf_color(const char *color, const char *format, ...)
|
printf_color(const char *color, const char *format, ...)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue