util: rework strappenda(), and rename it strjoina()

[elogind.git] / src / fstab-generator / fstab-generator.c

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index bc4c1556ca467c26ea3236f03448e2a66b3d2290..5662b5fde124b34f40c4b20f9176adc4b147fc71 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -404,7 +404,7 @@ static int add_root_mount(void) {
                 opts = arg_root_rw > 0 ? "rw" : "ro";
         else if (arg_root_rw >= 0 ||
                  !fstab_test_option(arg_root_options, "ro\0" "rw\0"))
                 opts = arg_root_rw > 0 ? "rw" : "ro";
         else if (arg_root_rw >= 0 ||
                  !fstab_test_option(arg_root_options, "ro\0" "rw\0"))

-                opts = strappenda(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+                opts = strjoina(arg_root_options, ",", arg_root_rw > 0 ? "rw" : "ro");

         else
                 opts = arg_root_options;
 
         else
                 opts = arg_root_options;
 


@@ -461,7 +461,7 @@ static int add_usr_mount(void) {
         if (!arg_usr_options)
                 opts = arg_root_rw > 0 ? "rw" : "ro";
         else if (!fstab_test_option(arg_usr_options, "ro\0" "rw\0"))
         if (!arg_usr_options)
                 opts = arg_root_rw > 0 ? "rw" : "ro";
         else if (!fstab_test_option(arg_usr_options, "ro\0" "rw\0"))

-                opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");
+                opts = strjoina(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro");

         else
                 opts = arg_usr_options;
 
         else
                 opts = arg_usr_options;