X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=ce9ac69d62ed23540b2cc1271c66ea25e86ea90d;hp=9e02fcab676fe849170e52789d483d49e8023e76;hb=4e40d30307c5235b74174138ca9c5071ca654201;hpb=196a96ef5896f54290bb9125cea76ac2a43f29cb diff --git a/main.c b/main.c index 9e02fca..ce9ac69 100644 --- a/main.c +++ b/main.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -22,14 +23,22 @@ typedef struct sProperty typedef struct sDevice { char *node; + char *devname; char *label; char *description; - int mounted; + char *mount_point; time_t time; } Device; +typedef struct sGuiContext +{ + int manager; + GtkWidget *list; + GtkWidget *button; + char *post_mount_command; +} GuiContext; + int verbosity = 0; -char *post_mount_command = NULL; /** Parses a string of the form name=value and places the components in a Property @@ -209,21 +218,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); @@ -237,30 +246,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. */ @@ -493,7 +478,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; @@ -504,7 +520,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) @@ -571,9 +586,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; } @@ -589,8 +605,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; @@ -607,8 +627,11 @@ 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); } @@ -618,16 +641,41 @@ Mounts a device if it was not mounted, or unmounts if it was. */ int toggle_device(Device *device, char *out_buf, int out_size) { - int umount = !!device->mounted; + 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; out_buf[0] = 0; + /* Find a mount point that does not exist yet. */ + while(1) + { + int len; + + len = snprintf(mount_point, sizeof(mount_point), "/media/%s", device->label); + if(len+2>=(int)sizeof(mount_point)) + return -1; + + if(suffix) + len += snprintf(mount_point+len, sizeof(mount_point)-len, "_%c", suffix); + + 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(); @@ -639,7 +687,7 @@ int toggle_device(Device *device, char *out_buf, int out_size) if(umount) printf("Running pumount %s\n", device->node); else - printf("Running pmount %s %s\n", device->node, device->label); + printf("Running pmount %s %s\n", device->node, mount_point+7); } close(pipe_fd[0]); @@ -649,7 +697,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, device->label, NULL); + execl("/usr/bin/pmount", "pmount", device->node, mount_point+7, NULL); _exit(1); } else if(pid<0) @@ -707,17 +755,42 @@ int toggle_device(Device *device, char *out_buf, int out_size) if(!WIFEXITED(status) || WEXITSTATUS(status)) return -1; - device->mounted = !device->mounted; + if(umount) + { + free(device->mount_point); + device->mount_point = NULL; + } + else + device->mount_point = strdup(mount_point); return 0; } +/** +Callback for selection in the device list changing. Updates the action button +label according to device status. +*/ +void selection_changed(GtkTreeSelection *selection, gpointer user_data) +{ + GuiContext *context = (GuiContext *)user_data; + GtkTreeIter iter; + GtkTreeModel *model; + Device *device; + + if(!gtk_tree_selection_get_selected(selection, &model, &iter)) + return; + + gtk_tree_model_get(model, &iter, 1, &device, -1); + gtk_button_set_label(GTK_BUTTON(context->button), (device->mount_point ? "Unmount" : "Mount")); +} + /** 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) { + GuiContext *context = (GuiContext *)user_data; GtkTreeModel *model; GtkTreeIter iter; Device *device; @@ -739,30 +812,37 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu /* 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", >k_main_quit, NULL); + if(context->manager) + g_signal_connect(dialog, "response", G_CALLBACK(>k_widget_destroy), dialog); + else + g_signal_connect(dialog, "response", G_CALLBACK(>k_main_quit), NULL); gtk_widget_show_all(dialog); return; } - gtk_main_quit(); + if(context->manager) + { + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + 2, !!device->mount_point, + 3, device->mount_point, + -1); + + gtk_button_set_label(GTK_BUTTON(context->button), (device->mount_point ? "Unmount" : "Mount")); + } + else + gtk_main_quit(); - if(post_mount_command && device->mounted) + if(context->post_mount_command && device->mount_point) { - char workdir[256]; - int len; - len = snprintf(workdir, sizeof(workdir), "/media/%s", device->label); - if(len<(int)sizeof(workdir)) - { - if(verbosity>=1) - printf("Running %s in %s\n", post_mount_command, workdir); + if(verbosity>=1) + printf("Running %s in %s\n", context->post_mount_command, device->mount_point); - pid = fork(); - if(pid==0) - { - chdir(workdir); - execlp(post_mount_command, post_mount_command, NULL); - _exit(1); - } + pid = fork(); + if(pid==0) + { + chdir(device->mount_point); + execlp(context->post_mount_command, context->post_mount_command, NULL); + _exit(1); } } @@ -776,16 +856,18 @@ list to be activated. */ void button_clicked(GtkButton *button, gpointer user_data) { - GtkWidget *list = (GtkWidget *)user_data; + GuiContext *context = (GuiContext *)user_data; GtkTreeSelection *selection; GtkTreeIter iter; GtkTreeModel *model; GtkTreePath *path; + GtkTreeViewColumn *column; - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context->list)); gtk_tree_selection_get_selected(selection, &model, &iter); path = gtk_tree_model_get_path(model, &iter); - gtk_tree_view_row_activated(GTK_TREE_VIEW(list), path, gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0)); + column = gtk_tree_view_get_column(GTK_TREE_VIEW(context->list), 0); + gtk_tree_view_row_activated(GTK_TREE_VIEW(context->list), path, column); gtk_tree_path_free(path); (void)button; @@ -817,18 +899,19 @@ void show_help(void) " -v Increase verbosity\n" " -u Unmount a device (default is mount)\n" " -r Run a command after mounting\n" + " -m Start a persistent mount manager\n" " -h Display this help\n"); } int main(int argc, char **argv) { + GuiContext context; GtkWidget *window; GtkWidget *box; GtkWidget *viewport; - GtkWidget *list; GtkListStore *store; GtkTreeSelection *selection; - GtkWidget *button; + GtkCellRenderer *mounted_toggle; GtkTreeIter iter; Device *devices; int i; @@ -837,9 +920,12 @@ int main(int argc, char **argv) int umount = 0; int n_listed; + context.manager = 0; + context.post_mount_command = NULL; + gtk_init(&argc, &argv); - while((opt = getopt(argc, argv, "vur:h"))!=-1) switch(opt) + while((opt = getopt(argc, argv, "vur:mh"))!=-1) switch(opt) { case 'v': ++verbosity; @@ -848,7 +934,10 @@ int main(int argc, char **argv) umount = 1; break; case 'r': - post_mount_command = optarg; + context.post_mount_command = optarg; + break; + case 'm': + context.manager = 1; break; case 'h': show_help(); @@ -867,20 +956,40 @@ int main(int argc, char **argv) gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(box), viewport, TRUE, TRUE, 0); - list = gtk_tree_view_new(); - gtk_container_add(GTK_CONTAINER(viewport), list); - g_signal_connect(list, "row-activated", G_CALLBACK(&row_activated), NULL); + context.list = gtk_tree_view_new(); + gtk_container_add(GTK_CONTAINER(viewport), context.list); + g_signal_connect(context.list, "row-activated", G_CALLBACK(&row_activated), &context); - 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)); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list), + store = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_STRING); + gtk_tree_view_set_model(GTK_TREE_VIEW(context.list), GTK_TREE_MODEL(store)); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(context.list), -1, "Device", gtk_cell_renderer_text_new(), "text", 0, NULL); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + if(context.manager) + { + GtkTreeViewColumn *mounted_column; + GtkCellRenderer *mount_point_renderer; + + mounted_column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(mounted_column, "Mounted"); + + mounted_toggle = gtk_cell_renderer_toggle_new(); + gtk_tree_view_column_pack_start(mounted_column, mounted_toggle, FALSE); + gtk_tree_view_column_add_attribute(mounted_column, mounted_toggle, "active", 2); + + mount_point_renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(mounted_column, mount_point_renderer, TRUE); + gtk_tree_view_column_add_attribute(mounted_column, mount_point_renderer, "text", 3); + + gtk_tree_view_insert_column(GTK_TREE_VIEW(context.list), mounted_column, -1); + } + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context.list)); + g_signal_connect(selection, "changed", G_CALLBACK(&selection_changed), &context); - button = gtk_button_new_with_label(umount ? "Unmount" : "Mount"); - g_signal_connect(button, "clicked", G_CALLBACK(&button_clicked), list); - gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0); + context.button = gtk_button_new_with_label(umount ? "Unmount" : "Mount"); + g_signal_connect(context.button, "clicked", G_CALLBACK(&button_clicked), &context); + gtk_box_pack_start(GTK_BOX(box), context.button, FALSE, TRUE, 0); devices = get_devices(); n_listed = 0; @@ -889,10 +998,15 @@ 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 || context.manager) { gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, devices[i].description, 1, &devices[i], -1); + gtk_list_store_set(store, &iter, + 0, devices[i].description, + 1, &devices[i], + 2, !!devices[i].mount_point, + 3, devices[i].mount_point, + -1); if(devices[i].time>latest) { /* Pre-select the device that appeared on the system most recently. */ @@ -905,7 +1019,7 @@ int main(int argc, char **argv) } - if(n_listed) + if(n_listed || context.manager) gtk_widget_show_all(window); else {