]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/dissect-image: fix return value for probe_filesystem()
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 24 Nov 2017 20:31:47 +0000 (21:31 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 30 Nov 2017 19:43:25 +0000 (20:43 +0100)
blkid_new_probe_from_filename() sets errno, for example EPERM.

src/shared/dissect-image.c

index a7679a14230e6592dd745a49cf978f4f32dc15e2..3c16f60b8384b2896fe797ea955a2c7e11620b68 100644 (file)
@@ -57,9 +57,10 @@ int probe_filesystem(const char *node, char **ret_fstype) {
         const char *fstype;
         int r;
 
+        errno = 0;
         b = blkid_new_probe_from_filename(node);
         if (!b)
-                return -ENOMEM;
+                return -errno ?: -ENOMEM;
 
         blkid_probe_enable_superblocks(b, 1);
         blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);