git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for version 1.0.70.
[libguestfs.git]
/
daemon
/
link.c
diff --git
a/daemon/link.c
b/daemon/link.c
index
57e3538
..
a77c2e8
100644
(file)
--- a/
daemon/link.c
+++ b/
daemon/link.c
@@
-28,15
+28,12
@@
#include "actions.h"
char *
#include "actions.h"
char *
-do_readlink (char *path)
+do_readlink (c
onst c
har *path)
{
ssize_t r;
char *ret;
char link[PATH_MAX];
{
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;
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;
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) {
/* 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,
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,
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",
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;
}
free (err);
return -1;
}
@@
-113,25
+106,25
@@
_link (const char *flag, int symbolic, const char *target, const char *linkname)
}
int
}
int
-do_ln (c
har *target,
char *linkname)
+do_ln (c
onst char *target, const
char *linkname)
{
return _link (NULL, 0, target, linkname);
}
int
{
return _link (NULL, 0, target, linkname);
}
int
-do_ln_f (c
har *target,
char *linkname)
+do_ln_f (c
onst char *target, const
char *linkname)
{
return _link ("-f", 0, target, linkname);
}
int
{
return _link ("-f", 0, target, linkname);
}
int
-do_ln_s (c
har *target,
char *linkname)
+do_ln_s (c
onst char *target, const
char *linkname)
{
return _link ("-s", 1, target, linkname);
}
int
{
return _link ("-s", 1, target, linkname);
}
int
-do_ln_sf (c
har *target,
char *linkname)
+do_ln_sf (c
onst char *target, const
char *linkname)
{
return _link ("-sf", 1, target, linkname);
}
{
return _link ("-sf", 1, target, linkname);
}