From: Francesco Cosoleto <cosoleto@gmail.com>
Date: Thu, 22 Dec 2011 14:53:25 +0000 (+0100)
Subject: fdisk: fix incorrect position of is_ide_cdrom_or_tape() call
X-Git-Tag: v2.21-rc1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c48d37192c5a851df9667c3faf75b644c509e98;p=thirdparty%2Futil-linux.git

fdisk: fix incorrect position of is_ide_cdrom_or_tape() call

Reported-by: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index d967d27330..8c143c3138 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2827,7 +2827,8 @@ print_all_partition_table_from_option(void)
 		if (is_whole_disk(devname)) {
 			char *cn = canonicalize_path(devname);
 			if (cn) {
-				print_partition_table_from_option(cn);
+				if (!is_ide_cdrom_or_tape(cn))
+					print_partition_table_from_option(cn);
 				free(cn);
 			}
 		}
@@ -3036,8 +3037,7 @@ main(int argc, char **argv) {
 			dummy(&k);
 			listing = 1;
 			for (k = optind; k < argc; k++)
-				if (!is_ide_cdrom_or_tape(argv[k]))
-					print_partition_table_from_option(argv[k]);
+				print_partition_table_from_option(argv[k]);
 		} else
 			print_all_partition_table_from_option();
 		exit(0);