summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-27 01:45:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-27 01:45:48 +0000
commit42bd9c32e15b2ead8af72b44be3a1234dd03aaed (patch)
tree247484e2fa67a41bac5e2da22e1c91286ef75617 /usr.sbin
parentc459f242ef56a9df83eb457f12ee7b43110f431a (diff)
No way, not yet. You did not even test, did you, david
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/config/scan.l13
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l
index 0f0def6d756..71724810bc4 100644
--- a/usr.sbin/config/scan.l
+++ b/usr.sbin/config/scan.l
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: scan.l,v 1.11 1998/06/12 12:17:08 d Exp $ */
+/* $OpenBSD: scan.l,v 1.12 1998/06/27 01:45:47 deraadt Exp $ */
/* $NetBSD: scan.l,v 1.13 1997/02/02 21:12:37 thorpej Exp $ */
/*
@@ -208,18 +208,15 @@ include(fname, ateof)
char *s;
static int havedirs;
- /* XXX Kludge until files.* files are fixed. */
- if (strncmp(fname, "../../../", 9) == 0) {
- error("leading ../../../ should be removed from include \"%s\"", fname);
- errors--;
- fname += 9;
- }
-
if (havedirs == 0) {
havedirs = 1;
setupdirs();
}
+ /* Kludge until files.* files are fixed. */
+ if (strncmp(fname, "../../../", 9) == 0)
+ fname += 9;
+
s = (*fname == '/') ? strdup(fname) : sourcepath(fname);
if ((fp = fopen(s, "r")) == NULL) {
error("cannot open %s for reading: %s\n", s, strerror(errno));