Move CLI portion of nvramtool into cli/ subdirectory as first step towards librarization.

Also: update one regex wrapper user.

Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6310 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

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
 

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);
 }
 
 /****************************************************************************