Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux-3.3xsyslinux-3.36-pre7

11 files changed, 14 insertions, 14 deletions

diff --git a/Makefile.private b/Makefile.private
index 63a3bbdf..8573aa44 100644
--- a/Makefile.private
+++ b/Makefile.private
@@ -35,8 +35,8 @@ burn: isolinux.iso
 	cdrecord -v blank=fast isolinux.iso
 
 official:
-	$(MAKE) spotless CC='$(CC) -m32' 
-	$(MAKE) depend CC='$(CC) -m32' 
+	$(MAKE) spotless CC='$(CC) -m32'
+	$(MAKE) depend CC='$(CC) -m32'
 	$(MAKE) all CC='$(CC) -m32'
 	$(MAKE) dist CC='$(CC) -m32'
 
diff --git a/README.menu b/README.menu
index 6f0fd83c..fe4f9091 100644
--- a/README.menu
+++ b/README.menu
@@ -186,13 +186,13 @@ MENU COLOR element ansi foreground background shadow
 	represents fully transparent, and #ffffffff represents opaque
 	white.
 
-	
+
 	"shadow" controls the handling of the graphical console text
 	shadow.  Permitted values are "none" (no shadowing), "std" or
 	"standard" (standard shadowing - foreground pixels are
 	raised), "all" (both background and foreground raised), and
 	"rev" or "reverse" (background pixels are raised.)
-	
+
 
 	If any field is set to "*" or omitted (at the end of the line)
 	then that field is left unchanged.
diff --git a/TODO b/TODO
index e2aacca6..93f3194d 100644
--- a/TODO
+++ b/TODO
@@ -31,4 +31,3 @@
 - COM32-based CLI.
 
 - Rewrite the filesystems to run in protected mode C code.
-
diff --git a/abort.inc b/abort.inc
index e6bf0d52..fd136529 100644
--- a/abort.inc
+++ b/abort.inc
@@ -62,4 +62,4 @@ error_or_command:
 		mov cx,[OnerrorLen]
 		and cx,cx
 		jnz on_error
-		jmp enter_command
\ No newline at end of file
+		jmp enter_command
diff --git a/com32/lib/sys/fileread.c b/com32/lib/sys/fileread.c
index e184fc35..8fdd9167 100644
--- a/com32/lib/sys/fileread.c
+++ b/com32/lib/sys/fileread.c
@@ -46,7 +46,7 @@ ssize_t __file_read(struct file_info *fp, void *buf, size_t count)
 
   memset(&ireg, 0, sizeof ireg);
   ireg.eax.w[0] = 0x0007;	/* Read file */
-  ireg.esi.w[0] = OFFS(__com32.cs_bounce);
+  ireg.ebx.w[0] = OFFS(__com32.cs_bounce);
   ireg.es = SEG(__com32.cs_bounce);
 
   while ( count ) {
@@ -64,7 +64,7 @@ ssize_t __file_read(struct file_info *fp, void *buf, size_t count)
 	return -1;
       }
 
-      fp->i.filedes = ireg.esi.w[0];
+      fp->i.filedes = oreg.esi.w[0];
       fp->i.nbytes = min(fp->i.length-fp->i.offset, (unsigned)MAXBLOCK);
       fp->i.datap = fp->i.buf;
       memcpy(fp->i.buf, __com32.cs_bounce, fp->i.nbytes);
diff --git a/comboot.doc b/comboot.doc
index c99522ec..8aaa0e78 100644
--- a/comboot.doc
+++ b/comboot.doc
@@ -686,7 +686,7 @@ AX=0017h [3.30] Report video mode change
 	which are undefined in the current version of SYSLINUX.
 
 	The following bits in BX are currently defined:
-	
+
 	Bit 0: graphics mode
 
 		Indicates that the mode is a graphics mode, as opposed
diff --git a/comboot.inc b/comboot.inc
index fcaa3a7a..0f544c2e 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -770,7 +770,7 @@ comapi_userfont:
 .done:		; CF=0 here
 		mov P_AL,al
 		ret
-		
+
 ;
 ; INT 22h AX=0019h  Read disk
 ;
diff --git a/font.inc b/font.inc
index 04080ba7..f27f8785 100644
--- a/font.inc
+++ b/font.inc
@@ -75,7 +75,7 @@ use_font:
 
 		test byte [UsingVGA], 01h	; Are we in graphics mode?
 		jz .text
-		
+
 .graphics:
 		xor cx,cx
 		mov cl,bh			; CX = bytes/character
diff --git a/head.inc b/head.inc
index e0682b2f..17562079 100644
--- a/head.inc
+++ b/head.inc
@@ -1,6 +1,6 @@
 ; -*- fundamental -*- (asm-mode sucks)
 ; -----------------------------------------------------------------------
-;   
+;
 ;   Copyright 2006 H. Peter Anvin - All Rights Reserved
 ;
 ;   This program is free software; you can redistribute it and/or modify
diff --git a/loadhigh.inc b/loadhigh.inc
index 7d9f57a4..283778f6 100644
--- a/loadhigh.inc
+++ b/loadhigh.inc
@@ -88,7 +88,7 @@ load_high:
 		sub eax,ecx
 		pop bx				; <AA> Pausebird function
 		jnz .read_loop			; More to read...
-		
+
 
 .eof:
 		pop es				; <AAA> ES
diff --git a/unix/syslinux.c b/unix/syslinux.c
index aa6a0037..4270d728 100644
--- a/unix/syslinux.c
+++ b/unix/syslinux.c
@@ -354,7 +354,8 @@ int main(int argc, char *argv[])
 	} else if ( *opt == 'd' && argp[1] ) {
 	  subdir = *++argp;
 	} else if ( *opt == 'o' && argp[1] ) {
-	  filesystem_offset = (off_t)strtoull(*++argp, NULL, 0); /* Byte offset */
+	  /* Byte offset */
+	  filesystem_offset = (off_t)strtoull(*++argp, NULL, 0);
 	} else {
 	  usage();
 	}