1) changed popt's ternary operator to work properly

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

diff --git a/support/popt.c b/support/popt.c
index bc24b9b..d4dee02 100644 (file)
--- 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++;
            }