Author: ngie
Date: Wed Oct 21 13:15:04 2015
New Revision: 289695
URL: https://svnweb.freebsd.org/changeset/base/289695
Log:
Revert r289694
I committed some other undesirable local changes by accident
Deleted:
head/usr.sbin/makefs/tests/
Modified:
head/etc/mtree/BSD.tests.dist
head/lib/libc/gen/dirname.3
head/usr.sbin/makefs/Makefile
head/usr.sbin/makefs/cd9660/iso9660_rrip.c
head/usr.sbin/makefs/makefs.8
head/usr.sbin/makefs/makefs.c
Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist Wed Oct 21 13:13:38 2015
(r289694)
+++ head/etc/mtree/BSD.tests.dist Wed Oct 21 13:15:04 2015
(r289695)
@@ -596,8 +596,6 @@
..
fstyp
..
- makefs
- ..
newsyslog
..
nmtree
Modified: head/lib/libc/gen/dirname.3
==============================================================================
--- head/lib/libc/gen/dirname.3 Wed Oct 21 13:13:38 2015 (r289694)
+++ head/lib/libc/gen/dirname.3 Wed Oct 21 13:15:04 2015 (r289695)
@@ -78,6 +78,8 @@ The following error codes may be set in
.It Bq Er ENAMETOOLONG
The path component to be returned was larger than
.Dv MAXPATHLEN .
+.It Bq Er ENOMEM
+The path component to be returned was larger than
.El
.Sh SEE ALSO
.Xr basename 1 ,
Modified: head/usr.sbin/makefs/Makefile
==============================================================================
--- head/usr.sbin/makefs/Makefile Wed Oct 21 13:13:38 2015
(r289694)
+++ head/usr.sbin/makefs/Makefile Wed Oct 21 13:15:04 2015
(r289695)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <src.opts.mk>
-
PROG= makefs
CFLAGS+=-I${.CURDIR}
@@ -34,8 +32,4 @@ SRCS+= ffs_tables.c
CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
LIBADD= netbsd util sbuf
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.include <bsd.prog.mk>
Modified: head/usr.sbin/makefs/cd9660/iso9660_rrip.c
==============================================================================
--- head/usr.sbin/makefs/cd9660/iso9660_rrip.c Wed Oct 21 13:13:38 2015
(r289694)
+++ head/usr.sbin/makefs/cd9660/iso9660_rrip.c Wed Oct 21 13:15:04 2015
(r289695)
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $ */
+/* $NetBSD: iso9660_rrip.c,v 1.11 2012/04/29 13:32:21 joerg Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -656,14 +656,13 @@ cd9660node_rrip_pn(struct ISO_SUSP_ATTRI
pn_field->attr.rr_entry.PN.h.length[0] = 20;
pn_field->attr.rr_entry.PN.h.version[0] = 1;
- if (sizeof (fnode->inode->st.st_rdev) > 4)
- cd9660_bothendian_dword(
- (uint64_t)fnode->inode->st.st_rdev >> 32,
+ if (sizeof (fnode->inode->st.st_dev) > 32)
+ cd9660_bothendian_dword((uint64_t)fnode->inode->st.st_dev >> 32,
pn_field->attr.rr_entry.PN.high);
else
cd9660_bothendian_dword(0, pn_field->attr.rr_entry.PN.high);
- cd9660_bothendian_dword(fnode->inode->st.st_rdev & 0xffffffff,
+ cd9660_bothendian_dword(fnode->inode->st.st_dev & 0xffffffff,
pn_field->attr.rr_entry.PN.low);
return 1;
}
Modified: head/usr.sbin/makefs/makefs.8
==============================================================================
--- head/usr.sbin/makefs/makefs.8 Wed Oct 21 13:13:38 2015
(r289694)
+++ head/usr.sbin/makefs/makefs.8 Wed Oct 21 13:15:04 2015
(r289695)
@@ -53,7 +53,7 @@
.Op Fl m Ar maximum-size
.Op Fl N Ar userdb-dir
.Op Fl o Ar fs-options
-.Op Fl R Ar roundup-size
+.Op Fl r Ar roundup
.Op Fl S Ar sector-size
.Op Fl s Ar image-size
.Op Fl t Ar fs-type
@@ -196,12 +196,9 @@ Deprecated.
See the
.Fl Z
flag.
-.It Fl R Ar roundup-size
-Round the image up to
-.Ar roundup-size .
-.Ar roundup-size
-should be a multiple of the file system block size specified by
-.Ar bsize .
+.It Fl r Ar roundup
+Round the image up to specified block size that should be multiple
+of block size.
.It Fl S Ar sector-size
Set the file system sector size to
.Ar sector-size .
@@ -280,11 +277,6 @@ or
.Ql time .
.It Sy extent
Maximum extent size.
-.It Sy roundup
-Round the image up to
-.Ar roundup-size .
-should be a multiple of
-.Ar bsize .
.It Sy maxbpcg
Maximum total number of blocks in a cylinder group.
.It Sy version
Modified: head/usr.sbin/makefs/makefs.c
==============================================================================
--- head/usr.sbin/makefs/makefs.c Wed Oct 21 13:13:38 2015
(r289694)
+++ head/usr.sbin/makefs/makefs.c Wed Oct 21 13:15:04 2015
(r289695)
@@ -209,10 +209,10 @@ main(int argc, char *argv[])
fsoptions.sparse = 1;
break;
- case 'R':
+ case 'r':
/* Round image size up to specified block size */
fsoptions.roundup =
- strsuftoll("roundup-size", optarg, 0, LLONG_MAX);
+ strsuftoll("roundup", optarg, 0, LLONG_MAX);
break;
case 's':
@@ -365,7 +365,7 @@ usage(void)
prog = getprogname();
fprintf(stderr,
"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"
-"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-R roundup-size]\n"
+"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-r roundup ]\n"
"\t[-s image-size] [-b free-blocks] [-f free-files] [-F mtree-specfile]\n"
"\t[-xZ] [-N userdb-dir] image-file directory | manifest [extra-directory
...]\n",
prog);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
