summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/nvramtool/Makefile12
-rw-r--r--util/nvramtool/cli/nvramtool.8 (renamed from util/nvramtool/nvramtool.8)0
-rw-r--r--util/nvramtool/cli/nvramtool.c (renamed from util/nvramtool/nvramtool.c)5
-rw-r--r--util/nvramtool/cli/opts.c (renamed from util/nvramtool/opts.c)0
-rw-r--r--util/nvramtool/cli/opts.h (renamed from util/nvramtool/opts.h)0
5 files changed, 10 insertions, 7 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 4ddce0f74c..673b394455 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -24,12 +24,16 @@ CC = gcc
STRIP = strip
INSTALL = /usr/bin/install
PREFIX = /usr/local
-CFLAGS = -O2 -g -Wall -W
+CFLAGS = -O2 -g -Wall -W -I.
#CFLAGS = -Os -Wall
+CLI_OBJS = cli/nvramtool.o cli/opts.o
+
OBJS = cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \
hexdump.o input_file.o layout.o layout_file.o lbtable.o \
- nvramtool.o opts.o reg_expr.o cbfs.o
+ reg_expr.o cbfs.o
+
+OBJS += $(CLI_OBJS)
OS_ARCH = $(shell uname)
ifeq ($(OS_ARCH), Darwin)
@@ -43,7 +47,7 @@ $(PROGRAM): $(OBJS)
$(STRIP) $(STRIP_ARGS) $(PROGRAM)
clean:
- rm -f $(PROGRAM) *.o
+ rm -f $(PROGRAM) $(OBJS)
distclean: clean
rm -f .dependencies
@@ -55,7 +59,7 @@ install: $(PROGRAM)
mkdir -p $(DESTDIR)$(PREFIX)/sbin
$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
- $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
+ $(INSTALL) cli/$(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
.PHONY: all clean distclean dep
diff --git a/util/nvramtool/nvramtool.8 b/util/nvramtool/cli/nvramtool.8
index 9159a2a6dd..9159a2a6dd 100644
--- a/util/nvramtool/nvramtool.8
+++ b/util/nvramtool/cli/nvramtool.8
diff --git a/util/nvramtool/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index cb717513ae..e3e7e8875a 100644
--- a/util/nvramtool/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -682,8 +682,7 @@ static void parse_assignment(char arg[], const char **name, const char **value)
regmatch_t match[N_MATCHES];
regex_t assignment;
- compile_reg_exprs(REG_EXTENDED | REG_NEWLINE, 1, assignment_regex,
- &assignment);
+ compile_reg_expr(REG_EXTENDED | REG_NEWLINE, assignment_regex, &assignment);
/* Does 'arg' conform to proper assignment syntax? If not, exit with a
* usage message.
@@ -699,7 +698,7 @@ static void parse_assignment(char arg[], const char **name, const char **value)
*name = &arg[match[1].rm_so];
*value = &arg[match[2].rm_so];
- free_reg_exprs(1, &assignment);
+ regfree(&assignment);
}
/****************************************************************************
diff --git a/util/nvramtool/opts.c b/util/nvramtool/cli/opts.c
index 49496495eb..49496495eb 100644
--- a/util/nvramtool/opts.c
+++ b/util/nvramtool/cli/opts.c
diff --git a/util/nvramtool/opts.h b/util/nvramtool/cli/opts.h
index f46f254b88..f46f254b88 100644
--- a/util/nvramtool/opts.h
+++ b/util/nvramtool/cli/opts.h