1) changed popt's ternary operator to work properlyr2-4-9r2-4-8r2-4-7r2-4-6r2-4-5r2-4-4r2-4-3r1-0

2) popt doesn't take \ at the end of a line as a newline
3) fixed --scripts in rpmpopt to take advantage of #1

svn path=/trunk/; revision=28

1 files changed, 2 insertions, 1 deletions

diff --git a/support/popt.c b/support/popt.c
index bc24b9b..d4dee02 100644
--- a/support/popt.c
+++ b/support/popt.c
@@ -451,7 +451,8 @@ int poptReadConfigFile(poptContext con, char * fn) {
 	    *dst++ = *chptr++;
 	    if (chptr < end) {
 		if (*chptr == '\n') 
-		    *(dst - 1) = *chptr++;
+		    dst--, chptr++;	
+		    /* \ at the end of a line does not insert a \n */
 		else
 		    *dst++ = *chptr++;
 	    }