diff options
| author | obrien <obrien@FreeBSD.org> | 2011-04-05 18:41:01 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2011-04-05 18:41:01 +0000 |
| commit | cddd21009866efd0aeb10c6a4a58b98a5c89448a (patch) | |
| tree | 03c22bc05677cdacb03efd8c11ec7bed49f3df18 /sbin/gvinum | |
| parent | 48e4efea84a5a2658b09e918afca1f07c10e41f1 (diff) | |
| parent | e667f087fdee4745b37bfe2d5a6ede045406d13b (diff) | |
| download | FreeBSD-src-cddd21009866efd0aeb10c6a4a58b98a5c89448a.zip FreeBSD-src-cddd21009866efd0aeb10c6a4a58b98a5c89448a.tar.gz | |
* Add the readline(3) API to libedit. The libedit versions of
{readline,history}.h are in /usr/include/edit so as to not conflict with
the GNU libreadline versions. To use the libedit readline(3) one should
add "-I/usr/include/edit" to their Makefile
(spelled "-I${DESTDIR}/${INCLUDEDIR}/edit" within the FreeBSD source tree).
* Enable its use in the BSD licensed utilities that support readline(3).
* To make it easier to sync libedit development with NetBSD, histedit.h
is moved into libedit's directory as history shows shown we keep merging
it into that location.
Obtained from: NetBSD
Sponsored by: Juniper Networks
Diffstat (limited to 'sbin/gvinum')
| -rw-r--r-- | sbin/gvinum/Makefile | 6 | ||||
| -rw-r--r-- | sbin/gvinum/gvinum.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index e4bf4a7..8cccf56 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -5,10 +5,10 @@ SRCS= gvinum.c gvinum.h geom_vinum_share.c MAN= gvinum.8 WARNS?= 2 -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit -DPADD= ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} -LDADD= -lreadline -ltermcap -ldevstat -lkvm -lgeom +DPADD= ${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} +LDADD= -ledit -ltermcap -ldevstat -lkvm -lgeom .PATH: ${.CURDIR}/../../sys/geom/vinum diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c index f936a58..2039761 100644 --- a/sbin/gvinum/gvinum.c +++ b/sbin/gvinum/gvinum.c @@ -50,6 +50,7 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <paths.h> #include <readline/readline.h> #include <readline/history.h> |
