From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Tue, 3 Feb 2004 02:10:29 +0000 (-0800)
Subject: [PATCH] let udevsend build with klibc
X-Git-Tag: 016~7
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d5c6d80ff1b617419dfcadb2fea4710d14f34b98

[PATCH] let udevsend build with klibc

> I don't mind udevd using glibc, I just want the programs that get run a
> lot of different times (udev and udevsend) to be as small as possible to
> get the best cache results.  As udevd sticks around all the time, it's
> not as important.  Sound sane to you?

Oh, nice. Good idea.
---

diff --git a/Makefile b/Makefile
index 386583b7e..dd2f69759 100644
--- a/Makefile
+++ b/Makefile
@@ -161,12 +161,12 @@ else
 	CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
 	LIB_OBJS = -lc
 	LDFLAGS =
-	UDEVD = $(DAEMON) $(SENDER)
+	UDEVD = $(DAEMON)
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(UDEVD) $(HELPER)
+all: $(ROOT) $(SENDER) $(UDEVD) $(HELPER)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
diff --git a/klibc/klibc/include/sys/un.h b/klibc/klibc/include/sys/un.h
new file mode 100644
index 000000000..85822ba6a
--- /dev/null
+++ b/klibc/klibc/include/sys/un.h
@@ -0,0 +1,10 @@
+/*
+ * sys/un.h
+ */
+
+#ifndef _UN_H
+#define _UN_H
+
+#include <linux/un.h>
+
+#endif /* _UN_H */
diff --git a/udevsend.c b/udevsend.c
index 415207d8c..fd61cb2a2 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
 	strcpy(saddr.sun_path, UDEVD_SOCK);
 
 	/* try to connect, if it fails start daemon */
-	retval = connect(sock, &saddr, sizeof(saddr));
+	retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
 	if (retval != -1) {
 		goto send;
 	} else {
@@ -182,7 +182,7 @@ int main(int argc, char* argv[])
 	tspec.tv_nsec = 100000000;  /* 100 millisec */
 	loop = UDEVSEND_CONNECT_RETRY;
 	while (loop--) {
-		retval = connect(sock, &saddr, sizeof(saddr));
+		retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
 		if (retval != -1)
 			goto send;
 		else