Fixed misdequoting of \<newline> in "-quoted strings; Removed -Werror by default...

diff --git a/Makefile.in b/Makefile.in
index 6bf4ea49dc672e353294080f66646307b0fa8387..593daec90c824db00fb576e5e125fd3d8a096b9a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ VERSION=@VERSION@
 VEREXT=std
 
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"'
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ $(XLDLIBS)

diff --git a/configure.in b/configure.in
index a97feaef3e4aafe8f69f0a15d22a2f8bc530256e..2c7bb2d25c276e5e1684458f5dab6e52893d473b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -142,7 +142,7 @@ DPKG_C_GCC_TRY_WARNS(-Wpointer-arith, dpkg_cv_c_gcc_warn_pointerarith)
 DPKG_C_GCC_TRY_WARNS(-Wimplicit -Wnested-externs, dpkg_cv_c_gcc_warn_implicit)
 
 if test "${GCC-no}" = yes; then
- CWARNS="${CWARNS} -Wmissing-prototypes -Wstrict-prototypes -Werror"
+ CWARNS="${CWARNS} -Wmissing-prototypes -Wstrict-prototypes"
 fi
 [CFLAGS="`echo $CFLAGS $CWARNS | sed -e 's/-O[0-9]*/$(OPTIMISE)/'`"]
 

diff --git a/debian/changelog b/debian/changelog
index 71035842df2b3615fa1609bce20dfae4296e5cc6..d3dcb67ccafb47e35180a8f8e6967989cd3a4f7d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userv (0.60.3) frozen unstable; urgency=medium
+
+  * Fixed misdequoting of \<newline> in "-quoted strings.
+  * Removed -Werror by default.  (Bug#32758, Bug#32747)
+
+ -- Ian Jackson <ian@chiark.greenend.org.uk>  Wed,  3 Feb 1999 22:24:33 +0000
+
 userv (0.60.2) frozen unstable; urgency=high
 
   * Fixed failure to save pathnames in a couple of places in parser.c.
@@ -33,7 +40,7 @@ userv (0.60.2) frozen unstable; urgency=high
 
   * Debian package description mentions use by system admin.
 
- -- 
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat, 30 Jan 1999 23:38:17 +0000
 
 
 *** Main changelog file included here - see far down this file for the

diff --git a/parser.c b/parser.c
index ad0829d6911ce669384b0c908e4d4e7b5851f7e2..b00baac7dc75a7983af9595d8a0c35aa385250fd 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -179,7 +179,7 @@ static int dequote(char *inplace) {
         *q++= *p++; continue;
       } else {
        while (*p==' ' || *p=='\t') p++;
-       assert(*p=='\n');
+       v= *p++; assert(v=='\n');
       }
     }
   }