summaryrefslogtreecommitdiffstats
path: root/usr.bin/patch/util.c
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2014-11-22 15:49:28 +0000
committertobias <tobias@openbsd.org>2014-11-22 15:49:28 +0000
commit0529800e5c2e8fb03b38b8f58e001fc7868b25de (patch)
treeaea5b5983c0826bf2af3450bbed18b65cd280391 /usr.bin/patch/util.c
parentSwitch to using MI installboot, after a conversation with stsp. He will (diff)
downloadwireguard-openbsd-0529800e5c2e8fb03b38b8f58e001fc7868b25de.tar.xz
wireguard-openbsd-0529800e5c2e8fb03b38b8f58e001fc7868b25de.zip
Remove SCCS support. For this to work, we would need "get", which we don't
even have in ports. XSI functionality of POSIX, therefore optional. ok deraadt, schwarze, tedu
Diffstat (limited to 'usr.bin/patch/util.c')
-rw-r--r--usr.bin/patch/util.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c
index 40414a75c4c..876eda36e42 100644
--- a/usr.bin/patch/util.c
+++ b/usr.bin/patch/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.36 2013/11/26 13:19:07 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.37 2014/11/22 15:49:28 tobias Exp $ */
/*
* patch - a program to apply diffs to original files
@@ -374,7 +374,7 @@ fetchname(const char *at, bool *exists, int strip_leading)
}
/*
- * Takes the name returned by fetchname and looks in RCS/SCCS directories
+ * Takes the name returned by fetchname and looks in RCS directory
* for a checked in version.
*/
char *
@@ -391,9 +391,7 @@ checked_in(char *file)
if (try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX) ||
try("%s/RCS/%s%s", filedir, filebase, "") ||
- try("%s/%s%s", filedir, filebase, RCSSUFFIX) ||
- try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase) ||
- try("%s/%s%s", filedir, SCCSPREFIX, filebase))
+ try("%s/%s%s", filedir, filebase, RCSSUFFIX))
return file;
return NULL;