From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Wed, 5 Jan 2005 04:31:42 +0000 (+0100)
Subject: [PATCH] correct detection of hotplug.d/ udevsend loop
X-Git-Tag: 051~26
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d3c3763530955a898e1d50c6844765e94ac957c2

[PATCH] correct detection of hotplug.d/ udevsend loop

If udevsend is called from the commandline the env may be too
big to fit in our buffer and we tag the message.
---

diff --git a/udevsend.c b/udevsend.c
index 05a50facc..d86004ba3 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -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];