X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=2472f5db6057f2b1e2b4b31175f333e124f7a3ae;hp=7d941c13a77a149fae2534477e11818f097c3b97;hb=ccbbca646ac2845444b6d9e300e6aec4c13a87cb;hpb=fbee2822001a0976e9cfff115c51ab82283197a1 diff --git a/main.c b/main.c index 7d941c1..2472f5d 100644 --- a/main.c +++ b/main.c @@ -1,11 +1,17 @@ +/* Required for strdup, snprintf, getopt */ +#define _XOPEN_SOURCE 500 #include #include #include +#include +#include #include #include #include #include +#include #include +#include typedef struct sProperty { @@ -22,6 +28,8 @@ typedef struct sDevice time_t time; } Device; +int verbosity = 0; + int parse_property(char *str, int size, Property *prop) { int equals = -1; @@ -50,13 +58,14 @@ Property *get_device_properties(char *node) int pid; int pipe_fd[2]; - /*printf("Examining device %s\n", node);*/ - pipe(pipe_fd); pid = fork(); if(pid==0) { + if(verbosity>=2) + printf("Running udevadm info -q property -n \"%s\"\n", node); + close(pipe_fd[0]); dup2(pipe_fd[1], 1); @@ -65,7 +74,8 @@ Property *get_device_properties(char *node) } else if(pid>0) { - char buf[256]; + char *buf; + int bufsize; int pos = 0; int eof = 0; Property *props = NULL; @@ -73,6 +83,9 @@ Property *get_device_properties(char *node) close(pipe_fd[1]); + bufsize = 256; + buf = (char *)malloc(bufsize); + while(1) { int newline; @@ -83,7 +96,7 @@ Property *get_device_properties(char *node) { int len; - len = read(pipe_fd[0], buf+pos, sizeof(buf)-pos); + len = read(pipe_fd[0], buf+pos, bufsize-pos); if(len==0) eof = 1; else if(len==-1) @@ -97,12 +110,16 @@ Property *get_device_properties(char *node) newline = i; if(newline<0) - break; + { + if(eof) + break; + bufsize *= 2; + buf = (char *)realloc(buf, bufsize); + continue; + } if(parse_property(buf, newline, &prop)==0) { - /*printf("Got property '%s' = '%s'\n", prop.name, prop.value);*/ - props = (Property *)realloc(props, (n_props+2)*sizeof(Property)); props[n_props] = prop; ++n_props; @@ -114,8 +131,13 @@ Property *get_device_properties(char *node) break; } - props[n_props].name = NULL; - props[n_props].value = NULL; + free(buf); + + if(props) + { + props[n_props].name = NULL; + props[n_props].value = NULL; + } waitpid(pid, NULL, 0); close(pipe_fd[0]); @@ -161,72 +183,274 @@ 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; +} + +char **get_fstab_devices(void) +{ + return get_mount_entries("/etc/fstab", &is_user_mountable); } -int is_mounted(char **mounted, char *devname) +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); } -Device *get_devices(void) +int is_removable(char *devpath) +{ + char fnbuf[256]; + int len; + char *ptr; + int fd; + + len = snprintf(fnbuf, sizeof(fnbuf), "/sys%s", devpath); + if(len+10>=(int)sizeof(fnbuf)) + return 0; + + for(ptr=fnbuf+len; (ptr>fnbuf && *ptr!='/'); --ptr) ; + strcpy(ptr, "/removable"); + fd = open(fnbuf, O_RDONLY); + if(fd!=-1) + { + char c; + read(fd, &c, 1); + close(fd); + if(c=='1') + { + if(verbosity>=2) + printf(" Removable\n"); + return 1; + } + if(verbosity>=2) + printf(" Not removable\n"); + } + + return 0; +} + +int check_buses(char *devpath, char **buses) +{ + char fnbuf[256]; + char *ptr; + int len; + + len = snprintf(fnbuf, sizeof(fnbuf), "/sys%s", devpath); + if(len+10>=(int)sizeof(fnbuf)) + return 0; + + for(ptr=fnbuf+len; ptr>fnbuf+12; --ptr) + if(*ptr=='/') + { + char linkbuf[256]; + strcpy(ptr, "/subsystem"); + len = readlink(fnbuf, linkbuf, sizeof(linkbuf)-1); + + if(len!=-1) + { + 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); + } + if(is_in_array(buses, linkbuf+len)) + return 1; + } + } + + return 0; +} + +int can_mount(Property *props, char **allowed) +{ + static char *removable_buses[] = { "usb", "firewire", 0 }; + char *devname; + char *devpath; + 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; + + devpath = get_property_value(props, "DEVPATH"); + if(is_removable(devpath)) + return 1; + + bus = get_property_value(props, "ID_BUS"); + if(is_in_array(removable_buses, bus)) + return 1; + + return check_buses(devpath, removable_buses); +} + +char **get_device_nodes(char *dirname) { DIR *dir; struct dirent *de; char fnbuf[256]; + char linkbuf[256]; + struct stat st; + char **nodes = NULL; + int n_nodes = 0; + char **checked = NULL; + int n_checked = 0; + int i; + + dir = opendir(dirname); + if(!dir) + return NULL; + + while((de = readdir(dir))) + { + char *node; + int duplicate = 0; + + if(de->d_name[0]=='.' && (de->d_name[1]==0 || (de->d_name[1]=='.' && de->d_name[2]==0))) + continue; + + snprintf(fnbuf, sizeof(fnbuf), "%s/%s", dirname, de->d_name); + + node = fnbuf; + lstat(fnbuf, &st); + if(S_ISLNK(st.st_mode)) + { + int len; + len = readlink(fnbuf, linkbuf, sizeof(linkbuf)-1); + if(len!=-1) + { + linkbuf[len] = 0; + node = linkbuf; + } + } + + if(checked) + { + for(i=0; (!duplicate && i=2) + printf("Device %s is a duplicate\n", fnbuf); + continue; + } + + checked = (char **)realloc(checked, (n_checked+1)*sizeof(char *)); + checked[n_checked] = strdup(node); + ++n_checked; + + nodes = (char **)realloc(nodes, (n_nodes+2)*sizeof(char *)); + nodes[n_nodes] = strdup(fnbuf); + ++n_nodes; + } + + closedir(dir); + if(checked) + { + for(i=0; id_name[0]=='.' && (de->d_name[1]==0 || (de->d_name[1]=='.' && de->d_name[2]==0))) + Property *props; + + if(verbosity>=1) + printf("Examining device %s\n", nodes[i]); + + props = get_device_properties(nodes[i]); + if(!props) + { + if(verbosity>=2) + printf(" No properties\n"); continue; + } - snprintf(fnbuf, sizeof(fnbuf), "/dev/disk/by-id/%s", de->d_name); - Property *props = get_device_properties(fnbuf); - if(match_property_value(props, "ID_BUS", "usb") && match_property_value(props, "DEVTYPE", "partition")) + if(verbosity>=2) + { + int j; + for(j=0; props[j].name; ++j) + printf(" %s = %s\n", props[j].name, props[j].value); + } + + if(can_mount(props, fstab)) { char *devname; char *label; @@ -236,7 +460,8 @@ Device *get_devices(void) char pos; struct stat st; - /*printf("Using device %s\n", fnbuf);*/ + if(verbosity>=1) + printf(" Using device\n"); devname = get_property_value(props, "DEVNAME"); @@ -260,21 +485,23 @@ Device *get_devices(void) if(vendor && model) pos += snprintf(buf+pos, sizeof(buf)-pos, " (%s %s)", vendor, model); - stat(fnbuf, &st); + stat(nodes[i], &st); devices = (Device *)realloc(devices, (n_devices+2)*sizeof(Device)); - devices[n_devices].node = strdup(fnbuf); + 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; } + else + free(nodes[i]); free_properties(props); } - closedir(dir); - free_mounted_devices(mounted); + free(nodes); + free_string_array(mounted); if(devices) { @@ -295,6 +522,7 @@ void free_devices(Device *devices) { free(devices[i].node); free(devices[i].label); + free(devices[i].description); } free(devices); } @@ -303,6 +531,7 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu { GtkTreeModel *model; GtkTreeIter iter; + int umount = *(int *)user_data; model = gtk_tree_view_get_model(list); @@ -319,33 +548,76 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu pid = fork(); if(pid==0) { + if(verbosity>=1) + { + if(umount) + printf("Running pumount %s\n", device->node); + else + printf("Running pmount %s %s\n", device->node, device->label); + } + close(pipe_fd[0]); dup2(pipe_fd[1], 1); dup2(pipe_fd[1], 2); - execl("/usr/bin/pmount", "pmount", device->node, device->label, NULL); + + if(umount) + execl("/usr/bin/pumount", "pumount", device->node, NULL); + else + execl("/usr/bin/pmount", "pmount", device->node, device->label, NULL); _exit(1); } else if(pid>0) { 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; @@ -357,40 +629,86 @@ 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; time_t latest; + int opt; + int umount = 0; + int n_listed; gtk_init(&argc, &argv); + while((opt = getopt(argc, argv, "vu"))!=-1) switch(opt) + { + case 'v': + ++verbosity; + break; + case 'u': + umount = 1; + break; + } + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_container_set_border_width(GTK_CONTAINER(window), 5); - g_signal_connect(window, "destroy", >k_main_quit, NULL); + 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); - g_signal_connect(list, "row-activated", (GCallback)&row_activated, NULL); + g_signal_connect(list, "row-activated", G_CALLBACK(&row_activated), &umount); 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)); @@ -399,12 +717,17 @@ 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) { latest = 0; for(i=0; devices[i].node; ++i) - if(!devices[i].mounted) + if(!devices[i].mounted==!umount) { gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, devices[i].description, 1, &devices[i], -1); @@ -413,16 +736,21 @@ int main(int argc, char **argv) latest = devices[i].time; gtk_tree_selection_select_iter(selection, &iter); } + + ++n_listed; } - gtk_widget_show_all(window); } + + if(n_listed) + gtk_widget_show_all(window); else { GtkWidget *dialog; - dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "No devices found"); - g_signal_connect(dialog, "response", >k_main_quit, NULL); + dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, + "No devices to %s", (umount ? "unmount" : "mount")); + g_signal_connect(dialog, "response", G_CALLBACK(>k_main_quit), NULL); gtk_widget_show_all(dialog); }