X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Flink.c;h=a77c2e8a85b57ba4fa858378219069977002fe64;hb=4d8efdd4552874092263bf567701c3459b05a780;hp=57e35384bc5165e232854bf6d057ac52d73db0af;hpb=afaff775c12f32b7912f194e2fcc8e76b8c82572;p=libguestfs.git diff --git a/daemon/link.c b/daemon/link.c index 57e3538..a77c2e8 100644 --- a/daemon/link.c +++ b/daemon/link.c @@ -28,15 +28,12 @@ #include "actions.h" char * -do_readlink (char *path) +do_readlink (const char *path) { ssize_t r; char *ret; char link[PATH_MAX]; - NEED_ROOT (NULL); - ABS_PATH (path, NULL); - CHROOT_IN; r = readlink (path, link, sizeof link); CHROOT_OUT; @@ -62,10 +59,6 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname) char *buf_linkname; char *buf_target; - NEED_ROOT (-1); - ABS_PATH (linkname, -1); - /* but target does not need to be absolute */ - /* Prefix linkname with sysroot. */ buf_linkname = sysroot_path (linkname); if (!buf_linkname) { @@ -90,19 +83,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; } @@ -113,25 +106,25 @@ _link (const char *flag, int symbolic, const char *target, const char *linkname) } int -do_ln (char *target, char *linkname) +do_ln (const char *target, const char *linkname) { return _link (NULL, 0, target, linkname); } int -do_ln_f (char *target, char *linkname) +do_ln_f (const char *target, const char *linkname) { return _link ("-f", 0, target, linkname); } int -do_ln_s (char *target, char *linkname) +do_ln_s (const char *target, const char *linkname) { return _link ("-s", 1, target, linkname); } int -do_ln_sf (char *target, char *linkname) +do_ln_sf (const char *target, const char *linkname) { return _link ("-sf", 1, target, linkname); }