[PATCH V2 1/2] Define _POSIX_C_SOURCE if undefined

[PATCH V2 1/2] Define _POSIX_C_SOURCE if undefined

[Khem Raj]

config.c uses _POSIX_C_SOURCE which is defined in features.h when
glibc/uclibc is used, but isn't defined when musl is used.
So provide a reasonable default.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Changes since v1:
- Improve the commit meesage
- Divide into separate commit

 config.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.c b/config.c
index c58c8fe..b308b6c 100644
--- a/config.c
+++ b/config.c
@@ -63,6 +63,9 @@
  * but may not wrap over lines
  *
  */
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
 
 #ifndef CONFFILE
 #define CONFFILE "/etc/mdadm.conf"
-- 
2.7.0

[PATCH V2 2/2] Add casts for the addr arg of connect and bind

[Khem Raj]

glibc allows the addr arg to connect and socket to be any of a number
of 'sockaddr_*' types, but musl requires 'const struct sockaddr *'
which is in line with open group specs.  So add casts to allow
compilation with musl.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Changes since v1:
- Improve the commit meesage
- Divide into separate commit

 mdmon.c | 2 +-
 msg.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mdmon.c b/mdmon.c
index ee12b7c..e4b73d9 100644
--- a/mdmon.c
+++ b/mdmon.c
@@ -235,7 +235,7 @@ static int make_control_sock(char *devname)
 	addr.sun_family = PF_LOCAL;
 	strcpy(addr.sun_path, path);
 	umask(077); /* ensure no world write access */
-	if (bind(sfd, &addr, sizeof(addr)) < 0) {
+	if (bind(sfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
 		close(sfd);
 		return -1;
 	}
diff --git a/msg.c b/msg.c
index 754630b..45cd450 100644
--- a/msg.c
+++ b/msg.c
@@ -170,7 +170,7 @@ int connect_monitor(char *devname)
 
 	addr.sun_family = PF_LOCAL;
 	strcpy(addr.sun_path, path);
-	if (connect(sfd, &addr, sizeof(addr)) < 0) {
+	if (connect(sfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
 		close(sfd);
 		return -1;
 	}
-- 
2.7.0

Re: [PATCH V2 2/2] Add casts for the addr arg of connect and bind

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

On Thu, Jan 14 2016, Khem Raj wrote:

> glibc allows the addr arg to connect and socket to be any of a number
> of 'sockaddr_*' types, but musl requires 'const struct sockaddr *'
> which is in line with open group specs.  So add casts to allow
> compilation with musl.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

Thanks a lot!  Both patches applied.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]