Make /sysroot path configurable.

Currently /sysroot is hard-coded throughout the daemon code.

This patch turns the path into a variable so that we can change
it in future, for example to allow standalone mode to be implemented.

This patch was tested by running all the C API tests successfully.

1 files changed, 2 insertions, 8 deletions

diff --git a/daemon/cpmv.c b/daemon/cpmv.c
index 5448a97a..289a2dab 100644
--- a/daemon/cpmv.c
+++ b/daemon/cpmv.c
@@ -49,7 +49,6 @@ static int
 cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
 {
   char *srcbuf, *destbuf;
-  int srclen, destlen;
   char *err;
   int r;
 
@@ -57,24 +56,19 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
   ABS_PATH (src, -1);
   ABS_PATH (dest, -1);
 
-  srclen = strlen (src) + 32;
-  srcbuf = malloc (srclen);
+  srcbuf = sysroot_path (src);
   if (srcbuf == NULL) {
     reply_with_perror ("malloc");
     return -1;
   }
 
-  destlen = strlen (dest) + 32;
-  destbuf = malloc (destlen);
+  destbuf = sysroot_path (dest);
   if (destbuf == NULL) {
     reply_with_perror ("malloc");
     free (srcbuf);
     return -1;
   }
 
-  snprintf (srcbuf, srclen, "/sysroot%s", src);
-  snprintf (destbuf, destlen, "/sysroot%s", dest);
-
   if (flags)
     r = command (NULL, &err, cmd, flags, srcbuf, destbuf, NULL);
   else