From: H. Peter Anvin <hpa@zytor.com>
Date: Sat, 7 Jul 2007 01:31:12 +0000 (-0700)
Subject: fdisk: do not complain about regular files
X-Git-Tag: v2.13-rc2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bba382aafe34282797794915539225a23e11b1fc;p=thirdparty%2Futil-linux.git

fdisk: do not complain about regular files

fdisk complains that it doesn't understand regular files.  This can
be trivially fixed.

Also, modes are conventionally given in octal, not hex.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/fdisk/gpt.c b/fdisk/gpt.c
index f1d751aca3..b8f3d33d71 100644
--- a/fdisk/gpt.c
+++ b/fdisk/gpt.c
@@ -173,10 +173,12 @@ last_lba(int fd)
 	}
 	if (S_ISBLK(s.st_mode))
 		sectors = _get_num_sectors(fd);
+	else if (S_ISREG(s.st_mode))
+		sectors = s.st_size >> _get_sector_size(fd);
 	else
 	{
 		fprintf(stderr,
-			"last_lba(): I don't know how to handle files with mode %x\n",
+			"last_lba(): I don't know how to handle files with mode %o\n",
 			s.st_mode);
 		sectors = 1;
 	}