summaryrefslogtreecommitdiffstats
path: root/usr.bin/xinstall
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>1998-01-09 06:05:13 +0000
committerjb <jb@FreeBSD.org>1998-01-09 06:05:13 +0000
commit1e1816b4893c1a3899f7b9ea6d30f51cb21da945 (patch)
tree65afd92cb21a7d4f812a1635a1d0ecb97d04d212 /usr.bin/xinstall
parent00b1a5e2787da8edd8f5339b6a2e5dcbfd4298a3 (diff)
downloadFreeBSD-src-1e1816b4893c1a3899f7b9ea6d30f51cb21da945.zip
FreeBSD-src-1e1816b4893c1a3899f7b9ea6d30f51cb21da945.tar.gz
Allow install to build from FreeBSD source using NetBSD tools and
headers during the port of FreeBSD to a NetBSD supported architecture. FreeBSD needs to be able to install itself from very early on.
Diffstat (limited to 'usr.bin/xinstall')
-rw-r--r--usr.bin/xinstall/xinstall.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 53c7f9c..607d7ad 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "From: @(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
static const char rcsid[] =
- "$Id: xinstall.c,v 1.26 1997/10/27 22:53:33 ache Exp $";
+ "$Id: xinstall.c,v 1.27 1997/10/28 14:20:10 ache Exp $";
#endif /* not lint */
/*-
@@ -713,10 +713,18 @@ trymmap(fd)
if (fstatfs(fd, &stfs) < 0)
return 0;
+
+/* NetBSD MOUNT_XXX defines are strings, but doesn't have a MOUNT_NONE. */
+#ifdef MOUNT_NONE
switch(stfs.f_type) {
case MOUNT_UFS: /* should be safe.. */
case MOUNT_CD9660: /* should be safe.. */
return 1;
}
+#else
+ if (strcmp(stfs.f_fstypename,MOUNT_UFS) == 0 ||
+ strcmp(stfs.f_fstypename,MOUNT_CD9660) == 0)
+ return 1;
+#endif
return 0;
}
OpenPOWER on IntegriCloud