path-util: allow NULLs in arguments to path_join()

This removes the need to remember to put strempty() in places, thus reducing
the likelihood of a stupid mistake.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 6a2a2055c7..675746a944 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -216,7 +216,7 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p
                                 p2 = path_startswith(path, *dir);
                                 if (p2) {
                                         /* Our new entry has higher priority */
-                                        t = path_join(strempty(root), path);
+                                        t = path_join(root, path);
                                         if (!t)
                                                 return log_oom();
 
@@ -232,7 +232,7 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p
                 /* … we are not there yet, let's continue */
         }
 
-        t = path_join(strempty(root), path);
+        t = path_join(root, path);
         if (!t)
                 return log_oom();
 
@@ -318,7 +318,7 @@ int conf_files_list_with_replacement(
                 if (r < 0)
                         return log_error_errno(r, "Failed to extend config file list: %m");
 
-                p = path_join(strempty(root), replacement);
+                p = path_join(root, replacement);
                 if (!p)
                         return log_oom();
         }