[systemd-devel] [PATCH] fstab-generator: add missing strempty() calls

[Lennart Poettering]

On Mon, 25.03.13 21:10, Mantas Mikulėnas (grawity at gmail.com) wrote:

Ouch. Applied! Thanks!

> ---
>  src/fstab-generator/fstab-generator.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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;


Lennart

-- 
Lennart Poettering - Red Hat, Inc.