Imported Upstream version 3.14

[debian/elilo] / choosers / simple.c

diff --git a/choosers/simple.c b/choosers/simple.c
index f064e12b973ccf26b3b27b0050f37bd49400101d..d0c38f7bee6dd89098c25db1f48a4ed13ee75db0 100644 (file)
--- a/choosers/simple.c
+++ b/choosers/simple.c
@@ -41,8 +41,8 @@ static VOID
 display_label_info(CHAR16 *name)
 {
        CHAR16 *desc;
-       CHAR16 initrd_name[CMDLINE_MAXLEN];
-       CHAR16 vmcode_name[CMDLINE_MAXLEN];
+       CHAR16 initrd_name[PATHNAME_MAXLEN];
+       CHAR16 vmcode_name[PATHNAME_MAXLEN];
        CHAR16 options_tmp[CMDLINE_MAXLEN];
        CHAR16 options[CMDLINE_MAXLEN];
        CHAR16 kname[FILENAME_MAXLEN];
@@ -254,10 +254,10 @@ simple_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmdli
 #      define BOOT_IMG_STR     L"BOOT_IMAGE="
        CHAR16 buffer[CMDLINE_MAXLEN];
        CHAR16 alt_buffer[CMDLINE_MAXLEN];
-       CHAR16 initrd_name[CMDLINE_MAXLEN];
-       CHAR16 vmcode_name[CMDLINE_MAXLEN];
+       CHAR16 initrd_name[PATHNAME_MAXLEN];
+       CHAR16 vmcode_name[PATHNAME_MAXLEN];
        CHAR16 args[CMDLINE_MAXLEN];
-       CHAR16 devname[CMDLINE_MAXLEN];
+       CHAR16 devname[PATHNAME_MAXLEN];
        CHAR16 dpath[FILENAME_MAXLEN];
        CHAR16 *slash_pos, *colon_pos, *backslash_pos;
        UINTN len;
@@ -290,8 +290,9 @@ restart:
 
        if (elilo_opt.prompt) {
                console_textmode();
-               ret = select_kernel(buffer, sizeof(buffer));
+               ret = select_kernel(buffer, CMDLINE_MAXLEN);
                if (ret == -1) return -1;
+               /* this function takes really the number of bytes ... */
                argc    = argify(buffer,sizeof(buffer), argv); 
                index   = 0;
        }