public inbox for util-linux@vger.kernel.org
 help / color / mirror / Atom feed
From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 06/14] isosize: inform if file does not look like iso file system
Date: Sun, 16 Dec 2012 10:43:54 +0000	[thread overview]
Message-ID: <1355654642-22106-7-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1355654642-22106-1-git-send-email-kerolasa@iki.fi>

$ isosize /dev/urandom
isosize: /dev/urandom: might not be iso file system
-67690643227260

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 disk-utils/isosize.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 625dd42..5f1a297 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -32,6 +32,14 @@
 
 #define ISODCL(from, to) (to - from + 1)
 
+static int is_iso(int fd)
+{
+	char label[8];
+	if (pread(fd, &label, 8, 0x8000) == -1)
+		return 1;
+	return memcmp(&label, &"\1CD001\1", 8);
+}
+
 static int isonum_721(unsigned char *p)
 {
 	return ((p[0] & 0xff)
@@ -124,6 +132,8 @@ static void isosize(char *filenamep, int xflag, long divisor)
 
 	if ((fd = open(filenamep, O_RDONLY)) < 0)
 		err(EXIT_FAILURE, _("cannot open %s"), filenamep);
+	if (is_iso(fd))
+		warnx(_("%s: might not be iso file system"), filenamep);
 
 	if (lseek(fd, 16 << 11, 0) == (off_t) - 1)
 		err(EXIT_FAILURE, _("seek error on %s"), filenamep);
-- 
1.8.0.2


  parent reply	other threads:[~2012-12-16 10:44 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-16 10:43 [00/14]: pull: ipcs resubmission, bug fixes, minix todo, etc Sami Kerola
2012-12-16 10:43 ` [PATCH 01/14] docs: swapon.8 option name fix Sami Kerola
2012-12-16 10:43 ` [PATCH 02/14] ipcs: assist debugging Sami Kerola
2012-12-16 10:43 ` [PATCH 03/14] ipcs: add --human readable size conversion option Sami Kerola
2012-12-16 10:43 ` [PATCH 04/14] ipcs: add --bytes size output option Sami Kerola
2012-12-16 10:43 ` [PATCH 05/14] isosize: fix usage() -h option print out Sami Kerola
2012-12-16 10:43 ` Sami Kerola [this message]
2012-12-16 10:43 ` [PATCH 07/14] more: remove unnecessary variable Sami Kerola
2012-12-16 10:43 ` [PATCH 08/14] tunelp: deprecation: remove command from default build Sami Kerola
2012-12-16 10:43 ` [PATCH 09/14] minix: change types in header file Sami Kerola
2012-12-16 10:43 ` [PATCH 10/14] minix: use off_t, size_t, etc appropriate types Sami Kerola
2012-12-16 10:43 ` [PATCH 11/14] minix: replace magic constants with macro names Sami Kerola
2012-12-16 10:44 ` [PATCH 12/14] docs: add missing exit value to fsck.minix(8) Sami Kerola
2012-12-16 10:44 ` [PATCH 13/14] lib/ismounted: detect loopback mounts Sami Kerola
2012-12-19 13:38   ` Karel Zak
2012-12-16 10:44 ` [PATCH 14/14] docs: fsck(8), mkfs(8): update manual references Sami Kerola
2012-12-19 13:54   ` Karel Zak
2012-12-19 14:29 ` [00/14]: pull: ipcs resubmission, bug fixes, minix todo, etc Karel Zak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355654642-22106-7-git-send-email-kerolasa@iki.fi \
    --to=kerolasa@iki.fi \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox