Close the mount window if esc is pressed

[pmount-gui.git] / main.c

diff --git a/main.c b/main.c
index 62d6a6cd5619c1414520587b3687dbd0e749ead7..b1dcb1ccc645e57f470fdcbbc6a671bad381d133 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
 {
@@ -220,6 +223,92 @@ void free_mounted_devices(char **mounted)
        free(mounted);
 }
 
+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)
+{
+       static char *removable_buses[] = { "usb", "firewire", 0 };
+       char *devpath;
+       int i;
+
+       if(!match_property_value(props, "DEVTYPE", "partition"))
+               return 0;
+
+       devpath = get_property_value(props, "DEVPATH");
+       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;
+
+       return check_buses(devpath, removable_buses);
+}
+
 char **get_device_nodes(char *dirname)
 {
        DIR *dir;
@@ -268,7 +357,7 @@ char **get_device_nodes(char *dirname)
                }
                if(duplicate)
                {
-                       if(verbosity>=1)
+                       if(verbosity>=2)
                                printf("Device %s is a duplicate\n", fnbuf);
                        continue;
                }
@@ -327,7 +416,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))
                {
                        char *devname;
                        char *label;
@@ -399,6 +488,7 @@ void free_devices(Device *devices)
        {
                free(devices[i].node);
                free(devices[i].label);
+               free(devices[i].description);
        }
        free(devices);
 }
@@ -424,7 +514,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);
@@ -482,6 +572,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;
@@ -511,7 +615,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);
@@ -519,7 +624,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));
@@ -557,7 +662,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);
        }