diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2018-01-16 21:43:46 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2018-01-16 21:43:46 +0000 |
| commit | 5f40118235b74deaed9b9d9054756b9bf5b52128 (patch) | |
| tree | ec6168d8d6d8554bfcf2eeeb21ff2e8b08c30344 /usr.sbin/makefs | |
| parent | ebe45c64a040a2a5d21c3c78117cb35398c7029d (diff) | |
| download | src-test2-5f40118235b74deaed9b9d9054756b9bf5b52128.tar.gz src-test2-5f40118235b74deaed9b9d9054756b9bf5b52128.zip | |
Notes
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/ffs.c | 6 | ||||
| -rw-r--r-- | usr.sbin/makefs/mtree.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 0682c30c2ae5..14d7714b8dbb 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -70,6 +70,10 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include <sys/param.h> #include <sys/mount.h> @@ -315,7 +319,7 @@ static void ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) { int32_t ncg = 1; -#if notyet +#ifdef notyet int32_t spc, nspf, ncyl, fssize; #endif ffs_opt_t *ffs_opts = fsopts->fs_specific; diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 181a695bcb31..2bcdd6c82254 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -25,6 +25,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -532,11 +536,13 @@ read_mtree_keywords(FILE *fp, fsnode *node) break; } flset = flclr = 0; +#if HAVE_STRUCT_STAT_ST_FLAGS if (!strtofflags(&value, &flset, &flclr)) { st->st_flags &= ~flclr; st->st_flags |= flset; } else error = errno; +#endif } else error = ENOSYS; break; |