]> git.tdb.fi Git - pmount-gui.git/blobdiff - main.c
Add verbose flag and unmount mode
[pmount-gui.git] / main.c
diff --git a/main.c b/main.c
index 10bf929ed3a5ee496c83dd704b73502bacbed04e..910983fb94498a7211fdc9f4921944294a4f9a48 100644 (file)
--- a/main.c
+++ b/main.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
+#include <mntent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <gtk/gtk.h>
@@ -17,9 +18,12 @@ typedef struct sDevice
        char *node;
        char *label;
        char *description;
+       int mounted;
        time_t time;
 } Device;
 
+int verbosity = 0;
+
 int parse_property(char *str, int size, Property *prop)
 {
        int equals = -1;
@@ -48,13 +52,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);
 
@@ -99,9 +104,7 @@ Property *get_device_properties(char *node)
 
                        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 = (Property *)realloc(props, (n_props+2)*sizeof(Property));
                                props[n_props] = prop;
                                ++n_props;
 
@@ -112,8 +115,11 @@ Property *get_device_properties(char *node)
                                break;
                }
 
-               props[n_props].name = NULL;
-               props[n_props].value = NULL;
+               if(props)
+               {
+                       props[n_props].name = NULL;
+                       props[n_props].value = NULL;
+               }
 
                waitpid(pid, NULL, 0);
                close(pipe_fd[0]);
@@ -159,6 +165,49 @@ void free_properties(Property *props)
        free(props);
 }
 
+char **get_mounted_devices(void)
+{
+       FILE *mtab;
+       struct mntent *me;
+       char **mounted = NULL;
+       int n_mounted = 0;
+
+       mtab = setmntent("/etc/mtab", "r");
+       if(!mtab)
+               return NULL;
+
+       while((me = getmntent(mtab)))
+       {
+               mounted = (char **)realloc(mounted, (n_mounted+2)*sizeof(char *));
+               mounted[n_mounted] = strdup(me->mnt_fsname);
+               ++n_mounted;
+       }
+
+       endmntent(mtab);
+       mounted[n_mounted] = NULL;
+
+       return mounted;
+}
+
+int is_mounted(char **mounted, char *devname)
+{
+       int i;
+       for(i=0; mounted[i]; ++i)
+               if(!strcmp(devname, mounted[i]))
+                       return 1;
+       return 0;
+}
+
+void free_mounted_devices(char **mounted)
+{
+       int i;
+       if(!mounted)
+               return;
+       for(i=0; mounted[i]; ++i)
+               free(mounted[i]);
+       free(mounted);
+}
+
 Device *get_devices(void)
 {
        DIR *dir;
@@ -166,17 +215,41 @@ Device *get_devices(void)
        char fnbuf[256];
        Device *devices = NULL;
        int n_devices = 0;
+       char **mounted = NULL;
        
        dir = opendir("/dev/disk/by-id");
+       if(!dir)
+               return NULL;
+
+       mounted = get_mounted_devices();
+
        while((de = readdir(dir)))
        {
                if(de->d_name[0]=='.' && (de->d_name[1]==0 || (de->d_name[1]=='.' && de->d_name[2]==0)))
                        continue;
 
                snprintf(fnbuf, sizeof(fnbuf), "/dev/disk/by-id/%s", de->d_name);
+               if(verbosity>=1)
+                       printf("Examining device %s\n", fnbuf);
+
                Property *props = get_device_properties(fnbuf);
+               if(!props)
+               {
+                       if(verbosity>=2)
+                               printf("  No properties\n");
+                       continue;
+               }
+
+               if(verbosity>=2)
+               {
+                       int i;
+                       for(i=0; props[i].name; ++i)
+                               printf("  %s = %s\n", props[i].name, props[i].value);
+               }
+
                if(match_property_value(props, "ID_BUS", "usb") && match_property_value(props, "DEVTYPE", "partition"))
                {
+                       char *devname;
                        char *label;
                        char *vendor;
                        char *model;
@@ -184,7 +257,10 @@ 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");
 
                        label = get_property_value(props, "ID_FS_LABEL");
                        if(!label)
@@ -193,11 +269,12 @@ Device *get_devices(void)
                        {
                                char *ptr;
 
-                               label = get_property_value(props, "DEVNAME");
+                               label = devname;
                                for(ptr=label; *ptr; ++ptr)
                                        if(*ptr=='/')
                                                label = ptr+1;
                        }
+
                        vendor = get_property_value(props, "ID_VENDOR");
                        model = get_property_value(props, "ID_MODEL");
 
@@ -211,14 +288,22 @@ Device *get_devices(void)
                        devices[n_devices].node = strdup(fnbuf);
                        devices[n_devices].label = strdup(label);
                        devices[n_devices].description = strdup(buf);
+                       devices[n_devices].mounted = is_mounted(mounted, devname);
                        devices[n_devices].time = st.st_mtime;
                        ++n_devices;
                }
                free_properties(props);
        }
 
-       devices[n_devices].node = NULL;
-       devices[n_devices].label = NULL;
+       closedir(dir);
+       free_mounted_devices(mounted);
+
+       if(devices)
+       {
+               devices[n_devices].node = NULL;
+               devices[n_devices].label = NULL;
+               devices[n_devices].description = NULL;
+       }
 
        return devices;
 }
@@ -240,6 +325,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);
 
@@ -247,25 +333,71 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
        {
                Device *device;
                int pid;
+               int pipe_fd[2];
 
                gtk_tree_model_get(model, &iter, 1, &device, -1);
 
+               pipe(pipe_fd);
+
                pid = fork();
                if(pid==0)
                {
-                       execl("/usr/bin/pmount", "pmount", device->node, device->label, NULL);
+                       if(verbosity>=2)
+                       {
+                               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);
+
+                       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)
                {
-                       waitpid(pid, NULL, 0);
+                       char buf[1024];
+                       int pos = 0;
+                       int status;
+
+                       close(pipe_fd[1]);
+
+                       while(1)
+                       {
+                               int len;
+
+                               len = read(pipe_fd[0], buf+pos, sizeof(buf)-pos-1);
+                               if(len<=0)
+                                       break;
+                               pos += len;
+                       }
+
+                       buf[pos] = 0;
+
+                       waitpid(pid, &status, 0);
+                       if(!WIFEXITED(status) || WEXITSTATUS(status))
+                       {
+                               GtkWidget *dialog;
+
+                               dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", buf);
+                               g_signal_connect(dialog, "response", &gtk_main_quit, NULL);
+                               gtk_widget_show_all(dialog);
+                       }
+                       else
+                               gtk_main_quit();
+               }
+               else
+               {
                }
        }
 
        (void)column;
-       (void)user_data;
-
-       gtk_main_quit();
 }
 
 int main(int argc, char **argv)
@@ -279,9 +411,22 @@ int main(int argc, char **argv)
        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", &gtk_main_quit, NULL);
@@ -292,7 +437,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, NULL);
+       g_signal_connect(list, "row-activated", (GCallback)&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));
@@ -302,19 +447,38 @@ int main(int argc, char **argv)
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
 
        devices = get_devices();
-       latest = 0;
-       for(i=0; devices[i].node; ++i)
+       n_listed = 0;
+       if(devices)
        {
-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter, 0, devices[i].description, 1, &devices[i], -1);
-               if(devices[i].time>latest)
-               {
-                       latest = devices[i].time;
-                       gtk_tree_selection_select_iter(selection, &iter);
-               }
+               latest = 0;
+               for(i=0; devices[i].node; ++i)
+                       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);
+                               if(devices[i].time>latest)
+                               {
+                                       latest = devices[i].time;
+                                       gtk_tree_selection_select_iter(selection, &iter);
+                               }
+
+                               ++n_listed;
+                       }
+
+       }
+
+       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 to %s", (umount ? "unmount" : "mount"));
+               g_signal_connect(dialog, "response", &gtk_main_quit, NULL);
+               gtk_widget_show_all(dialog);
        }
 
-       gtk_widget_show_all(window);
        gtk_main();
 
        free_devices(devices);