X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=dd6957dc22f3c41a723fea0c9ff12e7e6035c149;hp=81bc4bffd77899c9b3a80e6ee34f8e98c426c393;hb=55a7d4e8fe6b4cc1d02637f19e7245afbcbdb41b;hpb=f11c283e0e045a9eafed90e83521d2205dea0a2c

diff --git a/main.c b/main.c
index 81bc4bf..dd6957d 100644
--- a/main.c
+++ b/main.c
@@ -47,6 +47,7 @@ typedef struct sGuiContext
 } GuiContext;
 
 int verbosity = 0;
+char **pmount_argv = NULL;
 
 /**
 Parses a string of the form name=value and places the components in a Property
@@ -690,12 +691,31 @@ int toggle_device(Device *device, char *out_buf, int out_size)
 	if(pid==0)
 	{
 		/* Child process */
+
+		/* Complete construction of pmount call */
+		int last;
+
+		pmount_argv[0] = "pmount";
+
+		last = 0;
+		while(pmount_argv[++last]);
+
+		pmount_argv[last] = device->node;
+		pmount_argv[last+1] = mount_point+7;
+		pmount_argv[last+2] = NULL;
+
 		if(verbosity>=1)
 		{
 			if(umount)
 				printf("Running pumount %s\n", device->node);
 			else
-				printf("Running pmount %s %s\n", device->node, mount_point+7);
+			{
+				int i = 0;
+				printf("Running pmount");
+				while(pmount_argv[++i])
+					printf(" %s", pmount_argv[i]);
+				printf("\n");
+			}
 		}
 
 		close(pipe_fd[0]);
@@ -705,7 +725,7 @@ int toggle_device(Device *device, char *out_buf, int out_size)
 		if(umount)
 			execl("/usr/bin/pumount", "pumount", device->node, NULL);
 		else
-			execl("/usr/bin/pmount", "pmount", device->node, mount_point+7, NULL);
+			execvp("/usr/bin/pmount", pmount_argv);
 		_exit(1);
 	}
 	else if(pid<0)
@@ -1004,7 +1024,7 @@ void show_help(void)
 {
 	printf("pmount-gui\n"
 		"Copyright (c) 2011-2015 Mikko Rasa, Mikkosoft Productions\n\n"
-		"Usage: pmount-gui [-v] [-u] [-r <command>] [-h]\n\n"
+		"Usage: pmount-gui [-v] [-u] [-r <command>] [-m|-M] [-h] [-- <pmount options>]\n\n"
 		"Options:\n"
 		"  -v  Increase verbosity\n"
 		"  -u  Unmount a device (default is mount)\n"
@@ -1061,10 +1081,19 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
+	/* argc - optind equals to number of options after "--" */
+	/* One empty element at the beginning is for program name for execvp */
+	/* Three empty elements at the end are required options for pmount + NULL */
+
+	pmount_argv = malloc(sizeof(char *)*(argc-optind+4));
+
+	for(i=0; i<(argc-optind); ++i)
+			pmount_argv[i+1] = argv[optind+i];
+	pmount_argv[argc-optind+1] = NULL;
+
 	context.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width(GTK_CONTAINER(context.window), 5);
 	g_signal_connect(context.window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
-	g_signal_connect(context.window, "key-press-event", G_CALLBACK(&key_press), NULL);
 
 	box = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(context.window), box);
@@ -1113,6 +1142,8 @@ int main(int argc, char **argv)
 
 		umount = -1;
 	}
+	else
+		g_signal_connect(context.window, "key-press-event", G_CALLBACK(&key_press), NULL);
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context.list));
 	g_signal_connect(selection, "changed", G_CALLBACK(&selection_changed), &context);
@@ -1142,5 +1173,7 @@ int main(int argc, char **argv)
 	if(context.inotify_fd>=0)
 		close(context.inotify_fd);
 
+	free(pmount_argv);
+
 	return 0;
 }