From: ian <ian>
Date: Wed, 3 Feb 1999 22:25:57 +0000 (+0000)
Subject: Fixed misdequoting of \<newline> in "-quoted strings; Removed -Werror by default... 
X-Git-Tag: debian_version_0_60_3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=commitdiff_plain;h=3d807a2dbb651589be1aaea2646cd624bb03b599

Fixed misdequoting of \<newline> in "-quoted strings; Removed -Werror by default.  (Bug#32758, Bug#32747).
---

diff --git a/Makefile.in b/Makefile.in
index 6bf4ea4..593daec 100644
--- 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 a97feae..2c7bb2d 100644
--- 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 7103584..d3dcb67 100644
--- 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 ad0829d..b00baac 100644
--- 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');
       }
     }
   }