Change the verbosity levels of some messages

[pmount-gui.git] / main.c

diff --git a/main.c b/main.c
index ee55972c95d8570a7625e7e2c9cb638ca09a39e0..f62b7b0b0b6f28f7791352c75eb5d0cdee8cfefc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <dirent.h>
 #include <mntent.h>
 #include <sys/stat.h>
@@ -68,7 +70,8 @@ Property *get_device_properties(char *node)
        }
        else if(pid>0)
        {
-               char buf[256];
+               char *buf;
+               int bufsize;
                int pos = 0;
                int eof = 0;
                Property *props = NULL;
@@ -76,6 +79,9 @@ Property *get_device_properties(char *node)
 
                close(pipe_fd[1]);
 
+               bufsize = 256;
+               buf = (char *)malloc(bufsize);
+
                while(1)
                {
                        int newline;
@@ -86,7 +92,7 @@ Property *get_device_properties(char *node)
                        {
                                int len;
 
-                               len = read(pipe_fd[0], buf+pos, sizeof(buf)-pos);
+                               len = read(pipe_fd[0], buf+pos, bufsize-pos);
                                if(len==0)
                                        eof = 1;
                                else if(len==-1)
@@ -100,7 +106,13 @@ Property *get_device_properties(char *node)
                                        newline = i;
 
                        if(newline<0)
-                               break;
+                       {
+                               if(eof)
+                                       break;
+                               bufsize *= 2;
+                               buf = (char *)realloc(buf, bufsize);
+                               continue;
+                       }
 
                        if(parse_property(buf, newline, &prop)==0)
                        {
@@ -115,6 +127,8 @@ Property *get_device_properties(char *node)
                                break;
                }
 
+               free(buf);
+
                if(props)
                {
                        props[n_props].name = NULL;
@@ -208,6 +222,92 @@ void free_mounted_devices(char **mounted)
        free(mounted);
 }
 
+int is_removable(char *devpath)
+{
+       char fnbuf[256];
+       int len;
+       char *ptr;
+       int fd;
+
+       len = snprintf(fnbuf, sizeof(fnbuf), "/sys%s", devpath);
+       if(len+10>=(int)sizeof(fnbuf))
+               return 0;
+
+       for(ptr=fnbuf+len; (ptr>fnbuf && *ptr!='/'); --ptr) ;
+       strcpy(ptr, "/removable");
+       fd = open(fnbuf, O_RDONLY);
+       if(fd!=-1)
+       {
+               char c;
+               read(fd, &c, 1);
+               close(fd);
+               if(c=='1')
+               {
+                       if(verbosity>=2)
+                               printf("  Removable\n");
+                       return 1;
+               }
+               if(verbosity>=2)
+                       printf("  Not removable\n");
+       }
+
+       return 0;
+}
+
+int check_buses(char *devpath, char **buses)
+{
+       char fnbuf[256];
+       char *ptr;
+       int len;
+
+       len = snprintf(fnbuf, sizeof(fnbuf), "/sys%s", devpath);
+       if(len+10>=(int)sizeof(fnbuf))
+               return 0;
+
+       for(ptr=fnbuf+len; ptr>fnbuf+12; --ptr)
+               if(*ptr=='/')
+               {
+                       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)
+                                       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;
+                       }
+               }
+
+       return 0;
+}
+
+int can_mount(Property *props)
+{
+       static char *removable_buses[] = { "usb", "firewire", 0 };
+       char *devpath;
+       int i;
+
+       if(!match_property_value(props, "DEVTYPE", "partition"))
+               return 0;
+
+       devpath = get_property_value(props, "DEVPATH");
+       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;
+
+       return check_buses(devpath, removable_buses);
+}
+
 char **get_device_nodes(char *dirname)
 {
        DIR *dir;
@@ -256,7 +356,7 @@ char **get_device_nodes(char *dirname)
                }
                if(duplicate)
                {
-                       if(verbosity>=1)
+                       if(verbosity>=2)
                                printf("Device %s is a duplicate\n", fnbuf);
                        continue;
                }
@@ -315,7 +415,7 @@ Device *get_devices(void)
                                printf("  %s = %s\n", props[j].name, props[j].value);
                }
 
-               if(match_property_value(props, "ID_BUS", "usb") && match_property_value(props, "DEVTYPE", "partition"))
+               if(can_mount(props))
                {
                        char *devname;
                        char *label;
@@ -387,6 +487,7 @@ void free_devices(Device *devices)
        {
                free(devices[i].node);
                free(devices[i].label);
+               free(devices[i].description);
        }
        free(devices);
 }
@@ -412,7 +513,7 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
                pid = fork();
                if(pid==0)
                {
-                       if(verbosity>=2)
+                       if(verbosity>=1)
                        {
                                if(umount)
                                        printf("Running pumount %s\n", device->node);