X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=2472f5db6057f2b1e2b4b31175f333e124f7a3ae;hp=f6a0b132685d35dd462bc2139878a5ccd9ac0292;hb=ccbbca646ac2845444b6d9e300e6aec4c13a87cb;hpb=7a4e2d147dc18ea8e317b925176f9fa6d4d8def6 diff --git a/main.c b/main.c index f6a0b13..2472f5d 100644 --- a/main.c +++ b/main.c @@ -1,3 +1,5 @@ +/* Required for strdup, snprintf, getopt */ +#define _XOPEN_SOURCE 500 #include #include #include @@ -7,7 +9,9 @@ #include #include #include +#include #include +#include typedef struct sProperty { @@ -179,47 +183,66 @@ void free_properties(Property *props) free(props); } -char **get_mounted_devices(void) +char **get_mount_entries(char *filename, int (*predicate)(struct mntent *)) { - FILE *mtab; + FILE *file; struct mntent *me; - char **mounted = NULL; - int n_mounted = 0; + char **devices = NULL; + int n_devices = 0; - mtab = setmntent("/etc/mtab", "r"); - if(!mtab) + file = setmntent(filename, "r"); + if(!file) return NULL; - while((me = getmntent(mtab))) - { - mounted = (char **)realloc(mounted, (n_mounted+2)*sizeof(char *)); - mounted[n_mounted] = strdup(me->mnt_fsname); - ++n_mounted; - } + while((me = getmntent(file))) + if(!predicate || predicate(me)) + { + devices = (char **)realloc(devices, (n_devices+2)*sizeof(char *)); + devices[n_devices] = strdup(me->mnt_fsname); + ++n_devices; + } - endmntent(mtab); - mounted[n_mounted] = NULL; + endmntent(file); + if(devices) + devices[n_devices] = NULL; - return mounted; + return devices; +} + +char **get_mounted_devices(void) +{ + return get_mount_entries("/etc/mtab", NULL); +} + +int is_user_mountable(struct mntent *me) +{ + return hasmntopt(me, "user")!=NULL; } -int is_mounted(char **mounted, char *devname) +char **get_fstab_devices(void) +{ + return get_mount_entries("/etc/fstab", &is_user_mountable); +} + +int is_in_array(char **array, char *str) { int i; - for(i=0; mounted[i]; ++i) - if(!strcmp(devname, mounted[i])) + if(!array || !str) + return 0; + for(i=0; array[i]; ++i) + if(!strcmp(str, array[i])) return 1; return 0; } -void free_mounted_devices(char **mounted) +void free_string_array(char **array) { int i; - if(!mounted) + if(!array) return; - for(i=0; mounted[i]; ++i) - free(mounted[i]); - free(mounted); + for(i=0; array[i]; ++i) + free(array[i]); + free(array); } int is_removable(char *devpath) @@ -270,29 +293,37 @@ int check_buses(char *devpath, char **buses) char linkbuf[256]; strcpy(ptr, "/subsystem"); len = readlink(fnbuf, linkbuf, sizeof(linkbuf)-1); - *ptr = 0; if(len!=-1) { - int i; linkbuf[len] = 0; for(; (len>0 && linkbuf[len-1]!='/'); --len) ; if(verbosity>=2) + { + *ptr = 0; printf(" Subsystem of %s is %s\n", fnbuf, linkbuf+len); - for(i=0; buses[i]; ++i) - if(strcmp(linkbuf+len, buses[i])==0) - return 1; + } + if(is_in_array(buses, linkbuf+len)) + return 1; } } return 0; } -int can_mount(Property *props) +int can_mount(Property *props, char **allowed) { static char *removable_buses[] = { "usb", "firewire", 0 }; + char *devname; char *devpath; - int i; + char *bus; + + devname = get_property_value(props, "DEVNAME"); + if(is_in_array(allowed, devname)) + return 1; + + if(match_property_value(props, "ID_TYPE", "cd") && match_property_value(props, "ID_CDROM_MEDIA", "1")) + return 1; if(!match_property_value(props, "DEVTYPE", "partition")) return 0; @@ -301,9 +332,9 @@ int can_mount(Property *props) if(is_removable(devpath)) return 1; - for(i=0; removable_buses[i]; ++i) - if(match_property_value(props, "ID_BUS", removable_buses[i])) - return 1; + bus = get_property_value(props, "ID_BUS"); + if(is_in_array(removable_buses, bus)) + return 1; return check_buses(devpath, removable_buses); } @@ -390,17 +421,21 @@ Device *get_devices(void) Device *devices = NULL; int n_devices = 0; char **mounted = NULL; + char **fstab = NULL; int i; nodes = get_device_nodes("/dev/disk/by-id"); mounted = get_mounted_devices(); + fstab = get_fstab_devices(); for(i=0; nodes[i]; ++i) { + Property *props; + if(verbosity>=1) printf("Examining device %s\n", nodes[i]); - Property *props = get_device_properties(nodes[i]); + props = get_device_properties(nodes[i]); if(!props) { if(verbosity>=2) @@ -415,7 +450,7 @@ Device *get_devices(void) printf(" %s = %s\n", props[j].name, props[j].value); } - if(can_mount(props)) + if(can_mount(props, fstab)) { char *devname; char *label; @@ -456,7 +491,7 @@ Device *get_devices(void) devices[n_devices].node = nodes[i]; devices[n_devices].label = strdup(label); devices[n_devices].description = strdup(buf); - devices[n_devices].mounted = is_mounted(mounted, devname); + devices[n_devices].mounted = is_in_array(mounted, devname); devices[n_devices].time = st.st_mtime; ++n_devices; } @@ -466,7 +501,7 @@ Device *get_devices(void) } free(nodes); - free_mounted_devices(mounted); + free_string_array(mounted); if(devices) { @@ -535,23 +570,54 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu { char buf[1024]; int pos = 0; - int status; + 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) { - int len; + if(select(pipe_fd[0]+1, &fds, NULL, NULL, &timeout)) + { + int len; - len = read(pipe_fd[0], buf+pos, sizeof(buf)-pos-1); - if(len<=0) + 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; - pos += len; + } } + if(pid) + waitpid(pid, &status, 0); + buf[pos] = 0; - waitpid(pid, &status, 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(!WIFEXITED(status) || WEXITSTATUS(status)) { GtkWidget *dialog; @@ -563,21 +629,51 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu else gtk_main_quit(); } - else - { - } } (void)column; } +void button_clicked(GtkButton *button, gpointer user_data) +{ + GtkWidget *list = (GtkWidget *)user_data; + GtkTreeSelection *selection; + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreePath *path; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(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)); + gtk_tree_path_free(path); + + (void)button; +} + +gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data) +{ + if(event->key.keyval==GDK_KEY_Escape) + { + gtk_main_quit(); + return TRUE; + } + + (void)widget; + (void)user_data; + + return FALSE; +} + int main(int argc, char **argv) { GtkWidget *window; + GtkWidget *box; GtkWidget *viewport; GtkWidget *list; GtkListStore *store; GtkTreeSelection *selection; + GtkWidget *button; GtkTreeIter iter; Device *devices; int i; @@ -601,10 +697,14 @@ int main(int argc, char **argv) window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width(GTK_CONTAINER(window), 5); g_signal_connect(window, "destroy", G_CALLBACK(>k_main_quit), NULL); + g_signal_connect(window, "key-press-event", G_CALLBACK(&key_press), NULL); + + box = gtk_vbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(window), box); viewport = gtk_viewport_new(NULL, NULL); gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN); - gtk_container_add(GTK_CONTAINER(window), viewport); + gtk_box_pack_start(GTK_BOX(box), viewport, TRUE, TRUE, 0); list = gtk_tree_view_new(); gtk_container_add(GTK_CONTAINER(viewport), list); @@ -617,6 +717,10 @@ int main(int argc, char **argv) selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); + 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); + devices = get_devices(); n_listed = 0; if(devices)