summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2013-10-18 10:37:53 +0200
committerMark Wielaard <mjw@redhat.com>2013-10-18 10:38:00 +0200
commit4f7673f97b5d09db2bc216cc3c46b96e999c15f2 (patch)
treea737b34c8aabd25b67ea9189badde1ddaf19e166
parent93b0e0172deeba198a7910ad73187256f9d433b7 (diff)
downloadelfutils-4f7673f97b5d09db2bc216cc3c46b96e999c15f2.tar.gz
ar: Correct operation check when instance_specifed is set.
Reported-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Mark Wielaard <mjw@redhat.com>
-rw-r--r--src/ChangeLog4
-rw-r--r--src/ar.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e538a577..72f99245 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-18 Mark Wielaard <mjw@redhat.com>
+
+ * ar.c (main): Correct operation check when instance_specifed is set.
+
2013-09-26 Petr Machata <pmachata@redhat.com>
* readelf.c (handle_file_note): New function.
diff --git a/src/ar.c b/src/ar.c
index 2d6ad60c..f51f0efd 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -202,7 +202,7 @@ MEMBER parameter required for 'a', 'b', and 'i' modifiers"));
if (instance_specifed)
{
/* Only valid for certain operations. */
- if (operation == oper_extract && operation == oper_delete)
+ if (operation != oper_extract && operation != oper_delete)
error (1, 0, gettext ("\
'N' is only meaningful with the 'x' and 'd' options"));