X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtest.c;h=e67d45257786cd2a0cab019e904d5c87bd5e9ac0;hp=4956758636206343ba0139c6dec8d89da7d7beae;hb=3f20eac0a58dc3987200773a39163e30b60993fc;hpb=c80da5085f915bf6305e7ed6b786b63f6e9b14ea

diff --git a/udevtest.c b/udevtest.c
index 495675863..e67d45257 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -38,15 +38,11 @@ char **main_argv;
 char **main_envp;
 
 #ifdef LOG
-unsigned char logname[42];
+unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
-	va_list	args;
+	va_list args;
 
-//	if (!udev_log)
-//		return;
-
-	/* FIXME use level... */
 	va_start(args, format);
 	vprintf(format, args);
 	va_end(args);
@@ -55,59 +51,24 @@ void log_message (int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
-{
-	switch (signum) {
-		case SIGINT:
-		case SIGTERM:
-			exit(20 + signum);
-		default:
-			dbg("unhandled signal");
-	}
-}
-
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
-
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-	char *seqnum;
-
-	seqnum = getenv("SEQNUM");
-	return seqnum;
-}
-
 static char *subsystem_blacklist[] = {
 	"net",
 	"scsi_host",
 	"scsi_device",
 	"usb_host",
 	"pci_bus",
-	"",
+	"pcmcia_socket",
+	""
 };
 
-static int udev_hotplug(int argc, char **argv)
+static int udev_hotplug(void)
 {
 	char *devpath;
 	char *subsystem;
 	int retval = -EINVAL;
 	int i;
-	struct sigaction act;
 
-	devpath = argv[1];
+	devpath = main_argv[1];
 	if (!devpath) {
 		dbg("no devpath?");
 		goto exit;
@@ -122,7 +83,7 @@ static int udev_hotplug(int argc, char **argv)
 	}
 
 	/* skip blacklisted subsystems */
-	subsystem = argv[1];
+	subsystem = main_argv[1];
 	i = 0;
 	while (subsystem_blacklist[i][0] != '\0') {
 		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -135,16 +96,10 @@ static int udev_hotplug(int argc, char **argv)
 	/* initialize our configuration */
 	udev_init_config();
 
-	/* set up a default signal handler for now */
-	act.sa_handler = sig_handler;
-	sigemptyset (&act.sa_mask);
-	act.sa_flags = SA_RESTART;
-	sigaction(SIGINT, &act, NULL);
-	sigaction(SIGTERM, &act, NULL);
-
 	/* initialize the naming deamon */
 	namedev_init();
 
+	/* simulate node creation with fake flag */
 	retval = udev_add_device(devpath, subsystem, 1);
 
 exit:
@@ -154,14 +109,14 @@ exit:
 	return -retval;
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
 {
 	main_argv = argv;
 	main_envp = envp;
 
 	dbg("version %s", UDEV_VERSION);
 
-	return udev_hotplug(argc, argv);
+	return udev_hotplug();
 }