X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevsend.c;h=dcd5a2ae934ab4620d392e52b93de39bcbfda5ce;hb=67747e1de37158cd58782f432ccba8db55251592;hp=05a50facc51600cb5eeb04eed1e3702f279686c4;hpb=eabfc9736703ce0dc81b233d78821d408aa565f2;p=elogind.git

diff --git a/udevsend.c b/udevsend.c
index 05a50facc..dcd5a2ae9 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -43,7 +43,7 @@
 /* global variables */
 static int sock = -1;
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
 	va_list	args;
@@ -148,10 +148,6 @@ int main(int argc, char *argv[], char *envp[])
 
 		key = envp[i];
 		keylen = strlen(key);
-		if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
-			dbg("environment buffer too small, probably not called by the kernel");
-			continue;
-		}
 
 		/* prevent loops in the scripts we execute */
 		if (strncmp(key, "UDEVD_EVENT=", 12) == 0) {
@@ -159,6 +155,11 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 
+		if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
+			dbg("environment buffer too small, probably not called by the kernel");
+			continue;
+		}
+
 		/* remember the SUBSYSTEM */
 		if (strncmp(key, "SUBSYSTEM=", 10) == 0)
 			subsystem = &key[10];
@@ -194,10 +195,10 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("try to start udevd daemon");
 			retval = start_daemon();
 			if (retval) {
-				info("error starting daemon");
+				dbg("error starting daemon");
 				goto fallback;
 			}
-			info("udevd daemon started");
+			dbg("udevd daemon started");
 			started_daemon = 1;
 		} else {
 			dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop);