[systemd-commits] src/fstab-generator

Lennart Poettering lennart at kemper.freedesktop.org
Mon Mar 25 12:14:35 PDT 2013


 src/fstab-generator/fstab-generator.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b036593b76614dd05942a78120c151161cccc0f
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date:   Mon Mar 25 21:10:29 2013 +0200

    fstab-generator: add missing strempty() calls

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 7f065eb..9754f3a 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;



More information about the systemd-commits mailing list