D29325.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29325.diff
View Options

	diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
	--- a/usr.sbin/bsdinstall/partedit/partedit.h
	+++ b/usr.sbin/bsdinstall/partedit/partedit.h
	@@ -39,8 +39,6 @@
	struct gmesh;
	struct ggeom;

	-extern int tmpdfd;
	-
	TAILQ_HEAD(pmetadata_head, partition_metadata);
	extern struct pmetadata_head part_metadata;

	diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
	--- a/usr.sbin/bsdinstall/partedit/partedit.c
	+++ b/usr.sbin/bsdinstall/partedit/partedit.c
	@@ -45,7 +45,6 @@
	#include "partedit.h"

	struct pmetadata_head part_metadata;
	-int tmpdfd;
	static int sade_mode = 0;

	static int apply_changes(struct gmesh *mesh);
	@@ -69,8 +68,6 @@

	end_dialog();

	- close(tmpdfd);
	-
	exit(1);
	}

	@@ -78,7 +75,7 @@
	main(int argc, const char **argv)
	{
	struct partition_metadata *md;
	- const char progname, prompt, *tmpdir;
	+ const char progname, prompt;
	struct partedit_item *items = NULL;
	struct gmesh mesh;
	int i, op, nitems, nscroll;
	@@ -90,14 +87,6 @@

	TAILQ_INIT(&part_metadata);

	- tmpdir = getenv("TMPDIR");
	- if (tmpdir == NULL)
	- tmpdir = "/tmp";
	- tmpdfd = open(tmpdir, O_DIRECTORY);
	- if (tmpdfd < 0)
	- err(EX_OSERR, "%s", tmpdir);
	- unlinkat(tmpdfd, "bsdinstall-esps", 0);
	-
	init_fstab_metadata();

	init_dialog(stdin, stdout);
	@@ -233,7 +222,6 @@
	geom_deletetree(&mesh);
	free(items);
	end_dialog();
	- close(tmpdfd);

	return (error);
	}