Add pmount options
authorMichael Krylov <sqarert@gmail.com>
Sat, 23 Jan 2016 23:23:42 +0000 (02:23 +0300)
committerMikko Rasa <tdb@tdb.fi>
Mon, 25 Jan 2016 10:07:01 +0000 (12:07 +0200)
main.c

diff --git a/main.c b/main.c
index 5aa961130cd80890b732ea6be857b1a23547c8a1..e4fb87e425019da9253866b68a2d7a4f7ef60671 100644 (file)
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@ typedef struct sDevice
 
 int verbosity = 0;
 char *post_mount_command = NULL;
+char **pmount_argv = NULL;
 
 /**
 Parses a string of the form name=value and places the components in a Property
@@ -675,12 +676,31 @@ int toggle_device(Device *device, char *out_buf, int out_size)
        if(pid==0)
        {
                /* Child process */
+
+               /* Complete construction of pmount call */
+               int last;
+
+               pmount_argv[0] = "pmount";
+
+               last = 0;
+               while(pmount_argv[++last]);
+
+               pmount_argv[last] = device->node;
+               pmount_argv[last+1] = mount_point+7;
+               pmount_argv[last+2] = NULL;
+
                if(verbosity>=1)
                {
                        if(umount)
                                printf("Running pumount %s\n", device->node);
                        else
-                               printf("Running pmount %s %s\n", device->node, mount_point+7);
+                       {
+                               int i = 0;
+                               printf("Running pmount");
+                               while(pmount_argv[++i])
+                                       printf(" %s", pmount_argv[i]);
+                               printf("\n");
+                       }
                }
 
                close(pipe_fd[0]);
@@ -690,7 +710,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, mount_point+7, NULL);
+                       execvp("/usr/bin/pmount", pmount_argv);
                _exit(1);
        }
        else if(pid<0)
@@ -853,7 +873,7 @@ void show_help(void)
 {
        printf("pmount-gui\n"
                "Copyright (c) 2011-2015 Mikko Rasa, Mikkosoft Productions\n\n"
-               "Usage: pmount-gui [-v] [-u] [-r <command>] [-h]\n\n"
+               "Usage: pmount-gui [-v] [-u] [-r <command>] [-h] [-- <pmount options>]\n\n"
                "Options:\n"
                "  -v  Increase verbosity\n"
                "  -u  Unmount a device (default is mount)\n"
@@ -896,6 +916,16 @@ int main(int argc, char **argv)
                return 0;
        }
 
+       /* argc - optind equals to number of options after "--" */
+       /* One empty element at the beginning is for program name for execvp */
+       /* Three empty elements at the end are required options for pmount + NULL */
+
+       pmount_argv = malloc(sizeof(char *)*(argc-optind+4));
+
+       for(i=0; i<(argc-optind); ++i)
+                       pmount_argv[i+1] = argv[optind+i];
+       pmount_argv[argc-optind+1] = NULL;
+
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
        g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
@@ -963,5 +993,7 @@ int main(int argc, char **argv)
 
        free_devices(devices);
 
+       free(pmount_argv);
+
        return 0;
 }