Minor refactoring

[pmount-gui.git] / main.c

diff --git a/main.c b/main.c
index 916c2e214fce6c636c6eaf5889a012231af990eb..2472f5db6057f2b1e2b4b31175f333e124f7a3ae 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,3 +1,5 @@
+/* Required for strdup, snprintf, getopt */
+#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -7,6 +9,7 @@
 #include <mntent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/select.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -221,25 +224,25 @@ char **get_fstab_devices(void)
        return get_mount_entries("/etc/fstab", &is_user_mountable);
 }
 
-int is_in_array(char **names, char *devname)
+int is_in_array(char **array, char *str)
 {
        int i;
-       if(!names || !devname)
+       if(!array || !str)
                return 0;
-       for(i=0; names[i]; ++i)
-               if(!strcmp(devname, names[i]))
+       for(i=0; array[i]; ++i)
+               if(!strcmp(str, array[i]))
                        return 1;
        return 0;
 }
 
-void free_device_names(char **names)
+void free_string_array(char **array)
 {
        int i;
-       if(!names)
+       if(!array)
                return;
-       for(i=0; names[i]; ++i)
-               free(names[i]);
-       free(names);
+       for(i=0; array[i]; ++i)
+               free(array[i]);
+       free(array);
 }
 
 int is_removable(char *devpath)
@@ -290,18 +293,18 @@ 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;
                        }
                }
 
@@ -427,10 +430,12 @@ Device *get_devices(void)
 
        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)
@@ -496,7 +501,7 @@ Device *get_devices(void)
        }
 
        free(nodes);
-       free_device_names(mounted);
+       free_string_array(mounted);
 
        if(devices)
        {
@@ -565,7 +570,7 @@ 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;
 
@@ -587,11 +592,32 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
                                        pos += len;
                                }
                                else if(waitpid(pid, &status, 0))
+                               {
+                                       pid = 0;
                                        break;
+                               }
                        }
 
+                       if(pid)
+                               waitpid(pid, &status, 0);
+
                        buf[pos] = 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;
@@ -603,14 +629,28 @@ 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)
@@ -628,10 +668,12 @@ gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 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;
@@ -657,9 +699,12 @@ int main(int argc, char **argv)
        g_signal_connect(window, "destroy", G_CALLBACK(&gtk_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);
@@ -672,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)