svn commit: trunk/busybox/miscutils

[vapier at busybox.net]

Author: vapier
Date: 2006-06-07 07:25:22 -0700 (Wed, 07 Jun 2006)
New Revision: 15307

Log:
Tito writes: this patch fixes two potential bugs with the -i -I flags that could be reset during option parsing


Modified:
   trunk/busybox/miscutils/hdparm.c


Changeset:
Modified: trunk/busybox/miscutils/hdparm.c
===================================================================
--- trunk/busybox/miscutils/hdparm.c	2006-06-07 14:18:51 UTC (rev 15306)
+++ trunk/busybox/miscutils/hdparm.c	2006-06-07 14:25:22 UTC (rev 15307)
@@ -2122,8 +2122,8 @@
 	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);