chiark / gitweb /
util: don't specifically check for the /dev/null major/minor, just check whether...
authorLennart Poettering <lennart@poettering.net>
Fri, 8 Oct 2010 16:22:28 +0000 (18:22 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 8 Oct 2010 16:22:28 +0000 (18:22 +0200)
src/util.c

index 12c19b3..d09e447 100644 (file)
@@ -3319,10 +3319,7 @@ bool null_or_empty(struct stat *st) {
         if (S_ISREG(st->st_mode) && st->st_size <= 0)
                 return true;
 
-        /* /dev/null has major/minor of 1:3 */
-        if (S_ISCHR(st->st_mode) &&
-            major(st->st_rdev) == 1 &&
-            minor(st->st_rdev) == 3)
+        if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
                 return true;
 
         return false;