Commit 4d360755 authored by Daniel Salzman's avatar Daniel Salzman

contrib: move getline from internal

parent b6353e6b
......@@ -31,6 +31,8 @@ libtap/tap/float.h
libtap/tap/macros.h
samples/Makefile.am
src/Makefile.am
src/contrib/getline.c
src/contrib/getline.h
src/contrib/openbsd/strlcat.c
src/contrib/openbsd/strlcat.h
src/contrib/openbsd/strlcpy.c
......@@ -353,8 +355,6 @@ src/libknot/internal/consts.h
src/libknot/internal/endian.h
src/libknot/internal/errcode.c
src/libknot/internal/errcode.h
src/libknot/internal/getline.c
src/libknot/internal/getline.h
src/libknot/internal/hhash.c
src/libknot/internal/hhash.h
src/libknot/internal/lists.c
......
......@@ -24,6 +24,7 @@ AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
libcontrib_ladir = $(includedir)
nobase_libcontrib_la_HEADERS = \
contrib/getline.h \
contrib/openbsd/strlcat.h \
contrib/openbsd/strlcpy.h \
contrib/ucw/array-sort.h \
......@@ -74,7 +75,6 @@ nobase_libknot_internal_la_HEADERS = \
libknot/internal/consts.h \
libknot/internal/endian.h \
libknot/internal/errcode.h \
libknot/internal/getline.h \
libknot/internal/hhash.h \
libknot/internal/lists.h \
libknot/internal/macros.h \
......@@ -101,6 +101,7 @@ nobase_libknot_yparser_la_HEADERS = \
# dynamic: libknot sources
libcontrib_la_SOURCES = \
contrib/getline.c \
contrib/openbsd/strlcat.c \
contrib/openbsd/strlcpy.c \
contrib/ucw/heap.c \
......@@ -145,7 +146,6 @@ libknot_internal_la_SOURCES = \
libknot/internal/base32hex.c \
libknot/internal/base64.c \
libknot/internal/errcode.c \
libknot/internal/getline.c \
libknot/internal/hhash.c \
libknot/internal/lists.c \
libknot/internal/mem.c \
......
......@@ -19,8 +19,7 @@
#define _WITH_GETLINE
#endif
#include "libknot/internal/macros.h"
#include "libknot/internal/getline.h"
#include "contrib/getline.h"
#include <stdio.h> // getline or fgetln
#include <stdlib.h> // free
......
......@@ -14,14 +14,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*!
* \file getline.h
*
* \author Daniel Salzman <daniel.salzman@nic.cz>
* \author Jan Vcelak <jan.vcelak@nic.cz>
* \file
*
* \brief Multiplatform getline wrapper.
*
* \addtogroup common_lib
* \addtogroup contrib
* @{
*/
......
......@@ -18,11 +18,11 @@
#include <stdlib.h>
#include <getopt.h>
#include "contrib/getline.h"
#include "knot/modules/rosedb.c"
#include "zscanner/scanner.h"
#include "libknot/libknot.h"
#include "libknot/internal/mem.h"
#include "libknot/internal/getline.h"
static int rosedb_add(struct cache *cache, MDB_txn *txn, int argc, char *argv[]);
static int rosedb_del(struct cache *cache, MDB_txn *txn, int argc, char *argv[]);
......
......@@ -17,9 +17,9 @@
#include <assert.h>
#include <string.h>
#include "contrib/getline.h"
#include "dnssec/error.h"
#include "libknot/errcode.h"
#include "libknot/internal/getline.h"
#include "libknot/internal/macros.h"
#include "libknot/internal/mem.h"
#include "libknot/tsig.h"
......
......@@ -22,6 +22,7 @@
#include <sys/socket.h>
#include <unistd.h>
#include "contrib/getline.h"
#include "dnssec/random.h"
#include "utils/knsupdate/knsupdate_exec.h"
#include "utils/common/exec.h"
......@@ -31,7 +32,6 @@
#include "utils/common/sign.h"
#include "utils/common/token.h"
#include "libknot/libknot.h"
#include "libknot/internal/getline.h"
#include "libknot/internal/macros.h"
#include "libknot/internal/mem.h"
#include "contrib/openbsd/strlcpy.h"
......
......@@ -17,9 +17,9 @@
#include <assert.h>
#include <tap/basic.h>
#include "contrib/getline.h"
#include "knot/updates/zone-update.h"
#include "zscanner/scanner.h"
#include "libknot/internal/getline.h"
#include "libknot/internal/macros.h"
static const char *zone_str =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment