thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

cfdisk: print "wrong order" warning after startup, colorize info messages

Browse source 
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2015-02-03 11:04:37 +01:00
parent b5ef65a931
commit f9fb8290d8
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
disk-utils/cfdisk.c
View file

@ -104,11 +104,13 @@ enum {
CFDISK_CL_NONE = 0, CFDISK_CL_NONE = 0,
CFDISK_CL_WARNING, CFDISK_CL_WARNING,
CFDISK_CL_FREESPACE, CFDISK_CL_FREESPACE,
CFDISK_CL_INFO
}; };
static const int color_pairs[][2] = { static const int color_pairs[][2] = {
/* color foreground, background */ /* color foreground, background */
[CFDISK_CL_WARNING] = { COLOR_RED, -1 }, [CFDISK_CL_WARNING] = { COLOR_RED, -1 },
[CFDISK_CL_FREESPACE] = { COLOR_GREEN, -1 } [CFDISK_CL_FREESPACE] = { COLOR_GREEN, -1 },
[CFDISK_CL_INFO] = { COLOR_BLUE, -1 }
}; };
struct cfdisk; struct cfdisk;
@ -673,7 +675,9 @@ static void ui_info(const char *fmt, ...)
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
if (ui_enabled) if (ui_enabled)
ui_vprint_center(INFO_LINE, A_BOLD, fmt, ap); ui_vprint_center(INFO_LINE,
colors_wanted() ? COLOR_PAIR(CFDISK_CL_INFO) : 0,
fmt, ap);
else { else {
vfprintf(stdout, fmt, ap); vfprintf(stdout, fmt, ap);
fputc('\n', stdout); fputc('\n', stdout);
@ -1876,6 +1880,7 @@ static int main_menu_ignore_keys(struct cfdisk *cf, char *ignore,
if (!cf->wrong_order) if (!cf->wrong_order)
ignore[i++] = 's'; ignore[i++] = 's';
if (fdisk_is_readonly(cf->cxt)) if (fdisk_is_readonly(cf->cxt))
ignore[i++] = 'W'; ignore[i++] = 'W';
return i; return i;
@ -2109,6 +2114,8 @@ static int ui_run(struct cfdisk *cf)
if (fdisk_is_readonly(cf->cxt)) if (fdisk_is_readonly(cf->cxt))
ui_warnx(_("Device open in read-only mode.")); ui_warnx(_("Device open in read-only mode."));
else if (cf->wrong_order)
ui_info(_("Note that partition table entries are not in disk order now."));
do { do {
int key = getch(); int key = getch();