From: ianmdlvl <ianmdlvl>
Date: Wed, 23 May 2007 18:42:45 +0000 (+0000)
Subject: * summer works even if passed multiple option-containing args.
X-Git-Tag: debian_version_4_1_19~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=e2ce6698329809a11a59e1c3054acce472e766c4

* summer works even if passed multiple option-containing args.
* workaround for nettle bug, supply -lgmp if -lnettle.
---

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 6438c98..01f375d 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -48,10 +48,10 @@ xacpi-simple:	xacpi-simple.o
 		$(CC) -o $@ $< -L/usr/X11R6/lib -lX11 -lm
 
 summer:		summer.o
-		$(CC) -o $@ $< -lnettle
+		$(CC) -o $@ $< -lnettle -lgmp
 
 watershed:	watershed.o
-		$(CC) -o $@ $< -lnettle
+		$(CC) -o $@ $< -lnettle -lgmp
 
 install:		all
 		$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
diff --git a/cprogs/summer.c b/cprogs/summer.c
index 3970c36..1241921 100644
--- a/cprogs/summer.c
+++ b/cprogs/summer.c
@@ -361,7 +361,7 @@ int main(int argc, const char *const *argv) {
 
   errfile= stderr;
   
-  if ((arg=argv[1]) && *arg++=='-') {
+  while ((arg=argv[1]) && *arg++=='-') {
     while ((c=*arg++)) {
       switch (c) {
       case 'h':
diff --git a/debian/changelog b/debian/changelog
index 2c8e55c..59651bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (4.1.18) unstable; urgency=low
+
+  * summer works even if passed multiple option-containing args.
+  * workaround for nettle bug, supply -lgmp if -lnettle.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Wed, 23 May 2007 19:42:05 +0100
+
 chiark-utils (4.1.17) unstable; urgency=low
 
   * summer has new -M (do not print mtimes) option.