+/* Required for strdup, snprintf, getopt */
+#define _XOPEN_SOURCE 500
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <mntent.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#include <sys/select.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
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)
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;
}
}
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;
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)
}
free(nodes);
- free_device_names(mounted);
+ free_string_array(mounted);
if(devices)
{
{
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;
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)
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;
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);
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)