From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 21 Nov 2008 04:02:02 +0000 (+0100)
Subject: vol_id: if regular files are probed, use stat() for the size value
X-Git-Tag: 174~1294
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=405d2830431742ca156833edd1f868ede015c83b;p=systemd

vol_id: if regular files are probed, use stat() for the size value
---

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index a50560c0..889bd348 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -31,6 +31,7 @@
 #include <grp.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 
@@ -214,9 +215,17 @@ int main(int argc, char *argv[])
 	}
 
 	if (size == 0) {
-		if (ioctl(fd, BLKGETSIZE64, &size) != 0)
-			size = 0;
-		info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+		if (ioctl(fd, BLKGETSIZE64, &size) == 0) {
+			info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+		} else {
+			struct stat statbuf;
+
+			if (fstat(fd, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
+				size = statbuf.st_size;
+			else
+				size = 0;
+			info(udev_ctx, "stat=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+		}
 	}
 
 	/* try to drop all privileges before reading disk content */