]> git.tdb.fi Git - pmount-gui.git/blobdiff - main.c
More efficient way to recognize removable buses
[pmount-gui.git] / main.c
diff --git a/main.c b/main.c
index ee55972c95d8570a7625e7e2c9cb638ca09a39e0..d1a2853c48dcb4d512cd78623893e3e449c06dd7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,11 +1,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <dirent.h>
 #include <mntent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 typedef struct sProperty
 {
@@ -68,7 +71,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;
@@ -76,6 +80,9 @@ Property *get_device_properties(char *node)
 
                close(pipe_fd[1]);
 
+               bufsize = 256;
+               buf = (char *)malloc(bufsize);
+
                while(1)
                {
                        int newline;
@@ -86,7 +93,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)
@@ -100,7 +107,13 @@ 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)
                        {
@@ -115,6 +128,8 @@ Property *get_device_properties(char *node)
                                break;
                }
 
+               free(buf);
+
                if(props)
                {
                        props[n_props].name = NULL;
@@ -165,47 +180,157 @@ 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;
 }
 
-int is_mounted(char **mounted, char *devname)
+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_in_array(char **names, char *devname)
 {
        int i;
-       for(i=0; mounted[i]; ++i)
-               if(!strcmp(devname, mounted[i]))
+       if(!names || !devname)
+               return 0;
+       for(i=0; names[i]; ++i)
+               if(!strcmp(devname, names[i]))
                        return 1;
        return 0;
 }
 
-void free_mounted_devices(char **mounted)
+void free_device_names(char **names)
 {
        int i;
-       if(!mounted)
+       if(!names)
                return;
-       for(i=0; mounted[i]; ++i)
-               free(mounted[i]);
-       free(mounted);
+       for(i=0; names[i]; ++i)
+               free(names[i]);
+       free(names);
+}
+
+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);
+                       *ptr = 0;
+
+                       if(len!=-1)
+                       {
+                               int i;
+                               linkbuf[len] = 0;
+                               for(; (len>0 && linkbuf[len-1]!='/'); --len) ;
+                               if(verbosity>=2)
+                                       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;
+                       }
+               }
+
+       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, "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)
@@ -256,7 +381,7 @@ char **get_device_nodes(char *dirname)
                }
                if(duplicate)
                {
-                       if(verbosity>=1)
+                       if(verbosity>=2)
                                printf("Device %s is a duplicate\n", fnbuf);
                        continue;
                }
@@ -290,10 +415,12 @@ 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)
        {
@@ -315,7 +442,7 @@ Device *get_devices(void)
                                printf("  %s = %s\n", props[j].name, props[j].value);
                }
 
-               if(match_property_value(props, "ID_BUS", "usb") && match_property_value(props, "DEVTYPE", "partition"))
+               if(can_mount(props, fstab))
                {
                        char *devname;
                        char *label;
@@ -356,7 +483,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;
                }
@@ -366,7 +493,7 @@ Device *get_devices(void)
        }
 
        free(nodes);
-       free_mounted_devices(mounted);
+       free_device_names(mounted);
 
        if(devices)
        {
@@ -387,6 +514,7 @@ void free_devices(Device *devices)
        {
                free(devices[i].node);
                free(devices[i].label);
+               free(devices[i].description);
        }
        free(devices);
 }
@@ -412,7 +540,7 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
                pid = fork();
                if(pid==0)
                {
-                       if(verbosity>=2)
+                       if(verbosity>=1)
                        {
                                if(umount)
                                        printf("Running pumount %s\n", device->node);
@@ -470,6 +598,20 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
        (void)column;
 }
 
+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;
@@ -499,7 +641,8 @@ 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", &gtk_main_quit, NULL);
+       g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
+       g_signal_connect(window, "key-press-event", G_CALLBACK(&key_press), NULL);
 
        viewport = gtk_viewport_new(NULL, NULL);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);
@@ -507,7 +650,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", (GCallback)&row_activated, &umount);
+       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));
@@ -545,7 +688,7 @@ int main(int argc, char **argv)
 
                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", &gtk_main_quit, NULL);
+               g_signal_connect(dialog, "response", G_CALLBACK(&gtk_main_quit), NULL);
                gtk_widget_show_all(dialog);
        }