diff options
| author |   anton <anton@openbsd.org> | 2018-04-07 14:55:13 +0000 |
|---|---|---|
| committer | anton <anton@openbsd.org> | 2018-04-07 14:55:13 +0000 |
| commit | e7f942e831dc123bf18b37a7b94814bf3ce9539b (patch) | |
| tree | 4fe9915a8923043ea78773eb399a68be00dcbe2b /usr.bin/patch | |
| parent | tweak previous; (diff) | |
| download | wireguard-openbsd-e7f942e831dc123bf18b37a7b94814bf3ce9539b.tar.xz wireguard-openbsd-e7f942e831dc123bf18b37a7b94814bf3ce9539b.zip | |
Remove unused pathnames.h header since patch was refactoring into not invoking
ed back in 2015; ok millert@ tb@ tobias@
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/patch.c | 4 | ||||
| -rw-r--r-- | usr.bin/patch/pathnames.h | 11 | ||||
| -rw-r--r-- | usr.bin/patch/pch.c | 3 | ||||
| -rw-r--r-- | usr.bin/patch/util.c | 3 |
4 files changed, 4 insertions, 17 deletions
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index fef7df6466e..b0627c89b86 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: patch.c,v 1.64 2017/06/12 14:23:26 deraadt Exp $ */ +/* $OpenBSD: patch.c,v 1.65 2018/04/07 14:55:13 anton Exp $ */ /* * patch - a program to apply diffs to original files @@ -33,6 +33,7 @@ #include <ctype.h> #include <getopt.h> #include <limits.h> +#include <paths.h> #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -42,7 +43,6 @@ #include "pch.h" #include "inp.h" #include "backupfile.h" -#include "pathnames.h" #include "ed.h" mode_t filemode = 0644; diff --git a/usr.bin/patch/pathnames.h b/usr.bin/patch/pathnames.h deleted file mode 100644 index 397e3fabe37..00000000000 --- a/usr.bin/patch/pathnames.h +++ /dev/null @@ -1,11 +0,0 @@ -/* $OpenBSD: pathnames.h,v 1.1 2003/07/29 20:10:17 millert Exp $ */ - -/* - * Placed in the public domain by Todd C. Miller <Todd.Miller@courtesan.com> - * on July 29, 2003. - */ - -#include <paths.h> - -#define _PATH_ED "/bin/ed" -#define _PATH_MKDIR "/bin/mkdir" diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 539754d814b..70f9f934327 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pch.c,v 1.59 2017/12/20 21:08:06 tb Exp $ */ +/* $OpenBSD: pch.c,v 1.60 2018/04/07 14:55:13 anton Exp $ */ /* * patch - a program to apply diffs to original files @@ -41,7 +41,6 @@ #include "common.h" #include "util.h" #include "pch.h" -#include "pathnames.h" /* Patch (diff listing) abstract type. */ diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index f9d47906300..b49fa2282de 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.40 2015/07/26 14:32:19 millert Exp $ */ +/* $OpenBSD: util.c,v 1.41 2018/04/07 14:55:13 anton Exp $ */ /* * patch - a program to apply diffs to original files @@ -43,7 +43,6 @@ #include "common.h" #include "util.h" #include "backupfile.h" -#include "pathnames.h" /* Rename a file, copying it if necessary. */ |