summaryrefslogtreecommitdiff
path: root/src/shared/udev-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-10-01 10:26:24 +0200
committerGitHub <noreply@github.com>2020-10-01 10:26:24 +0200
commitfabf8777051aedf0b1cdfe1d28a4c80a7f3358a4 (patch)
treee8991216eaada8db3a338881a3bba145ee583632 /src/shared/udev-util.c
parent9230f5774ad741536d15ed3f321b9b98f9a8eeae (diff)
parentb12bd993c83a1306ae3b953f089ccc63604a8f33 (diff)
downloadsystemd-fabf8777051aedf0b1cdfe1d28a4c80a7f3358a4.tar.gz
Merge pull request #17154 from keszybz/crypttab-commas
Allow escaping commas in crypttab
Diffstat (limited to 'src/shared/udev-util.c')
-rw-r--r--src/shared/udev-util.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 31fbfac9cf..1b5995c130 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -118,12 +118,13 @@ static int device_new_from_dev_path(const char *devlink, sd_device **ret_device)
assert(devlink);
- r = stat(devlink, &st);
- if (r < 0)
- return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to stat() %s: %m", devlink);
+ if (stat(devlink, &st) < 0)
+ return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno,
+ "Failed to stat() %s: %m", devlink);
if (!S_ISBLK(st.st_mode))
- return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK), "%s does not point to a block device: %m", devlink);
+ return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK),
+ "%s does not point to a block device: %m", devlink);
r = sd_device_new_from_devnum(ret_device, 'b', st.st_rdev);
if (r < 0)