Keep track of device mount points
authorMikko Rasa <tdb@tdb.fi>
Sat, 29 Aug 2015 16:17:07 +0000 (19:17 +0300)
committerMikko Rasa <tdb@tdb.fi>
Sat, 29 Aug 2015 16:18:25 +0000 (19:18 +0300)
main.c

diff --git a/main.c b/main.c
index 9e02fcab676fe849170e52789d483d49e8023e76..e5b644024648727747d9fdd564ff1d5770448df1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -22,9 +22,10 @@ typedef struct sProperty
 typedef struct sDevice
 {
        char *node;
+       char *devname;
        char *label;
        char *description;
-       int mounted;
+       char *mount_point;
        time_t time;
 } Device;
 
@@ -209,21 +210,21 @@ void free_properties(Property *props)
 }
 
 /**
-Reads device names from an fstab/mtab file.
+Returns an array of user-mountable devices listed in fstab.
 */
-char **get_mount_entries(char *filename, int (*predicate)(struct mntent *))
+char **get_fstab_devices(void)
 {
        FILE *file;
        struct mntent *me;
        char **devices = NULL;
        int n_devices = 0;
 
-       file = setmntent(filename, "r");
+       file = setmntent("/etc/fstab", "r");
        if(!file)
                return NULL;
 
        while((me = getmntent(file)))
-               if(!predicate || predicate(me))
+               if(hasmntopt(me, "user")!=NULL)
                {
                        devices = (char **)realloc(devices, (n_devices+2)*sizeof(char *));
                        devices[n_devices] = strdup(me->mnt_fsname);
@@ -237,30 +238,6 @@ char **get_mount_entries(char *filename, int (*predicate)(struct mntent *))
        return devices;
 }
 
-/**
-Returns an array of all currently mounted devices.
-*/
-char **get_mounted_devices(void)
-{
-       return get_mount_entries("/etc/mtab", NULL);
-}
-
-/**
-Checks if an fstab entry has the user option set.
-*/
-int is_user_mountable(struct mntent *me)
-{
-       return hasmntopt(me, "user")!=NULL;
-}
-
-/**
-Returns an array of user-mountable devices listed in fstab.
-*/
-char **get_fstab_devices(void)
-{
-       return get_mount_entries("/etc/fstab", &is_user_mountable);
-}
-
 /**
 Checks if an array of strings contains the specified string.
 */
@@ -493,7 +470,38 @@ char **get_device_nodes(char *dirname)
        return nodes;
 }
 
-/** Returns an array of all mountable devices. */
+/**
+Reads the list of mounted devices from /etc/mtab and records the mount points.
+*/
+void check_mounts(Device *devices)
+{
+       FILE *file;
+       struct mntent *me;
+
+       file = setmntent("/etc/mtab", "r");
+       if(!file)
+               return;
+
+       while((me = getmntent(file)))
+       {
+               int i;
+
+               for(i=0; devices[i].node; ++i)
+                       if(!strcmp(devices[i].devname, me->mnt_fsname))
+                       {
+                               devices[i].mount_point = strdup(me->mnt_dir);
+
+                               if(verbosity>=1)
+                                       printf("Device %s is mounted on %s\n", devices[i].node, devices[i].mount_point);
+                       }
+       }
+
+       endmntent(file);
+}
+
+/**
+Returns an array of all mountable devices.
+*/
 Device *get_devices(void)
 {
        char **nodes = NULL;
@@ -504,7 +512,6 @@ Device *get_devices(void)
        int i;
 
        nodes = get_device_nodes("/dev/disk/by-id");
-       mounted = get_mounted_devices();
        fstab = get_fstab_devices();
 
        for(i=0; nodes[i]; ++i)
@@ -571,9 +578,10 @@ Device *get_devices(void)
                        /* Reserve space for a sentinel entry. */
                        devices = (Device *)realloc(devices, (n_devices+2)*sizeof(Device));
                        devices[n_devices].node = nodes[i];
+                       devices[n_devices].devname = strdup(devname);
                        devices[n_devices].label = strdup(label);
                        devices[n_devices].description = strdup(buf);
-                       devices[n_devices].mounted = is_in_array(mounted, devname);
+                       devices[n_devices].mount_point = NULL;
                        devices[n_devices].time = st.st_mtime;
                        ++n_devices;
                }
@@ -589,8 +597,12 @@ Device *get_devices(void)
        {
                /* Terminate the array with NULL pointers. */
                devices[n_devices].node = NULL;
+               devices[n_devices].devname = NULL;
                devices[n_devices].label = NULL;
                devices[n_devices].description = NULL;
+               devices[n_devices].mount_point = NULL;
+
+               check_mounts(devices);
        }
 
        return devices;
@@ -607,8 +619,11 @@ void free_devices(Device *devices)
        for(i=0; devices[i].node; ++i)
        {
                free(devices[i].node);
+               free(devices[i].devname);
                free(devices[i].label);
                free(devices[i].description);
+               if(devices[i].mount_point)
+                       free(devices[i].mount_point);
        }
        free(devices);
 }
@@ -618,7 +633,9 @@ Mounts a device if it was not mounted, or unmounts if it was.
 */
 int toggle_device(Device *device, char *out_buf, int out_size)
 {
-       int umount = !!device->mounted;
+       int umount = !!device->mount_point;
+       char mount_point[1024];
+       int len;
        int pos = 0;
        int status = 0;
        fd_set fds;
@@ -628,6 +645,10 @@ int toggle_device(Device *device, char *out_buf, int out_size)
 
        out_buf[0] = 0;
 
+       len = snprintf(mount_point, sizeof(mount_point), "/media/%s", device->label);
+       if(len>=(int)sizeof(mount_point))
+               return -1;
+
        pipe(pipe_fd);
 
        pid = fork();
@@ -639,7 +660,7 @@ int toggle_device(Device *device, char *out_buf, int out_size)
                        if(umount)
                                printf("Running pumount %s\n", device->node);
                        else
-                               printf("Running pmount %s %s\n", device->node, device->label);
+                               printf("Running pmount %s %s\n", device->node, mount_point+7);
                }
 
                close(pipe_fd[0]);
@@ -649,7 +670,7 @@ int toggle_device(Device *device, char *out_buf, int out_size)
                if(umount)
                        execl("/usr/bin/pumount", "pumount", device->node, NULL);
                else
-                       execl("/usr/bin/pmount", "pmount", device->node, device->label, NULL);
+                       execl("/usr/bin/pmount", "pmount", device->node, mount_point+7, NULL);
                _exit(1);
        }
        else if(pid<0)
@@ -707,7 +728,13 @@ int toggle_device(Device *device, char *out_buf, int out_size)
        if(!WIFEXITED(status) || WEXITSTATUS(status))
                return -1;
 
-       device->mounted = !device->mounted;
+       if(umount)
+       {
+               free(device->mount_point);
+               device->mount_point = NULL;
+       }
+       else
+               device->mount_point = strdup(mount_point);
 
        return 0;
 }
@@ -746,23 +773,17 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
 
        gtk_main_quit();
 
-       if(post_mount_command && device->mounted)
+       if(post_mount_command && device->mount_point)
        {
-               char workdir[256];
-               int len;
-               len = snprintf(workdir, sizeof(workdir), "/media/%s", device->label);
-               if(len<(int)sizeof(workdir))
-               {
-                       if(verbosity>=1)
-                               printf("Running %s in %s\n", post_mount_command, workdir);
+               if(verbosity>=1)
+                       printf("Running %s in %s\n", post_mount_command, device->mount_point);
 
-                       pid = fork();
-                       if(pid==0)
-                       {
-                               chdir(workdir);
-                               execlp(post_mount_command, post_mount_command, NULL);
-                               _exit(1);
-                       }
+               pid = fork();
+               if(pid==0)
+               {
+                       chdir(device->mount_point);
+                       execlp(post_mount_command, post_mount_command, NULL);
+                       _exit(1);
                }
        }
 
@@ -889,7 +910,7 @@ int main(int argc, char **argv)
                /* Populate the list with devices in appropriate state. */
                latest = 0;
                for(i=0; devices[i].node; ++i)
-                       if(!devices[i].mounted==!umount)
+                       if(!devices[i].mount_point==!umount)
                        {
                                gtk_list_store_append(store, &iter);
                                gtk_list_store_set(store, &iter, 0, devices[i].description, 1, &devices[i], -1);