From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55149 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTzkA-0003zs-Td for qemu-devel@nongnu.org; Sat, 18 Dec 2010 11:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTzk1-0004pC-Q4 for qemu-devel@nongnu.org; Sat, 18 Dec 2010 11:34:43 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:56156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTzk1-0004nB-Fl for qemu-devel@nongnu.org; Sat, 18 Dec 2010 11:34:41 -0500 From: Stefan Weil Date: Sat, 18 Dec 2010 17:34:26 +0100 Message-Id: <1292690066-4937-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1292536325-12881-1-git-send-email-weil@mail.berlios.de> References: <1292536325-12881-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH v2] win32: Fix CRLF problem in make_device_config.sh List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers QEMU source code with CRLF line endings which is quite common on windows hosts fails with current make_device_config.sh. The awk script gets the name of the included file with \r, so instead of pci.mak it will search for pci.mak\r which of course does not work. Fix this by removing any \r. v2: Avoid using sub() and \r with awk because they are unsupported on some platforms. Use tr to remove \r. This new solution improves portability and was suggested by Paolo Bonzini. Signed-off-by: Stefan Weil --- make_device_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/make_device_config.sh b/make_device_config.sh index 8abadfe..596fc5b 100644 --- a/make_device_config.sh +++ b/make_device_config.sh @@ -18,7 +18,7 @@ process_includes () { f=$src while [ -n "$f" ] ; do - f=`awk '/^include / {ORS=" " ; print "'$src_dir'/" $2}' $f` + f=`tr -d '\r' < $f | awk '/^include / {ORS=" "; print "'$src_dir'/" $2}'` [ $? = 0 ] || exit 1 all_includes="$all_includes $f" done -- 1.7.2.3