Merge pull request #2596 from keszybz/move-activate-to-bin

Move activate to bin, extend --fdnames functionality
2016-02-15 14:08:28 +01:00
parent 3aa3d5d412 7f6e804332
commit 4d5d9d0011
8 changed files with 112 additions and 60 deletions
@@ -371,7 +371,7 @@ char *strv_join(char **l, const char *separator) {

        n = 0;
        STRV_FOREACH(s, l) {
-                if (n != 0)
+                if (s != l)
                        n += k;
                n += strlen(*s);
        }
@@ -382,7 +382,7 @@ char *strv_join(char **l, const char *separator) {

        e = r;
        STRV_FOREACH(s, l) {
-                if (e != r)
+                if (s != l)
                        e = stpcpy(e, separator);

                e = stpcpy(e, *s);