qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-26 10:46:16 +02:00
Code

qi-strip-trailing-newlines-in-append-file.patch

Browse Source 
Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green 2009-01-31 17:23:29 +00:00 committed by Andy Green
parent 5ffd09774d
commit fbc7e8b244
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qiboot/src/phase2.c
View File

@ -181,6 +181,7 @@ static void do_params(unsigned initramfs_len,
(this_board->get_board_variant)(); (this_board->get_board_variant)();
const char *p; const char *p;
char * cmdline; char * cmdline;
char * p1;
struct tag *params = (struct tag *)this_board->linux_tag_placement; struct tag *params = (struct tag *)this_board->linux_tag_placement;
/* eat leading white space */ /* eat leading white space */
@ -228,6 +229,12 @@ static void do_params(unsigned initramfs_len,
cmdline += strlen(strcpy(cmdline, cmdline += strlen(strcpy(cmdline,
commandline_rootfs_append)); commandline_rootfs_append));
/* deal with any trailing newlines that hitched a ride */
p1 = cmdline + strlen(cmdline) - 1;
while (*p1 == '\n')
*p1-- = '\0';
/* /*
* if he's still holding down the UI_ACTION_SKIPKERNEL key * if he's still holding down the UI_ACTION_SKIPKERNEL key
* now we finished loading the kernel, take it to mean he wants * now we finished loading the kernel, take it to mean he wants