From b3ce35b5e2420145bb0199a8aaa34c5b57da2288 Mon Sep 17 00:00:00 2001
From: Rafal Wojtczuk <rafal@invisiblethingslab.com>
Date: Wed, 6 Jul 2011 14:21:35 +0200
Subject: [PATCH] qrexec: change qrexec_client_vm syntax to be nicer to read

Now the local_program is just before arguments, which is nicer.
---
 appvm/qvm-copy-to-vm                  | 2 +-
 appvm/qvm-copy-to-vm2.gnome           | 3 +--
 appvm/qvm-copy-to-vm2.kde             | 4 ++--
 appvm/qvm-open-in-dvm2                | 2 +-
 appvm/qvm-open-in-vm                  | 2 +-
 common/qubes_trigger_sync_appmenus.sh | 2 +-
 qrexec/qrexec_client_vm.c             | 8 ++++----
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/appvm/qvm-copy-to-vm b/appvm/qvm-copy-to-vm
index bcf333d0..26ee8769 100755
--- a/appvm/qvm-copy-to-vm
+++ b/appvm/qvm-copy-to-vm
@@ -40,4 +40,4 @@ if [ $PROGRESS_TYPE = console ] ; then
 	export FILECOPY_TOTAL_SIZE=$(du --apparent-size -c "$@" | tail -1 | cut -f 1)
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent $VM qubes.Filecopy "$@"
+exec /usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy /usr/lib/qubes/qfile-agent "$@"
diff --git a/appvm/qvm-copy-to-vm2.gnome b/appvm/qvm-copy-to-vm2.gnome
index be9dc7ed..cb2b86e5 100755
--- a/appvm/qvm-copy-to-vm2.gnome
+++ b/appvm/qvm-copy-to-vm2.gnome
@@ -27,8 +27,7 @@ SIZE=$(du --apparent-size -c "$@" | tail -1 | cut -f 1)
 
 export PROGRESS_TYPE=gui
 
-/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent \
-	$VM qubes.Filecopy "$@" | 
+/usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy /usr/lib/qubes/qfile-agent "$@" |
 (while read sentsize ; do
 	CURRSIZE=$(($sentsize/1024))
 	echo $((100*$CURRSIZE/$SIZE))
diff --git a/appvm/qvm-copy-to-vm2.kde b/appvm/qvm-copy-to-vm2.kde
index 478df92d..5c56df08 100755
--- a/appvm/qvm-copy-to-vm2.kde
+++ b/appvm/qvm-copy-to-vm2.kde
@@ -29,8 +29,8 @@ qdbus $REF org.freedesktop.DBus.Properties.Set "" maximum $SIZE
 
 export PROGRESS_TYPE=gui
 
-/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qfile-agent \
-	$VM qubes.Filecopy "$@" | 
+/usr/lib/qubes/qrexec_client_vm $VM qubes.Filecopy \
+	/usr/lib/qubes/qfile-agent "$@" | 
 (while read sentsize ; do
 	CURRSIZE=$(($sentsize/1024))
 	qdbus $REF  org.freedesktop.DBus.Properties.Set "" value $CURRSIZE
diff --git a/appvm/qvm-open-in-dvm2 b/appvm/qvm-open-in-dvm2
index 365c5640..dcc7195e 100755
--- a/appvm/qvm-open-in-dvm2
+++ b/appvm/qvm-open-in-dvm2
@@ -25,4 +25,4 @@ if ! [ $# = 1 ] ; then
 	exit 1
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm "/usr/lib/qubes/qopen-in-vm" dispvm qubes.OpenInVM "$1"
+exec /usr/lib/qubes/qrexec_client_vm dispvm qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$1"
diff --git a/appvm/qvm-open-in-vm b/appvm/qvm-open-in-vm
index dc77ffe9..ffd087ea 100755
--- a/appvm/qvm-open-in-vm
+++ b/appvm/qvm-open-in-vm
@@ -25,4 +25,4 @@ if ! [ $# = 2 ] ; then
 	exit 1
 fi
 
-exec /usr/lib/qubes/qrexec_client_vm "/usr/lib/qubes/qopen-in-vm" "$1" qubes.OpenInVM "$2"
+exec /usr/lib/qubes/qrexec_client_vm "$1" qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$2"
diff --git a/common/qubes_trigger_sync_appmenus.sh b/common/qubes_trigger_sync_appmenus.sh
index de258c6a..5390c2d2 100755
--- a/common/qubes_trigger_sync_appmenus.sh
+++ b/common/qubes_trigger_sync_appmenus.sh
@@ -3,5 +3,5 @@
 UPDATEABLE=`/usr/bin/xenstore-read qubes_vm_updateable`
 
 if [ "$UPDATEABLE" = "True" ]; then
-    /usr/lib/qubes/qrexec_vm /bin/grep dom0 qubes.SyncAppMenus -H = /usr/share/applications/*.desktop
+    /usr/lib/qubes/qrexec_client_vm dom0 qubes.SyncAppMenus /bin/grep -H = /usr/share/applications/*.desktop
 fi
diff --git a/qrexec/qrexec_client_vm.c b/qrexec/qrexec_client_vm.c
index f9002530..06dee925 100644
--- a/qrexec/qrexec_client_vm.c
+++ b/qrexec/qrexec_client_vm.c
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
 
 	if (argc < 4) {
 		fprintf(stderr,
-			"usage: %s local_program target_vmname program_ident [local program arguments]\n",
+			"usage: %s target_vmname program_ident local_program [local program arguments]\n",
 			argv[0]);
 		exit(1);
 	}
@@ -90,8 +90,8 @@ int main(int argc, char **argv)
 	}
 	
 	memset(&params, 0, sizeof(params));
-	strncpy(params.exec_index, argv[3], sizeof(params.exec_index));
-	strncpy(params.target_vmname, argv[2],
+	strncpy(params.exec_index, argv[2], sizeof(params.exec_index));
+	strncpy(params.target_vmname, argv[1],
 		sizeof(params.target_vmname));
 	snprintf(params.process_fds.ident,
 		 sizeof(params.process_fds.ident), "%d %d %d",
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 	write(trigger_fd, &params, sizeof(params));
 	close(trigger_fd);
 
-	argv[3] = get_program_name(argv[1]);
+	argv[3] = get_program_name(argv[3]);
 	execv(argv[1], argv + 3);
 	perror("execv");
 	return 1;