From: Mark Wielaard <mjw@redhat.com>
Date: Sat, 13 Feb 2016 18:56:13 +0000 (+0100)
Subject: elfcompress: -q should not imply --force.
X-Git-Tag: elfutils-0.166~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f851e6f6e2b45de961e16fb0fb95e78b2b01e7b;p=thirdparty%2Felfutils.git

elfcompress: -q should not imply --force.

We accidentally set force = true after handling -q and setting verbose--.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 297824043..debf5a42e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-13  Mark Wielaard  <mjw@redhat.com>
+
+	* elfcompress.c (parse_opt): Don't fallthrough after processing -q.
+
 2016-02-12  Mark Wielaard  <mjw@redhat.com>
 
 	* strip.c (handle_elf): Correct elf_assert shndxdata check.
diff --git a/src/elfcompress.c b/src/elfcompress.c
index 23939db8b..d0ca469c5 100644
--- a/src/elfcompress.c
+++ b/src/elfcompress.c
@@ -1,5 +1,5 @@
 /* Compress or decompress an ELF file.
-   Copyright (C) 2015 Red Hat, Inc.
+   Copyright (C) 2015, 2016 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -101,6 +101,7 @@ parse_opt (int key, char *arg __attribute__ ((unused)),
 
     case 'q':
       verbose--;
+      break;
 
     case 'f':
       force = true;