From d25f6e7c829d492a1cb62a877ceb999efcd2a128 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Sat, 1 Mar 2014 12:58:55 +0000 Subject: [PATCH] Skip blank lines in format_double_null(). Ignore blank lines when formatting, so the user doesn't need to worry about entering environment variables or dependency names in the exactly correct format. --- registry.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/registry.cpp b/registry.cpp index 1e801ee..2b111c3 100644 --- a/registry.cpp +++ b/registry.cpp @@ -392,6 +392,27 @@ int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, un } for (i = 0; i < dnlen; i++) if (dn[i] != _T('\r')) ++*newlen; + + /* Skip blank lines. */ + for (i = 0; i < dnlen; i++) { + if (dn[i] == _T('\r') && dn[i + 1] == _T('\n')) { + /* This is the last CRLF. */ + if (i >= dnlen - 2) break; + + /* + Strip at the start of the block or if the next characters are + CRLF too. + */ + if (! i || (dn[i + 2] == _T('\r') && dn[i + 3] == _T('\n'))) { + for (j = i + 2; j < dnlen; j++) dn[j - 2] = dn[j]; + dn[dnlen--] = _T('\0'); + dn[dnlen--] = _T('\0'); + i--; + --*newlen; + } + } + } + /* Must end with two NULLs. */ *newlen += 2; -- 2.7.4