D18584.id54386.diff
No OneTemporary
Actions

Size

644 B

Referenced Files

None

Subscribers

None

D18584.id54386.diff
View Options

	Index: head/usr.sbin/makefs/ffs.c
	===================================================================
	--- head/usr.sbin/makefs/ffs.c
	+++ head/usr.sbin/makefs/ffs.c
	@@ -932,8 +932,7 @@
	if (isfile) {
	fbuf = emalloc(ffs_opts->bsize);
	if ((ffd = open((char *)buf, O_RDONLY, 0444)) == -1) {
	- warn("Can't open `%s' for reading", (char *)buf);
	- goto leave_ffs_write_file;
	+ err(EXIT_FAILURE, "Can't open `%s' for reading", (char *)buf);
	}
	} else {
	p = buf;
	@@ -987,8 +986,6 @@

	write_inode_and_leave:
	ffs_write_inode(&in.i_din, in.i_number, fsopts);
	-
	- leave_ffs_write_file:
	if (fbuf)
	free(fbuf);
	if (ffd != -1)