summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2006-06-07 14:25:22 +0000
committerMike Frysinger2006-06-07 14:25:22 +0000
commitea93f8a397772e515fb54f6051836218112abf3f (patch)
tree6ff51544e3039a24f96419176fd99b78dc6f2339
parente0387a6ee80626bae7c56f9c88253201d1cf0833 (diff)
downloadbusybox-ea93f8a397772e515fb54f6051836218112abf3f.zip
busybox-ea93f8a397772e515fb54f6051836218112abf3f.tar.gz
Tito writes: this patch fixes two potential bugs with the -i -I flags that could be reset during option parsing
-rw-r--r--miscutils/hdparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 5ac7bdc..5703ece 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -2122,8 +2122,8 @@ int hdparm_main(int argc, char **argv)
while ((c = getopt(argc, argv, hdparm_options)) >= 0) {
flagcount++;
if (c == 'h') bb_show_usage(); /* EXIT */
- USE_FEATURE_HDPARM_GET_IDENTITY(get_IDentity = (c == 'I'));
- USE_FEATURE_HDPARM_GET_IDENTITY(get_identity = (c == 'i'));
+ USE_FEATURE_HDPARM_GET_IDENTITY(get_IDentity |= (c == 'I'));
+ USE_FEATURE_HDPARM_GET_IDENTITY(get_identity |= (c == 'i'));
get_geom |= (c == 'g');
do_flush |= (c == 'f');
if (c == 'u') parse_opts(&get_unmask, &set_unmask, &unmask, 0, 1);