From 1b38471e5ed5a618f316be3ada5c30ccc17f1e51 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 29 Aug 2000 01:58:00 +0000
Subject: [PATCH] * kill.c (main): Avoid skipping next argument when a signal
 number is specified. * Makefile.in: Always clean dumper.exe.

---
 winsup/utils/ChangeLog   | 6 ++++++
 winsup/utils/Makefile.in | 4 +++-
 winsup/utils/kill.cc     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 877aac332..81218eed7 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 28 21:55:56 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* kill.c (main): Avoid skipping next argument when a signal number is
+	specified.
+	* Makefile.in: Always clean dumper.exe.
+
 Fri Aug 25 12:41:53 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: Only build dumper.exe when all of its library and
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 5e523c4f3..b84250da4 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -72,10 +72,12 @@ PROGS:=mount$(EXEEXT) umount$(EXEEXT) ps$(EXEEXT) kill$(EXEEXT) \
        passwd$(EXEEXT) getfacl$(EXEEXT) setfacl$(EXEEXT) strace$(EXEEXT) \
        regtool$(EXEEXT)
 
+CLEAN_PROGS:=$(PROGS)
 ifdef build_dumper
 PROGS+=dumper$(EXEEXT)
 else
 PROGS:=warn_dumper $(PROGS)
+CLEAN_PROGS+=dumper.exe
 endif
 
 .SUFFIXES:
@@ -106,7 +108,7 @@ mingw_getopt.o: $(cygwin_source)/lib/getopt.c
 	$(CC) -c -o $@ $(MINGW_CFLAGS) $^
 
 clean:
-	rm -f *.o $(PROGS)
+	rm -f *.o $(CLEAN_PROGS)
 
 realclean: clean
 	rm -f  Makefile config.cache
diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc
index 5e2a30d50..b0b9da515 100644
--- a/winsup/utils/kill.cc
+++ b/winsup/utils/kill.cc
@@ -37,7 +37,7 @@ main (int argc, char **argv)
       break;
     else if (strcmp(*argv + 1, "0") != 0)
       {
-	sig = getsig (*argv++ + 1);
+	sig = getsig (*argv + 1);
 	gotsig = 1;
       }
     else