shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-11-01 00:51:08 +03:00
Code

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

Browse Source
This commit is contained in:
Kay Sievers 2008-11-21 05:02:02 +01:00
parent 2b22881cae
commit 405d283043
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extras/volume_id/vol_id.c
View File

@ -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 */