Rename user visible files from vdagent* to spice-vdagent*

vdagent is a bit of a generic name and thus might create file conflicts,
also just vdagent just not make it clear to the user that vdagent belongs
to spice.

5 files changed, 8 insertions, 8 deletions

diff --git a/99-vdagent.rules b/99-vdagent.rules
index 85a0c95..71b3604 100644
--- a/99-vdagent.rules
+++ b/99-vdagent.rules
@@ -1,2 +1,2 @@
 KERNEL=="vport*", ATTR{name}=="com.redhat.spice.0" RUN+="/sbin/modprobe uinput"
-KERNEL=="vport*", ATTR{name}=="com.redhat.spice.0" RUN+="/sbin/vdagentd"
+KERNEL=="vport*", ATTR{name}=="com.redhat.spice.0" RUN+="/sbin/spice-vdagentd"
diff --git a/Makefile b/Makefile
index 2f97a00..810dd54 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ CFLAGS  += $(shell pkg-config --cflags spice-protocol)
 CFLAGS  += $(shell pkg-config --cflags dbus-1)
 CFLAGS  += -D_GNU_SOURCE
 
-TARGETS	:= vdagentd vdagent
+TARGETS	:= spice-vdagentd spice-vdagent
 
 build: $(TARGETS)
 
@@ -22,8 +22,8 @@ install: build
 clean:
 	rm -f $(TARGETS) *.o *~
 
-vdagentd: vdagentd.o vdagentd-uinput.o udscs.o vdagent-virtio-port.o console-kit.o
+spice-vdagentd: vdagentd.o vdagentd-uinput.o udscs.o vdagent-virtio-port.o console-kit.o
 	$(CC) -o $@ $^ $(shell pkg-config --libs dbus-1)
 
-vdagent: vdagent.o vdagent-x11.o udscs.o
+spice-vdagent: vdagent.o vdagent-x11.o udscs.o
 	$(CC) -o $@ $^ -lX11 -lXrandr -lXfixes
diff --git a/vdagent.c b/vdagent.c
index ef507b2..de60627 100644
--- a/vdagent.c
+++ b/vdagent.c
@@ -115,9 +115,9 @@ int main(int argc, char *argv[])
 
     home = getenv("HOME");
     if (home) {
-        snprintf(filename, sizeof(filename), "%s/.spice-agent", home);
+        snprintf(filename, sizeof(filename), "%s/.spice-vdagent", home);
         n = mkdir(filename, 0755);
-        snprintf(filename, sizeof(filename), "%s/.spice-agent/log", home);
+        snprintf(filename, sizeof(filename), "%s/.spice-vdagent/log", home);
         logfile = fopen(filename, "w");
         if (!logfile) {
             fprintf(stderr, "Error opening %s: %s\n", filename,
diff --git a/vdagentd-proto.h b/vdagentd-proto.h
index 06ca690..375b324 100644
--- a/vdagentd-proto.h
+++ b/vdagentd-proto.h
@@ -23,7 +23,7 @@
 #ifndef __VDAGENTD_PROTO_H
 #define __VDAGENTD_PROTO_H
 
-#define VDAGENTD_SOCKET "/tmp/vdagent"
+#define VDAGENTD_SOCKET "/tmp/spice-vdagent"
 
 enum {
     VDAGENTD_GUEST_XORG_RESOLUTION, /* client -> daemon */
diff --git a/vdagentd.c b/vdagentd.c
index df24de9..444bbcf 100644
--- a/vdagentd.c
+++ b/vdagentd.c
@@ -45,7 +45,7 @@ struct agent_data {
 };
 
 /* variables */
-static const char *logfilename = "/var/log/vdagentd.log";
+static const char *logfilename = "/var/log/spice-vdagentd.log";
 static const char *portdev = "/dev/virtio-ports/com.redhat.spice.0";
 static const char *uinput_device = "/dev/uinput";
 static int debug = 0;