tree-wide: rename path_join_many() to path_join()

$ git grep -e path_join_many -l|xargs sed -r -i 's/path_join_many/path_join/g'

The two test functions are merged into one.

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_many(strempty(root), path);
+                                        t = path_join(strempty(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_many(strempty(root), path);
+        t = path_join(strempty(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_many(strempty(root), replacement);
+                p = path_join(strempty(root), replacement);
                 if (!p)
                         return log_oom();
         }

src/basic/path-util.c

@@ -110,7 +110,7 @@ int path_make_absolute_cwd(const char *p, char **ret) {
                 if (r < 0)
                         return r;
 
-                c = path_join_many(cwd, p);
+                c = path_join(cwd, p);
         }
         if (!c)
                 return -ENOMEM;
@@ -481,7 +481,7 @@ bool path_equal_or_files_same(const char *a, const char *b, int flags) {
         return path_equal(a, b) || files_same(a, b, flags) > 0;
 }
 
-char* path_join_many_internal(const char *first, ...) {
+char* path_join_internal(const char *first, ...) {
         char *joined, *q;
         const char *p;
         va_list ap;
@@ -499,9 +499,9 @@ char* path_join_many_internal(const char *first, ...) {
          *
          * Examples:
          *
-         * path_join_many("foo", "bar") → "foo/bar"
-         * path_join_many("foo/", "bar") → "foo/bar"
-         * path_join_many("", "foo", "", "bar", "") → "foo/bar" */
+         * path_join("foo", "bar") → "foo/bar"
+         * path_join("foo/", "bar") → "foo/bar"
+         * path_join("", "foo", "", "bar", "") → "foo/bar" */
 
         sz = strlen(first);
         va_start(ap, first);

src/basic/path-util.h

@@ -49,8 +49,8 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
 int path_compare(const char *a, const char *b) _pure_;
 bool path_equal(const char *a, const char *b) _pure_;
 bool path_equal_or_files_same(const char *a, const char *b, int flags);
-char* path_join_many_internal(const char *first, ...) _sentinel_;
-#define path_join_many(x, ...) path_join_many_internal(x, __VA_ARGS__, NULL)
+char* path_join_internal(const char *first, ...) _sentinel_;
+#define path_join(x, ...) path_join_internal(x, __VA_ARGS__, NULL)
 
 char* path_simplify(char *path, bool kill_dots);
 

src/basic/selinux-util.c

@@ -366,7 +366,7 @@ int mac_selinux_create_file_prepare_at(int dirfd, const char *path, mode_t mode)
                 if (r < 0)
                         return r;
 
-                path = abspath = path_join_many(p, path);
+                path = abspath = path_join(p, path);
                 if (!path)
                         return -ENOMEM;
         }