D29621.id86942.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29621.id86942.diff
View Options

	Index: usr.sbin/efivar/efivar.c
	===================================================================
	--- usr.sbin/efivar/efivar.c
	+++ usr.sbin/efivar/efivar.c
	@@ -70,9 +70,8 @@
	};


	-static int aflag, Aflag, bflag, dflag, Dflag, gflag, Hflag, Nflag,
	- lflag, Lflag, Rflag, wflag, pflag, uflag, load_opt_flag;
	-static bool quiet;
	+static bool aflag, Aflag, bflag, dflag, Dflag, gflag, Hflag, Nflag,
	+ lflag, Lflag, Rflag, wflag, pflag, uflag, load_opt_flag, quiet;
	static char *varname;
	static char *fromfile;
	static u_long attrib = EFI_VARIABLE_NON_VOLATILE \| EFI_VARIABLE_BOOTSERVICE_ACCESS \| EFI_VARIABLE_RUNTIME_ACCESS;
	@@ -315,58 +314,58 @@
	longopts, NULL)) != -1) {
	switch (ch) {
	case 'a':
	- aflag++;
	+ aflag = true;
	break;
	case 'A':
	- Aflag++;
	+ Aflag = true;
	break;
	case 'b':
	- bflag++;
	+ bflag = true;
	break;
	case 'd':
	- dflag++;
	+ dflag = true;
	break;
	case 'D':
	- Dflag++;
	+ Dflag = true;
	break;
	case 'g':
	- gflag++;
	+ gflag = true;
	break;
	case 'H':
	- Hflag++;
	+ Hflag = true;
	break;
	case 'l':
	- lflag++;
	+ lflag = true;
	break;
	case 'L':
	- Lflag++;
	+ Lflag = true;
	break;
	case 'n':
	varname = optarg;
	break;
	case 'N':
	- Nflag++;
	+ Nflag = true;
	break;
	case 'O':
	- load_opt_flag++;
	+ load_opt_flag = true;
	break;
	case 'p':
	- pflag++;
	+ pflag = true;
	break;
	case 'q':
	quiet = true;
	break;
	case 'R':
	- Rflag++;
	+ Rflag = true;
	break;
	case 't':
	attrib = strtoul(optarg, NULL, 16);
	break;
	case 'u':
	- uflag++;
	+ uflag = true;
	break;
	case 'w':
	- wflag++;
	+ wflag = true;
	break;
	case 'f':
	free(fromfile);