diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.sbin/ngctl | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.sbin/ngctl')
| -rw-r--r-- | usr.sbin/ngctl/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/ngctl/main.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index cf72f39..71b5d2b 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -17,13 +17,11 @@ NGCTL_NO_LIBEDIT= NGCTL_NO_LIBEDIT= .endif -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .if !defined(NGCTL_NO_LIBEDIT) CFLAGS+= -DEDITLINE -DPADD+= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -lpthread -ledit -ltermcapw +LIBADD+= edit pthread .endif .include <bsd.prog.mk> diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index 3581386..4b1cdab 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -324,8 +324,10 @@ DoInteractive(void) history(hist, &hev, H_ENTER, buf); pthread_kill(monitor, SIGUSR1); pthread_mutex_lock(&mutex); - if (DoParseCommand(buf) == CMDRTN_QUIT) + if (DoParseCommand(buf) == CMDRTN_QUIT) { + pthread_mutex_unlock(&mutex); break; + } pthread_cond_signal(&cond); pthread_mutex_unlock(&mutex); } |
