From a8f0f5120b69e02eff5337932b92771363d159a5 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Tue, 10 May 2011 21:42:52 +0000
Subject: Fix compilation error due to non-unix style line endings in
 cmos.layout file while generating option_table.h.

Windows, Mac and *nix type line endings are now taken care of.

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6563 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 util/options/build_opt_tbl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c
index cbba80dcb7..b89bb4f1d5 100644
--- a/util/options/build_opt_tbl.c
+++ b/util/options/build_opt_tbl.c
@@ -276,6 +276,7 @@ int main(int argc, char **argv)
 	int enum_length;
 	int len;
 	char buf[16];
+	char val;
 
         for(i=1;i<argc;i++) {
                 if(argv[i][0]!='-') {
@@ -371,8 +372,9 @@ int main(int argc, char **argv)
 		}
 
 		/* skip commented and blank lines */
-		if(line[0]=='#') continue;
-		if(line[strspn(line," ")]=='\n') continue;
+		val = line[strspn(line," ")];
+		/* takes care of *nix, Mac and Windows line ending formats */
+		if (val=='#' || val=='\n' || val=='\r') continue;
 		/* scan in the input data */
 		sscanf(line,"%d %d %c %d %s",
 			&ce->bit,&ce->length,&uc,&ce->config_id,&ce->name[0]);
-- 
cgit v1.2.3