From d8634bad6a79279cd9e9d2d23ed4f243d8d69da2 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Sat, 19 Sep 2015 23:21:24 +0000 Subject: [PATCH] Move OpenBSD diff(1) into minix/usr.bin Editor's note: NetBSD uses GNU diff. Change-Id: I15d4441c73e0c626d0e5fda8c8683d131fbcbc38 --- minix/commands/Makefile | 2 +- minix/usr.bin/Makefile | 1 + minix/{commands => usr.bin}/diff/Makefile | 0 minix/{commands => usr.bin}/diff/diff.1 | 0 minix/{commands => usr.bin}/diff/diff.c | 0 minix/{commands => usr.bin}/diff/diff.h | 0 minix/{commands => usr.bin}/diff/diffdir.c | 4 ++++ minix/{commands => usr.bin}/diff/diffreg.c | 0 minix/{commands => usr.bin}/diff/pathnames.h | 0 minix/{commands => usr.bin}/diff/xmalloc.c | 0 minix/{commands => usr.bin}/diff/xmalloc.h | 0 11 files changed, 6 insertions(+), 1 deletion(-) rename minix/{commands => usr.bin}/diff/Makefile (100%) rename minix/{commands => usr.bin}/diff/diff.1 (100%) rename minix/{commands => usr.bin}/diff/diff.c (100%) rename minix/{commands => usr.bin}/diff/diff.h (100%) rename minix/{commands => usr.bin}/diff/diffdir.c (98%) rename minix/{commands => usr.bin}/diff/diffreg.c (100%) rename minix/{commands => usr.bin}/diff/pathnames.h (100%) rename minix/{commands => usr.bin}/diff/xmalloc.c (100%) rename minix/{commands => usr.bin}/diff/xmalloc.h (100%) diff --git a/minix/commands/Makefile b/minix/commands/Makefile index cb9ca97d7..48716f071 100644 --- a/minix/commands/Makefile +++ b/minix/commands/Makefile @@ -7,7 +7,7 @@ SUBDIR= add_route arp at backup btrace \ ci cleantmp co \ compress crc cron crontab \ decomp16 DESCRIBE devmand devsize dhcpd \ - dhrystone diff diskctl \ + dhrystone diskctl \ eject fbdctl \ fix format fsck.mfs \ gcov-pull host \ diff --git a/minix/usr.bin/Makefile b/minix/usr.bin/Makefile index 4a115a3f8..2ca8843be 100644 --- a/minix/usr.bin/Makefile +++ b/minix/usr.bin/Makefile @@ -4,6 +4,7 @@ SUBDIR+= eepromread .endif # ${MACHINE_ARCH} == "earm" +SUBDIR+= diff SUBDIR+= grep SUBDIR+= mined SUBDIR+= ministat diff --git a/minix/commands/diff/Makefile b/minix/usr.bin/diff/Makefile similarity index 100% rename from minix/commands/diff/Makefile rename to minix/usr.bin/diff/Makefile diff --git a/minix/commands/diff/diff.1 b/minix/usr.bin/diff/diff.1 similarity index 100% rename from minix/commands/diff/diff.1 rename to minix/usr.bin/diff/diff.1 diff --git a/minix/commands/diff/diff.c b/minix/usr.bin/diff/diff.c similarity index 100% rename from minix/commands/diff/diff.c rename to minix/usr.bin/diff/diff.c diff --git a/minix/commands/diff/diff.h b/minix/usr.bin/diff/diff.h similarity index 100% rename from minix/commands/diff/diff.h rename to minix/usr.bin/diff/diff.h diff --git a/minix/commands/diff/diffdir.c b/minix/usr.bin/diff/diffdir.c similarity index 98% rename from minix/commands/diff/diffdir.c rename to minix/usr.bin/diff/diffdir.c index 2d6f091be..cc4fb992c 100644 --- a/minix/commands/diff/diffdir.c +++ b/minix/usr.bin/diff/diffdir.c @@ -176,7 +176,11 @@ getdiffdirentries(int fd, char *buf, int nbytes) if(!(read_de = malloc(readlen))) errx(1, "getdiffdirentries: can't malloc"); +#ifndef __minix dentsbytes_actual = getdents(fd, (struct dirent *) read_de, readlen); +#else /* __minix */ + dentsbytes_actual = getdents(fd, read_de, readlen); +#endif /* __minix */ if(dentsbytes_actual <= 0) return dentsbytes_actual; diff --git a/minix/commands/diff/diffreg.c b/minix/usr.bin/diff/diffreg.c similarity index 100% rename from minix/commands/diff/diffreg.c rename to minix/usr.bin/diff/diffreg.c diff --git a/minix/commands/diff/pathnames.h b/minix/usr.bin/diff/pathnames.h similarity index 100% rename from minix/commands/diff/pathnames.h rename to minix/usr.bin/diff/pathnames.h diff --git a/minix/commands/diff/xmalloc.c b/minix/usr.bin/diff/xmalloc.c similarity index 100% rename from minix/commands/diff/xmalloc.c rename to minix/usr.bin/diff/xmalloc.c diff --git a/minix/commands/diff/xmalloc.h b/minix/usr.bin/diff/xmalloc.h similarity index 100% rename from minix/commands/diff/xmalloc.h rename to minix/usr.bin/diff/xmalloc.h -- 2.44.0