From b9488568314f25ccaf9e1b819e80ccfb99ac7613 Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Thu, 7 Apr 2005 11:13:55 +0000 Subject: fix text mode --- bootsplash.spec | 5 ++++- fb/fbmenu.c | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bootsplash.spec b/bootsplash.spec index 2ed0de2..5ef96f9 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,5 +1,5 @@ %define name bootsplash -%define version 3.1.7 +%define version 3.1.8 %define release 1mdk %define _bootdir /boot @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Thu Apr 07 2005 Warly 3.1.8-1mdk +- fix text mode + * Wed Apr 06 2005 Warly 3.1.7-1mdk - Now fbmenu check that there are no duplicate entries diff --git a/fb/fbmenu.c b/fb/fbmenu.c index 850cd11..7773da1 100644 --- a/fb/fbmenu.c +++ b/fb/fbmenu.c @@ -168,19 +168,19 @@ int main(int argc, char **argv) { exit(0); } - fb = open("/dev/fb0",O_RDWR); - if (-1 == fb && getenv("DISPLAY") == NULL) { + fb = open("/dev/fb0", O_RDWR); + if (fb == -1) { signal(SIGALRM, return_default); alarm(atoi(argv[1])); do { fprintf(stderr,"\n"); - for (i = 0; i < nargc; i++) { - fprintf(stderr,"%d - %s\n", i + 1, nargv[i]); + for (i = 1; i <= nargc; i++) { + fprintf(stderr,"%d - %s\n", i, nargv[i]); } fprintf(stderr,"\n%s: ", argv[title]); if (!scanf("%d", &i)) scanf("%*s"); } while (i < 1 || i > nargc); - printf("\nRESULT=\"%s\"\n", nargv[i - 1]); + printf("\nRESULT=\"%s\"\n", nargv[i]); } else { gtk_init (&argc, &argv); do_button_box(window, nargc + 1, nargv); -- cgit v1.2.1