Fixes https://github.com/ammongit/minutils/issues/32

src/[.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE	500
+#define _BSD_SOURCE 1
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/domainname.c

@@ -0,0 +1,24 @@
+#define _BSD_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <err.h>
+#include <unistd.h>
+#include <limits.h>
+
+int main(int argc, char *argv[]) {
+  char name[HOST_NAME_MAX + 1];
+
+  if (1 == argc) {
+    if (getdomainname(name, sizeof(name))) {
+      err(EXIT_FAILURE, "getdomainname");
+    }
+    puts(name);
+  } else {
+    if (setdomainname(argv[1], strlen(argv[1]))) {
+      err(EXIT_FAILURE, "setdomainname");
+    }
+  }
+
+  return EXIT_SUCCESS;
+}

src/hostname.c

@@ -0,0 +1,24 @@
+#define _BSD_SOURCE 1
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <err.h>
+#include <unistd.h>
+#include <limits.h>
+
+int main(int argc, char *argv[]) {
+  char name[HOST_NAME_MAX + 1];
+
+  if (1 == argc) {
+    if (gethostname(name, sizeof(name))) {
+      err(EXIT_FAILURE, "gethostname");
+    }
+    puts(name);
+  } else {
+    if (sethostname(argv[1], strlen(argv[1]))) {
+      err(EXIT_FAILURE, "sethostname");
+    }
+  }
+
+  return EXIT_SUCCESS;
+}

src/mknod.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE	500
+#define _BSD_SOURCE 1
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -63,7 +63,7 @@ int main(int argc, const char *argv[])
 		DEV_SOCK,
 		DEV_REGULAR
 	} type;
-	unsigned int major, minor;
+	unsigned int majoor, minoor;
 	mode_t mode;
 	dev_t dev;
 	int i;
@@ -97,9 +97,9 @@ int main(int argc, const char *argv[])
 			argv[0]);
 		return 1;
 	case 4:
-		major = parse_int(argv[i + 2]);
-		minor = parse_int(argv[i + 3]);
-		dev = makedev(major, minor);
+		majoor = parse_int(argv[i + 2]);
+		minoor = parse_int(argv[i + 3]);
+		dev = makedev(majoor, minoor);
 		/* FALLTHROUGH */
 	case 2:
 		path = argv[i];

src/stat.c

@@ -1,8 +1,7 @@
-#define _XOPEN_SOURCE	500
+#define _BSD_SOURCE 1
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/vfs.h>
 #include <pwd.h>
 #include <grp.h>
 #include <unistd.h>
@@ -15,6 +14,7 @@
 #include <time.h>
 
 #if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+# include <sys/vfs.h>
 # include <sys/sysmacros.h>
 #endif /* !__OpenBSD__ && !__FreeBSD__ */
 
@@ -95,7 +95,7 @@ static void print_statblock(const char *path, const struct stat *stbuf)
 	struct group *grp;
 	enum file_type type;
 	char mode[11], deviceinf[21];
-	char atime[32], mtime[32], ctime[32];
+	char atime[32], mtime[32], cctime[32];
 
 	pwd = getpwuid(stbuf->st_uid);
 	grp = getgrgid(stbuf->st_gid);
@@ -155,7 +155,7 @@ static void print_statblock(const char *path, const struct stat *stbuf)
 
 	get_time(atime, sizeof(atime), stbuf->st_atime);
 	get_time(mtime, sizeof(mtime), stbuf->st_mtime);
-	get_time(ctime, sizeof(ctime), stbuf->st_ctime);
+	get_time(cctime, sizeof(cctime), stbuf->st_ctime);
 
 	printf("  File: %s\n"
 	       "  Size: %ld\t\tBlocks: %ld\t   IO Block: %ld   %s\n"
@@ -183,7 +183,7 @@ static void print_statblock(const char *path, const struct stat *stbuf)
 	       (grp) ? grp->gr_name : "???",
 	       atime,
 	       mtime,
-	       ctime,
+	       cctime,
 	       "-");
 }
 

src/strings.c

@@ -9,14 +9,14 @@ static struct {
 	unsigned int min_len;
 } opt;
 
-static int isprint_lookahead(const char *buf, size_t index, size_t len)
+static int isprint_lookahead(const char *buf, size_t idx, size_t len)
 {
 	unsigned int i;
 
 	for (i = 1; i < opt.min_len; i++) {
-		if (index + i >= len)
+		if (idx + i >= len)
 			break;
-		if (!isprint(buf[index + i]))
+		if (!isprint(buf[idx + i]))
 			return 0;
 	}
 	return 1;

src/uptime.c

@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE	500
+#define _BSD_SOURCE 1
 
 #include <errno.h>
 #include <inttypes.h>