From 3d6aa57e67fec2fed980dbe3f0413bce31e1c5b3 Mon Sep 17 00:00:00 2001 From: Live User Date: Sun, 24 Dec 2017 21:00:48 +0000 Subject: [PATCH 1/7] Fixes https://github.com/ammongit/minutils/issues/32 --- src/mknod.c | 10 +++++----- src/strings.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mknod.c b/src/mknod.c index 0f0b696..a1d8c75 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _BSD_SOURCE 1 #include #include @@ -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]; diff --git a/src/strings.c b/src/strings.c index dae1c04..435057d 100644 --- a/src/strings.c +++ b/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; From e6d0d8632682168fd8d9cd8b5047d6a880d85d47 Mon Sep 17 00:00:00 2001 From: Live User Date: Sun, 24 Dec 2017 21:05:25 +0000 Subject: [PATCH 2/7] Re-license some files to compile under *BSD --- src/[.c | 2 +- src/stat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/[.c b/src/[.c index 20f6808..3ac0117 100644 --- a/src/[.c +++ b/src/[.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _BSD_SOURCE 1 #include #include diff --git a/src/stat.c b/src/stat.c index 1afc775..ba30636 100644 --- a/src/stat.c +++ b/src/stat.c @@ -1,8 +1,7 @@ -#define _XOPEN_SOURCE 500 +#define _BSD_SOURCE 1 #include #include -#include #include #include #include @@ -15,6 +14,7 @@ #include #if !defined(__OpenBSD__) && !defined(__FreeBSD__) +# include # include #endif /* !__OpenBSD__ && !__FreeBSD__ */ From 128a99f0b0698d072996ee2449a9b3aeca907981 Mon Sep 17 00:00:00 2001 From: a Date: Mon, 25 Dec 2017 00:23:04 +0200 Subject: [PATCH 3/7] Compile under OpenBSD flawlessly --- src/uptime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uptime.c b/src/uptime.c index fa90571..afd7d5c 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _BSD_SOURCE 1 #include #include From 6bf14ebc3cd47e0b70ab6bed4a7b76321b060e63 Mon Sep 17 00:00:00 2001 From: a Date: Mon, 25 Dec 2017 00:30:04 +0200 Subject: [PATCH 4/7] More shadowed variables --- src/stat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stat.c b/src/stat.c index ba30636..b20e55f 100644 --- a/src/stat.c +++ b/src/stat.c @@ -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, "-"); } From 05dd10d953edd54dcbb7cef24bb0219b92eedbbd Mon Sep 17 00:00:00 2001 From: a Date: Mon, 25 Dec 2017 01:28:32 +0100 Subject: [PATCH 5/7] Add hostname.c --- src/hostname.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/hostname.c diff --git a/src/hostname.c b/src/hostname.c new file mode 100644 index 0000000..f95c42c --- /dev/null +++ b/src/hostname.c @@ -0,0 +1,23 @@ +#include +#include +#include +#include +#include +#include + +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; +} From 78c571c75b12918077655ae3fdbc0f7693f5d8f5 Mon Sep 17 00:00:00 2001 From: a Date: Mon, 25 Dec 2017 01:55:15 +0100 Subject: [PATCH 6/7] Add domainname.c --- src/domainname.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/domainname.c diff --git a/src/domainname.c b/src/domainname.c new file mode 100644 index 0000000..d3c8777 --- /dev/null +++ b/src/domainname.c @@ -0,0 +1,23 @@ +#include +#include +#include +#include +#include +#include + +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; +} From 22a70fa8eaa2f453d880c7b4514d9e0704a9b997 Mon Sep 17 00:00:00 2001 From: a Date: Mon, 25 Dec 2017 12:56:07 +0100 Subject: [PATCH 7/7] Update hostname.c and domainname.c --- src/domainname.c | 1 + src/hostname.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/domainname.c b/src/domainname.c index d3c8777..5f96f59 100644 --- a/src/domainname.c +++ b/src/domainname.c @@ -1,3 +1,4 @@ +#define _BSD_SOURCE 1 #include #include #include diff --git a/src/hostname.c b/src/hostname.c index f95c42c..14c2f5e 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -1,3 +1,4 @@ +#define _BSD_SOURCE 1 #include #include #include