conf.c: Cleanup __S_ISTYPE

__S_ISTYPE doesn't exist in all C libraries, so define it if it's missing. Additionaly, replace one occurence where it wasn't actually needed. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

conf.c: Cleanup __S_ISTYPE
72f919c4 · Stéphane Graber · edaf8b1b · 72f919c4
Commit 72f919c4 authored Jan 03, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

conf.c src/lxc/conf.c +6 -1

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -166,6 +166,11 @@ return -1;
 }
 #endif
+/* Define __S_ISTYPE if missing from the C library */
+#ifndef __S_ISTYPE
+#define        __S_ISTYPE(mode, mask)  (((mode) & S_IFMT) == (mask))
+#endif
 char *lxchook_names[NUM_LXC_HOOKS] = {
 	"pre-start", "pre-mount", "mount", "start", "post-stop" };
@@ -590,7 +595,7 @@ int pin_rootfs(const char *rootfs)
 		return -1;
 	}
-	if (!__S_ISTYPE(s.st_mode, S_IFDIR))
+	if (!S_ISDIR(s.st_mode))
 		return -2;
 	ret = snprintf(absrootfspin, MAXPATHLEN, "%s%s", absrootfs, ".hold");