X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=b9db7f1047ab8c6e31b970a63cb9188c7b6a3ef3;hb=d01efa07444e49aafd78e0aa822168da688d53f5;hp=00d2d44993d3711adfc2b244e994360d1f2a8912;hpb=2695c5c44e028d1bc07404baf3357e5a6017fc57;p=elogind.git diff --git a/src/shared/path-util.c b/src/shared/path-util.c index 00d2d4499..b9db7f104 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -560,14 +560,14 @@ int path_is_os_tree(const char *path) { int r; /* We use /usr/lib/os-release as flag file if something is an OS */ - p = strappenda(path, "/usr/lib/os-release"); + p = strjoina(path, "/usr/lib/os-release"); r = access(p, F_OK); if (r >= 0) return 1; /* Also check for the old location in /etc, just in case. */ - p = strappenda(path, "/etc/os-release"); + p = strjoina(path, "/etc/os-release"); r = access(p, F_OK); return r >= 0; @@ -665,7 +665,7 @@ int fsck_exists(const char *fstype) { const char *checker; int r; - checker = strappenda("fsck.", fstype); + checker = strjoina("fsck.", fstype); r = find_binary(checker, true, &p); if (r < 0)