+/* 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>
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);
}
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)
{
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;