D49601.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49601.diff
View Options

	diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
	--- a/usr.sbin/makefs/ffs.c
	+++ b/usr.sbin/makefs/ffs.c
	@@ -679,8 +679,9 @@
	{
	size_t slen;
	void *membuf;
	- struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st;
	+ struct stat *st;

	+ st = &cur->inode->st;
	memset(dinp, 0, sizeof(*dinp));
	dinp->di_mode = cur->inode->st.st_mode;
	dinp->di_nlink = cur->inode->nlink;
	@@ -727,8 +728,9 @@
	{
	size_t slen;
	void *membuf;
	- struct stat *st = stampst.st_ino != 0 ? &stampst : &cur->inode->st;
	+ struct stat *st;

	+ st = &cur->inode->st;
	memset(dinp, 0, sizeof(*dinp));
	dinp->di_mode = cur->inode->st.st_mode;
	dinp->di_nlink = cur->inode->nlink;
	diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
	--- a/usr.sbin/makefs/msdos.c
	+++ b/usr.sbin/makefs/msdos.c
	@@ -129,11 +129,6 @@
	else if (strcmp(msdos_options[rv].name, "hidden_sectors") == 0)
	msdos_opt->hidden_sectors_set = 1;

	- if (stampst.st_ino) {
	- msdos_opt->timestamp_set = 1;
	- msdos_opt->timestamp = stampst.st_mtime;
	- }
	-
	return 1;
	}

	diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c
	--- a/usr.sbin/makefs/msdos/msdosfs_vnops.c
	+++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c
	@@ -94,8 +94,6 @@
	static void
	msdosfs_times(struct denode dep, const struct stat st)
	{
	- if (stampst.st_ino)
	- st = &stampst;

	#ifdef HAVE_STRUCT_STAT_BIRTHTIME
	unix2fattime(&st->st_birthtim, &dep->de_CDate, &dep->de_CTime);