X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=e4fb87e425019da9253866b68a2d7a4f7ef60671;hp=f8b4c2ef664eabe93f1c92f0fa5fb2b062f19e56;hb=7e81aa89ec90d60b877e921de642f7eb5eb4bbbf;hpb=201d78e7bebc0fbf56dceab237d6ee1af8d77c6b

diff --git a/main.c b/main.c
index f8b4c2e..e4fb87e 100644
--- a/main.c
+++ b/main.c
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <mntent.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/select.h>
@@ -22,13 +23,16 @@ typedef struct sProperty
 typedef struct sDevice
 {
 	char *node;
+	char *devname;
 	char *label;
 	char *description;
-	int mounted;
+	char *mount_point;
 	time_t time;
 } Device;
 
 int verbosity = 0;
+char *post_mount_command = NULL;
+char **pmount_argv = NULL;
 
 /**
 Parses a string of the form name=value and places the components in a Property
@@ -66,6 +70,12 @@ Property *get_device_properties(char *node)
 {
 	int pid;
 	int pipe_fd[2];
+	char *buf;
+	int bufsize;
+	int pos = 0;
+	int eof = 0;
+	Property *props = NULL;
+	int n_props = 0;
 
 	pipe(pipe_fd);
 
@@ -82,91 +92,82 @@ Property *get_device_properties(char *node)
 		execl("/sbin/udevadm", "udevadm", "info", "-q", "property", "-n", node, NULL);
 		_exit(1);
 	}
-	else if(pid>0)
+	else if(pid<0)
 	{
-		/* Parent process */
-		char *buf;
-		int bufsize;
-		int pos = 0;
-		int eof = 0;
-		Property *props = NULL;
-		int n_props = 0;
-
+		close(pipe_fd[0]);
 		close(pipe_fd[1]);
 
-		bufsize = 256;
-		buf = (char *)malloc(bufsize);
-
-		while(1)
-		{
-			int newline;
-			int i;
-			Property prop;
+		return NULL;
+	}
 
-			if(!eof)
-			{
-				int len;
-
-				len = read(pipe_fd[0], buf+pos, bufsize-pos);
-				if(len==0)
-					eof = 1;
-				else if(len==-1)
-					break;
-				pos += len;
-			}
+	/* Parent process */
+	close(pipe_fd[1]);
 
-			newline = -1;
-			for(i=0; (newline<0 && i<pos); ++i)
-				if(buf[i]=='\n')
-					newline = i;
+	bufsize = 256;
+	buf = (char *)malloc(bufsize);
 
-			if(newline<0)
-			{
-				if(eof)
-					break;
-
-				/* There was no newline in the buffer but there is more output to
-				be read.  Try again with a larger buffer. */
-				bufsize *= 2;
-				buf = (char *)realloc(buf, bufsize);
-				continue;
-			}
+	while(1)
+	{
+		int newline;
+		int i;
+		Property prop;
 
-			if(parse_property(buf, newline, &prop)==0)
-			{
-				/* Reserve space for a sentinel value as well. */
-				props = (Property *)realloc(props, (n_props+2)*sizeof(Property));
-				props[n_props] = prop;
-				++n_props;
+		if(!eof)
+		{
+			int len;
 
-				memmove(buf, buf+newline+1, pos-newline-1);
-				pos -= newline+1;
-			}
-			else
+			len = read(pipe_fd[0], buf+pos, bufsize-pos);
+			if(len==0)
+				eof = 1;
+			else if(len==-1)
 				break;
+			pos += len;
 		}
 
-		free(buf);
+		newline = -1;
+		for(i=0; (newline<0 && i<pos); ++i)
+			if(buf[i]=='\n')
+				newline = i;
 
-		if(props)
+		if(newline<0)
 		{
-			/* Terminate the array with NULL pointers. */
-			props[n_props].name = NULL;
-			props[n_props].value = NULL;
+			if(eof)
+				break;
+
+			/* There was no newline in the buffer but there is more output to
+			be read.  Try again with a larger buffer. */
+			bufsize *= 2;
+			buf = (char *)realloc(buf, bufsize);
+			continue;
 		}
 
-		waitpid(pid, NULL, 0);
-		close(pipe_fd[0]);
+		if(parse_property(buf, newline, &prop)==0)
+		{
+			/* Reserve space for a sentinel value as well. */
+			props = (Property *)realloc(props, (n_props+2)*sizeof(Property));
+			props[n_props] = prop;
+			++n_props;
 
-		return props;
+			memmove(buf, buf+newline+1, pos-newline-1);
+			pos -= newline+1;
+		}
+		else
+			break;
 	}
-	else
-	{
-		close(pipe_fd[0]);
-		close(pipe_fd[1]);
 
-		return NULL;
+	free(buf);
+
+	if(props)
+	{
+		/* Terminate the array with NULL pointers. */
+		props[n_props].name = NULL;
+		props[n_props].value = NULL;
 	}
+
+	waitpid(pid, NULL, 0);
+	close(pipe_fd[0]);
+
+	return props;
 }
 
 /**
@@ -211,21 +212,21 @@ void free_properties(Property *props)
 }
 
 /**
-Reads device names from an fstab/mtab file.
+Returns an array of user-mountable devices listed in fstab.
 */
-char **get_mount_entries(char *filename, int (*predicate)(struct mntent *))
+char **get_fstab_devices(void)
 {
 	FILE *file;
 	struct mntent *me;
 	char **devices = NULL;
 	int n_devices = 0;
 
-	file = setmntent(filename, "r");
+	file = setmntent("/etc/fstab", "r");
 	if(!file)
 		return NULL;
 
 	while((me = getmntent(file)))
-		if(!predicate || predicate(me))
+		if(hasmntopt(me, "user")!=NULL)
 		{
 			devices = (char **)realloc(devices, (n_devices+2)*sizeof(char *));
 			devices[n_devices] = strdup(me->mnt_fsname);
@@ -239,30 +240,6 @@ char **get_mount_entries(char *filename, int (*predicate)(struct mntent *))
 	return devices;
 }
 
-/**
-Returns an array of all currently mounted devices.
-*/
-char **get_mounted_devices(void)
-{
-	return get_mount_entries("/etc/mtab", NULL);
-}
-
-/**
-Checks if an fstab entry has the user option set.
-*/
-int is_user_mountable(struct mntent *me)
-{
-	return hasmntopt(me, "user")!=NULL;
-}
-
-/**
-Returns an array of user-mountable devices listed in fstab.
-*/
-char **get_fstab_devices(void)
-{
-	return get_mount_entries("/etc/fstab", &is_user_mountable);
-}
-
 /**
 Checks if an array of strings contains the specified string.
 */
@@ -495,7 +472,38 @@ char **get_device_nodes(char *dirname)
 	return nodes;
 }
 
-/** Returns an array of all mountable devices. */
+/**
+Reads the list of mounted devices from /etc/mtab and records the mount points.
+*/
+void check_mounts(Device *devices)
+{
+	FILE *file;
+	struct mntent *me;
+
+	file = setmntent("/etc/mtab", "r");
+	if(!file)
+		return;
+
+	while((me = getmntent(file)))
+	{
+		int i;
+
+		for(i=0; devices[i].node; ++i)
+			if(!strcmp(devices[i].devname, me->mnt_fsname))
+			{
+				devices[i].mount_point = strdup(me->mnt_dir);
+
+				if(verbosity>=1)
+					printf("Device %s is mounted on %s\n", devices[i].node, devices[i].mount_point);
+			}
+	}
+
+	endmntent(file);
+}
+
+/**
+Returns an array of all mountable devices.
+*/
 Device *get_devices(void)
 {
 	char **nodes = NULL;
@@ -506,7 +514,6 @@ Device *get_devices(void)
 	int i;
 
 	nodes = get_device_nodes("/dev/disk/by-id");
-	mounted = get_mounted_devices();
 	fstab = get_fstab_devices();
 
 	for(i=0; nodes[i]; ++i)
@@ -573,9 +580,10 @@ Device *get_devices(void)
 			/* Reserve space for a sentinel entry. */
 			devices = (Device *)realloc(devices, (n_devices+2)*sizeof(Device));
 			devices[n_devices].node = nodes[i];
+			devices[n_devices].devname = strdup(devname);
 			devices[n_devices].label = strdup(label);
 			devices[n_devices].description = strdup(buf);
-			devices[n_devices].mounted = is_in_array(mounted, devname);
+			devices[n_devices].mount_point = NULL;
 			devices[n_devices].time = st.st_mtime;
 			++n_devices;
 		}
@@ -591,8 +599,12 @@ Device *get_devices(void)
 	{
 		/* Terminate the array with NULL pointers. */
 		devices[n_devices].node = NULL;
+		devices[n_devices].devname = NULL;
 		devices[n_devices].label = NULL;
 		devices[n_devices].description = NULL;
+		devices[n_devices].mount_point = NULL;
+
+		check_mounts(devices);
 	}
 
 	return devices;
@@ -609,127 +621,214 @@ void free_devices(Device *devices)
 	for(i=0; devices[i].node; ++i)
 	{
 		free(devices[i].node);
+		free(devices[i].devname);
 		free(devices[i].label);
 		free(devices[i].description);
+		if(devices[i].mount_point)
+			free(devices[i].mount_point);
 	}
 	free(devices);
 }
 
 /**
-Callback for activating a row in the device list.  Mounts or unmounts the
-device depending on operating mode.
+Mounts a device if it was not mounted, or unmounts if it was.
 */
-void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
+int toggle_device(Device *device, char *out_buf, int out_size)
 {
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	int umount = *(int *)user_data;
+	int umount = !!device->mount_point;
+	char mount_point[1024];
+	int pos = 0;
+	int status = 0;
+	fd_set fds;
+	struct timeval timeout;
+	int pid;
+	int pipe_fd[2];
+	char suffix = 0;
 
-	model = gtk_tree_view_get_model(list);
+	out_buf[0] = 0;
 
-	if(gtk_tree_model_get_iter(model, &iter, path))
+	/* Find a mount point that does not exist yet. */
+	while(1)
 	{
-		Device *device;
-		int pid;
-		int pipe_fd[2];
+		int len;
 
-		gtk_tree_model_get(model, &iter, 1, &device, -1);
+		len = snprintf(mount_point, sizeof(mount_point), "/media/%s", device->label);
+		if(len+2>=(int)sizeof(mount_point))
+			return -1;
 
-		pipe(pipe_fd);
+		if(suffix)
+			len += snprintf(mount_point+len, sizeof(mount_point)-len, "_%c", suffix);
 
-		pid = fork();
-		if(pid==0)
+		if(access(mount_point, F_OK)<0 && errno==ENOENT)
+			break;
+
+		if(suffix==0)
+			suffix = '1';
+		else if(suffix<'9')
+			++suffix;
+		else
+			return -1;
+	}
+
+	pipe(pipe_fd);
+
+	pid = fork();
+	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)
 		{
-			/* Child process */
-			if(verbosity>=1)
+			if(umount)
+				printf("Running pumount %s\n", device->node);
+			else
 			{
-				if(umount)
-					printf("Running pumount %s\n", device->node);
-				else
-					printf("Running pmount %s %s\n", device->node, device->label);
+				int i = 0;
+				printf("Running pmount");
+				while(pmount_argv[++i])
+					printf(" %s", pmount_argv[i]);
+				printf("\n");
 			}
+		}
+
+		close(pipe_fd[0]);
+		dup2(pipe_fd[1], 1);
+		dup2(pipe_fd[1], 2);
+
+		if(umount)
+			execl("/usr/bin/pumount", "pumount", device->node, NULL);
+		else
+			execvp("/usr/bin/pmount", pmount_argv);
+		_exit(1);
+	}
+	else if(pid<0)
+		return -1;
 
-			close(pipe_fd[0]);
-			dup2(pipe_fd[1], 1);
-			dup2(pipe_fd[1], 2);
+	/* Parent process */
 
-			if(umount)
-				execl("/usr/bin/pumount", "pumount", device->node, NULL);
-			else
-				execl("/usr/bin/pmount", "pmount", device->node, device->label, NULL);
-			_exit(1);
+	close(pipe_fd[1]);
+	FD_ZERO(&fds);
+	FD_SET(pipe_fd[0], &fds);
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 200000;
+
+	while(1)
+	{
+		/* The write fd for the pipe may be inherited by a fuse server
+		process and stay open indefinitely. */
+		if(select(pipe_fd[0]+1, &fds, NULL, NULL, &timeout))
+		{
+			int len;
+
+			len = read(pipe_fd[0], out_buf+pos, out_size-pos-1);
+			if(len<=0)
+				break;
+			pos += len;
 		}
-		else if(pid>0)
+		else if(waitpid(pid, &status, 0))
 		{
-			/* Parent process */
-			char buf[1024];
-			int pos = 0;
-			int status = 0;
-			fd_set fds;
-			struct timeval timeout;
-
-			close(pipe_fd[1]);
-			FD_ZERO(&fds);
-			FD_SET(pipe_fd[0], &fds);
-			timeout.tv_sec = 0;
-			timeout.tv_usec = 200000;
-
-			while(1)
-			{
-				/* The write fd for the pipe may be inherited by a fuse server
-				process and stay open indefinitely. */
-				if(select(pipe_fd[0]+1, &fds, NULL, NULL, &timeout))
-				{
-					int len;
+			pid = 0;
+			break;
+		}
+	}
 
-					len = read(pipe_fd[0], buf+pos, sizeof(buf)-pos-1);
-					if(len<=0)
-						break;
-					pos += len;
-				}
-				else if(waitpid(pid, &status, 0))
-				{
-					pid = 0;
-					break;
-				}
-			}
+	close(pipe_fd[0]);
+	if(pid)
+		waitpid(pid, &status, 0);
 
-			if(pid)
-				waitpid(pid, &status, 0);
+	out_buf[pos] = 0;
 
-			buf[pos] = 0;
+	if(verbosity>=1)
+	{
+		if(WIFEXITED(status))
+		{
+			if(WEXITSTATUS(status))
+				printf("Command exited successfully\n");
+			else
+				printf("Command exited with status %d\n", WEXITSTATUS(status));
+		}
+		else if(WIFSIGNALED(status))
+			printf("Command terminated with signal %d\n", WTERMSIG(status));
+		else
+			printf("Command exited with unknown result %04X\n", status);
+	}
 
-			if(verbosity>=1)
-			{
-				if(WIFEXITED(status))
-				{
-					if(WEXITSTATUS(status))
-						printf("Command exited successfully\n");
-					else
-						printf("Command exited with status %d\n", WEXITSTATUS(status));
-				}
-				else if(WIFSIGNALED(status))
-					printf("Command terminated with signal %d\n", WTERMSIG(status));
-				else
-					printf("Command exited with unknown result %04X\n", status);
-			}
+	if(!WIFEXITED(status) || WEXITSTATUS(status))
+		return -1;
 
-			if(!WIFEXITED(status) || WEXITSTATUS(status))
-			{
-				GtkWidget *dialog;
+	if(umount)
+	{
+		free(device->mount_point);
+		device->mount_point = NULL;
+	}
+	else
+		device->mount_point = strdup(mount_point);
 
-				/* Pmount terminated with nonzero status or a signal.  Display an
-				error to the user. */
-				dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", buf);
-				g_signal_connect(dialog, "response", &gtk_main_quit, NULL);
-				gtk_widget_show_all(dialog);
-			}
-			else
-				gtk_main_quit();
+	return 0;
+}
+
+/**
+Callback for activating a row in the device list.  Mounts or unmounts the
+device depending on operating mode.
+*/
+void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	Device *device;
+	int ret;
+	char output[1024];
+	int pid;
+
+	model = gtk_tree_view_get_model(list);
+
+	if(!gtk_tree_model_get_iter(model, &iter, path))
+		return;
+
+	gtk_tree_model_get(model, &iter, 1, &device, -1);
+	ret = toggle_device(device, output, sizeof(output));
+	if(ret)
+	{
+		GtkWidget *dialog;
+
+		/* Pmount terminated with nonzero status or a signal.  Display an
+		error to the user. */
+		dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", output);
+		g_signal_connect(dialog, "response", &gtk_main_quit, NULL);
+		gtk_widget_show_all(dialog);
+		return;
+	}
+
+	gtk_main_quit();
+
+	if(post_mount_command && device->mount_point)
+	{
+		if(verbosity>=1)
+			printf("Running %s in %s\n", post_mount_command, device->mount_point);
+
+		pid = fork();
+		if(pid==0)
+		{
+			chdir(device->mount_point);
+			execlp(post_mount_command, post_mount_command, NULL);
+			_exit(1);
 		}
 	}
 
 	(void)column;
+	(void)user_data;
 }
 
 /**
@@ -770,6 +869,18 @@ gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 	return FALSE;
 }
 
+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] [-- <pmount options>]\n\n"
+		"Options:\n"
+		"  -v  Increase verbosity\n"
+		"  -u  Unmount a device (default is mount)\n"
+		"  -r  Run a command after mounting\n"
+		"  -h  Display this help\n");
+}
+
 int main(int argc, char **argv)
 {
 	GtkWidget *window;
@@ -789,7 +900,7 @@ int main(int argc, char **argv)
 
 	gtk_init(&argc, &argv);
 
-	while((opt = getopt(argc, argv, "vu"))!=-1) switch(opt)
+	while((opt = getopt(argc, argv, "vur:h"))!=-1) switch(opt)
 	{
 	case 'v':
 		++verbosity;
@@ -797,8 +908,24 @@ int main(int argc, char **argv)
 	case 'u':
 		umount = 1;
 		break;
+	case 'r':
+		post_mount_command = optarg;
+		break;
+	case 'h':
+		show_help();
+		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;
+
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 5);
 	g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
@@ -813,7 +940,7 @@ int main(int argc, char **argv)
 
 	list = gtk_tree_view_new();
 	gtk_container_add(GTK_CONTAINER(viewport), list);
-	g_signal_connect(list, "row-activated", G_CALLBACK(&row_activated), &umount);
+	g_signal_connect(list, "row-activated", G_CALLBACK(&row_activated), NULL);
 
 	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store));
@@ -833,7 +960,7 @@ int main(int argc, char **argv)
 		/* Populate the list with devices in appropriate state. */
 		latest = 0;
 		for(i=0; devices[i].node; ++i)
-			if(!devices[i].mounted==!umount)
+			if(!devices[i].mount_point==!umount)
 			{
 				gtk_list_store_append(store, &iter);
 				gtk_list_store_set(store, &iter, 0, devices[i].description, 1, &devices[i], -1);
@@ -866,5 +993,7 @@ int main(int argc, char **argv)
 
 	free_devices(devices);
 
+	free(pmount_argv);
+
 	return 0;
 }