#include <sys/stat.h>
#include <sys/wait.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
typedef struct sProperty
{
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(file);
+ if(devices)
+ devices[n_devices] = NULL;
- endmntent(mtab);
- mounted[n_mounted] = NULL;
+ return devices;
+}
+
+char **get_mounted_devices(void)
+{
+ return get_mount_entries("/etc/mtab", NULL);
+}
- return mounted;
+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_mounted(char **mounted, char *devname)
+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)
return 0;
}
-int can_mount(Property *props)
+int can_mount(Property *props, char **allowed)
{
static char *removable_buses[] = { "usb", "firewire", 0 };
+ char *devname;
char *devpath;
- int i;
+ char *bus;
+
+ devname = get_property_value(props, "DEVNAME");
+ 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;
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;
+ bus = get_property_value(props, "ID_BUS");
+ if(is_in_array(removable_buses, bus))
+ return 1;
return check_buses(devpath, removable_buses);
}
}
if(duplicate)
{
- if(verbosity>=1)
+ if(verbosity>=2)
printf("Device %s is a duplicate\n", fnbuf);
continue;
}
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)
{
printf(" %s = %s\n", props[j].name, props[j].value);
}
- if(can_mount(props))
+ if(can_mount(props, fstab))
{
char *devname;
char *label;
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;
}
}
free(nodes);
- free_mounted_devices(mounted);
+ free_device_names(mounted);
if(devices)
{
pid = fork();
if(pid==0)
{
- if(verbosity>=2)
+ if(verbosity>=1)
{
if(umount)
printf("Running pumount %s\n", device->node);
(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;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(window), 5);
- g_signal_connect(window, "destroy", >k_main_quit, NULL);
+ g_signal_connect(window, "destroy", G_CALLBACK(>k_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);
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));
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", >k_main_quit, NULL);
+ g_signal_connect(dialog, "response", G_CALLBACK(>k_main_quit), NULL);
gtk_widget_show_all(dialog);
}