X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Flink.c;h=bf616ed88aaaf20152099ae3e0bda4ef690fa649;hb=8601bbda56cdb2b8491b6e2054596ec9599c38f1;hp=57e35384bc5165e232854bf6d057ac52d73db0af;hpb=afaff775c12f32b7912f194e2fcc8e76b8c82572;p=libguestfs.git diff --git a/daemon/link.c b/daemon/link.c index 57e3538..bf616ed 100644 --- a/daemon/link.c +++ b/daemon/link.c @@ -35,7 +35,7 @@ do_readlink (char *path) char link[PATH_MAX]; NEED_ROOT (NULL); - ABS_PATH (path, NULL); + ABS_PATH (path, return NULL); CHROOT_IN; r = readlink (path, link, sizeof link); @@ -63,7 +63,7 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname) char *buf_target; NEED_ROOT (-1); - ABS_PATH (linkname, -1); + ABS_PATH (linkname, return -1); /* but target does not need to be absolute */ /* Prefix linkname with sysroot. */ @@ -90,19 +90,19 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname) if (flag) r = command (NULL, &err, - "ln", flag, "--", /* target could begin with '-' */ - buf_target ? : target, buf_linkname, NULL); + "ln", flag, "--", /* target could begin with '-' */ + buf_target ? : target, buf_linkname, NULL); else r = command (NULL, &err, - "ln", "--", - buf_target ? : target, buf_linkname, NULL); + "ln", "--", + buf_target ? : target, buf_linkname, NULL); free (buf_linkname); free (buf_target); if (r == -1) { reply_with_error ("ln%s%s: %s: %s: %s", - flag ? " " : "", - flag ? : "", - target, linkname, err); + flag ? " " : "", + flag ? : "", + target, linkname, err); free (err); return -1; }