From: Mantas Mikulėnas <grawity@gmail.com>
Date: Mon, 25 Mar 2013 19:10:29 +0000 (+0200)
Subject: fstab-generator: add missing strempty() calls
X-Git-Tag: v199~32
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1b036593b76614dd05942a78120c151161cccc0f;p=elogind.git

fstab-generator: add missing strempty() calls
---

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 7f065eb35..9754f3a69 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -403,7 +403,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
                 if (errno == ENOENT)
                         return 0;
 
-                log_error("Failed to open %s/etc/fstab: %m", prefix);
+                log_error("Failed to open %s/etc/fstab: %m", strempty(prefix));
                 return -errno;
         }
 
@@ -415,7 +415,7 @@ static int parse_fstab(const char *prefix, bool initrd) {
                         continue;
 
                 what = fstab_node_to_udev_node(me->mnt_fsname);
-                where = strjoin(prefix, me->mnt_dir, NULL);
+                where = strjoin(strempty(prefix), me->mnt_dir, NULL);
                 if (!what || !where) {
                         r = log_oom();
                         goto finish;