search for: forceprompt

...e_t count = 0; + int retval; ldlinux_console_init(); @@ -333,16 +336,25 @@ __export int main(int argc __unused, char **argv) if (!syslinux_setadv(ADV_BOOTONCE, 0, NULL)) syslinux_adv_write(); - load_kernel(cmdline); /* Shouldn't return */ - ldlinux_enter_command(); - } - - if (!forceprompt && !shift_is_held()) - ldlinux_auto_boot(); + /* + * The corresponding longjmp is located in the execute function + * after a COM32 module has returned. + */ + retval = setjmp(__return_to_command_prompt); + if (retval == 0) + load_kernel(cmdline); /* Shouldn't return */ + }...

...------------------------------ + pc_display: call pc_getfile ; "display" command jz parse_config_2 ; File not found? call get_msg_file ; Load and display file parse_config_2: jmp parse_config pc_prompt: call getint ; "prompt" command jc parse_config_2 mov [ForcePrompt],bx jmp short parse_config_2 @@ -1454,22 +1468,25 @@ ; ; Check whether or not we are supposed to display the boot prompt. ; check_for_key: cmp word [ForcePrompt],byte 0 ; Force prompt? jnz enter_command test byte [KbdFlags],5Bh ; Caps, Scroll, Shift, Alt jz near auto_boot ; If...

From: Sylvain Gault <sylvain.gault at gmail.com> Hello there, I propose 2 patches that fix two possible stack overflows either when running a COM32 module or when loading a new config file. I didn't find a better way to do this than to use the infamous setjmp/longjmp functions to restore the stack to a previous state. This makes the logic a bit more complex, but the behavior is not

...===================================== --- syslinux-3.71-27-g3d39943.orig/core/parseconfig.inc 2008-08-31 22:45:26.000000000 +0200 +++ syslinux-3.71-27-g3d39943/core/parseconfig.inc 2008-08-31 22:45:28.000000000 +0200 @@ -463,6 +463,7 @@ CmdLinePtr dw cmd_line_here ; Command line advancing pointer ForcePrompt dw 0 ; Force prompt NoEscape dw 0 ; No escape +LabelCompl dw 0 ; Label completion on TAB key AllowImplicit dw 1 ; Allow implicit kernels AllowOptions dw 1 ; User-specified options allowed

...Command line advancing pointer initrd_flag equ $ initrd_ptr dw 0 ; Initial ramdisk pointer/flag +; begin - freddy77 + +change_disk_msg db 'Insert disk #' +initrd_span db 0 + db ' and press a key', CR, LF, 0 + +; end - freddy77 VKernelCtr dw 0 ; Number of registered vkernels ForcePrompt dw 0 ; Force prompt AllowImplicit dw 1 ; Allow implicit kernels SerialPort dw 0 ; Serial port base (or 0 for no serial port) VGAFontSize dw 16 ; Defaults to 16 byte font UserFont db 0 ; Using a user-specified font ScrollAttribute db 07h ; White on black (for text...

...Command line advancing pointer initrd_flag equ $ initrd_ptr dw 0 ; Initial ramdisk pointer/flag +; begin - freddy77 + +change_disk_msg db 'Insert disk #' +initrd_span db 0 + db ' and press a key', CR, LF, 0 + +; end - freddy77 VKernelCtr dw 0 ; Number of registered vkernels ForcePrompt dw 0 ; Force prompt AllowImplicit dw 1 ; Allow implicit kernels SerialPort dw 0 ; Serial port base (or 0 for no serial port) VGAFontSize dw 16 ; Defaults to 16 byte font UserFont db 0 ; Using a user-specified font ScrollAttribute db 07h ; White on black (for text...

....11.new/keywords.inc 2004-10-04 17:33:55.000000000 -0600 @@ -52,6 +52,7 @@ keyword implicit, pc_setint16, AllowImplicit keyword kbdmap, pc_filecmd, loadkeys keyword kernel, pc_kernel + keyword kernel64, pc_kernel64 keyword label, pc_label keyword prompt, pc_setint16, ForcePrompt keyword say, pc_say Common subdirectories: syslinux-2.11/memdisk and syslinux-2.11.new/memdisk Common subdirectories: syslinux-2.11/menu and syslinux-2.11.new/menu diff -u syslinux-2.11/parseconfig.inc syslinux-2.11.new/parseconfig.inc --- syslinux-2.11/parseconfig.inc 2003-11-26 22:36:16....

From: Matt Fleming <matt.fleming at intel.com> Here are the patches that I've got queued up based on the very helpful feedback I received from people testing Syslinux 5.00-pre9. Unless anyone has any concerns these will make it into Syslinux 5.00-pre10. Matt Fleming (9): pxe: Don't call open_config() from the pxe core ldlinux: Print a warning if no config file is found

...*dst++ = *src++; + *dst = '\0'; /* Null-terminate */ + + /* Clear the boot-once data from the ADV */ + if (!syslinux_setadv(ADV_BOOTONCE, 0, NULL)) + syslinux_adv_write(); + + load_kernel(cmdline); /* Shouldn't return */ + goto cmdline; + } + /* TODO: Check KbdFlags? */ if (forceprompt) diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index 441651e..8ded92a 100644 --- a/com32/elflink/ldlinux/readconfig.c +++ b/com32/elflink/ldlinux/readconfig.c @@ -1154,7 +1154,7 @@ static int parse_one_config(const char *filename) if (f) goto config_found...

...-242,7 +245,6 @@ int main(int argc __unused, char **argv __unused) * We apparently have a boot-once set; clear it and * then execute the boot-once. */ - const char *cmdline; char *src, *dst; size_t i; @@ -270,12 +272,14 @@ int main(int argc __unused, char **argv __unused) if (forceprompt) goto cmdline; + cmdline = default_cmd; +auto_boot: /* * Auto boot */ if (defaultlevel || noescape) { if (defaultlevel) { - load_kernel(default_cmd); /* Shouldn't return */ + load_kernel(cmdline); /* Shouldn't return */ } else { printf("No DEFAULT or UI con...

From: Matt Fleming <matt.fleming at linux.intel.com> This is a series of patches that, * shrink the core by moving things into an ldlinux ELF module * begin wiring up some of the C versions of various functions The core now only contains essential code and loads the ldlinux module to do everything else, like providing a command line interface and loading kernels. The config file parsing

...ommand(true); } for (i = 0; i < count; i++) @@ -264,37 +291,11 @@ int main(int argc __unused, char **argv __unused) syslinux_adv_write(); load_kernel(cmdline); /* Shouldn't return */ - goto cmdline; + ldlinux_enter_command(true); } /* TODO: Check KbdFlags? */ - if (forceprompt) - goto cmdline; - - cmdline = default_cmd; -auto_boot: - /* - * Auto boot - */ - if (defaultlevel || noescape) { - if (defaultlevel) { - load_kernel(cmdline); /* Shouldn't return */ - } else { - printf("No DEFAULT or UI configuration directive found!\n"); - - if (noescape)...