Module Name: src
Committed By: christos
Date: Wed Apr 13 11:48:29 UTC 2016
Modified Files:
src/usr.sbin/makemandb: apropos-utils.c apropos-utils.h apropos.c
makemandb.c
Log Message:
PR/51062: Abhinav Upadhyay: Allow non numeric sections to be indexed and
searched by apropos(1).
Fold long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makemandb/apropos-utils.h
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makemandb/apropos.c
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makemandb/makemandb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.23 src/usr.sbin/makemandb/apropos-utils.c:1.24
--- src/usr.sbin/makemandb/apropos-utils.c:1.23 Tue Apr 12 21:37:50 2016
+++ src/usr.sbin/makemandb/apropos-utils.c Wed Apr 13 07:48:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.23 2016/04/13 01:37:50 christos Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.24 2016/04/13 11:48:29 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos-utils.c,v 1.23 2016/04/13 01:37:50 christos Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.24 2016/04/13 11:48:29 christos Exp $");
#include <sys/queue.h>
#include <sys/stat.h>
@@ -112,7 +112,10 @@ concat2(char **dst, const char *src, siz
size_t total_len, dst_len;
assert(src != NULL);
- /* If destination buffer dst is NULL, then simply strdup the source buffer */
+ /*
+ * If destination buffer dst is NULL, then simply
+ * strdup the source buffer
+ */
if (*dst == NULL) {
*dst = estrdup(src);
return;
@@ -166,26 +169,30 @@ create_db(sqlite3 *db)
goto out;
sqlite3_free(schemasql);
- sqlstr = "CREATE VIRTUAL TABLE mandb USING fts4(section, name, "
- "name_desc, desc, lib, return_vals, env, files, "
- "exit_status, diagnostics, errors, md5_hash UNIQUE, machine, "
- "compress=zip, uncompress=unzip, tokenize=porter); " //mandb
- "CREATE TABLE IF NOT EXISTS mandb_meta(device, inode, mtime, "
- "file UNIQUE, md5_hash UNIQUE, id INTEGER PRIMARY KEY); "
- //mandb_meta
- "CREATE TABLE IF NOT EXISTS mandb_links(link, target, section, "
- "machine, md5_hash); "; //mandb_links
+ sqlstr =
+ //mandb
+ "CREATE VIRTUAL TABLE mandb USING fts4(section, name, "
+ "name_desc, desc, lib, return_vals, env, files, "
+ "exit_status, diagnostics, errors, md5_hash UNIQUE, machine, "
+ "compress=zip, uncompress=unzip, tokenize=porter); "
+ //mandb_meta
+ "CREATE TABLE IF NOT EXISTS mandb_meta(device, inode, mtime, "
+ "file UNIQUE, md5_hash UNIQUE, id INTEGER PRIMARY KEY); "
+ //mandb_links
+ "CREATE TABLE IF NOT EXISTS mandb_links(link, target, section, "
+ "machine, md5_hash); ";
sqlite3_exec(db, sqlstr, NULL, NULL, &errmsg);
if (errmsg != NULL)
goto out;
- sqlstr = "CREATE INDEX IF NOT EXISTS index_mandb_links ON mandb_links "
- "(link); "
- "CREATE INDEX IF NOT EXISTS index_mandb_meta_dev ON mandb_meta "
- "(device, inode); "
- "CREATE INDEX IF NOT EXISTS index_mandb_links_md5 ON mandb_links "
- "(md5_hash);";
+ sqlstr =
+ "CREATE INDEX IF NOT EXISTS index_mandb_links ON mandb_links "
+ "(link); "
+ "CREATE INDEX IF NOT EXISTS index_mandb_meta_dev ON mandb_meta "
+ "(device, inode); "
+ "CREATE INDEX IF NOT EXISTS index_mandb_links_md5 ON mandb_links "
+ "(md5_hash);";
sqlite3_exec(db, sqlstr, NULL, NULL, &errmsg);
if (errmsg != NULL)
goto out;
@@ -259,7 +266,7 @@ unzip(sqlite3_context *pctx, int nval, s
return;
}
outbuf = erealloc(outbuf, stream.total_out);
- sqlite3_result_text(pctx, (const char *) outbuf, stream.total_out, free);
+ sqlite3_result_text(pctx, (const char *)outbuf, stream.total_out, free);
}
/*
@@ -294,7 +301,8 @@ get_dbpath(const char *manconf)
* 3. DB_CREATE: Open in read-write mode. It will try to create the db if
* it does not exist already.
* RETURN VALUES:
- * The function will return NULL in case the db does not exist and DB_CREATE
+ * The function will return NULL in case the db does not exist
+ * and DB_CREATE
* was not specified. And in case DB_CREATE was specified and yet NULL is
* returned, then there was some other error.
* In normal cases the function should return a handle to the db.
@@ -379,7 +387,8 @@ init_db(mandb_access_mode db_flag, const
sqlite3_extended_result_codes(db, 1);
/* Register the zip and unzip functions for FTS compression */
- rc = sqlite3_create_function(db, "zip", 1, SQLITE_ANY, NULL, zip, NULL, NULL);
+ rc = sqlite3_create_function(db, "zip", 1, SQLITE_ANY, NULL, zip,
+ NULL, NULL);
if (rc != SQLITE_OK) {
warnx("Unable to register function: compress: %s",
sqlite3_errmsg(db));
@@ -409,8 +418,7 @@ error:
* inverse document frequency of t)
*
* Term Frequency of term t in document d = Number of times t occurs in d /
- * Number of times t appears in all
- * documents
+ * Number of times t appears in all documents
*
* Inverse document frequency of t = log(Total number of documents /
* Number of documents in which t occurs)
@@ -427,7 +435,10 @@ rank_func(sqlite3_context *pctx, int nva
int ndoc;
int doclen = 0;
const double k = 3.75;
- /* Check that the number of arguments passed to this function is correct. */
+ /*
+ * Check that the number of arguments passed to this
+ * function is correct.
+ */
assert(nval == 1);
matchinfo = (const unsigned int *) sqlite3_value_blob(apval[0]);
@@ -436,15 +447,17 @@ rank_func(sqlite3_context *pctx, int nva
ndoc = matchinfo[2 + 3 * ncol * nphrase + ncol];
for (iphrase = 0; iphrase < nphrase; iphrase++) {
int icol;
- const unsigned int *phraseinfo = &matchinfo[2 + ncol+ iphrase * ncol * 3];
+ const unsigned int *phraseinfo =
+ &matchinfo[2 + ncol + iphrase * ncol * 3];
for(icol = 1; icol < ncol; icol++) {
- /* nhitcount: number of times the current phrase occurs in the current
- * column in the current document.
- * nglobalhitcount: number of times current phrase occurs in the current
- * column in all documents.
- * ndocshitcount: number of documents in which the current phrase
- * occurs in the current column at least once.
+ /* nhitcount: number of times the current phrase occurs
+ * in the current column in the current document.
+ * nglobalhitcount: number of times current phrase
+ * occurs in the current column in all documents.
+ * ndocshitcount: number of documents in which the
+ * current phrase occurs in the current column at
+ * least once.
*/
int nhitcount = phraseinfo[3 * icol];
int nglobalhitcount = phraseinfo[3 * icol + 1];
@@ -452,29 +465,31 @@ rank_func(sqlite3_context *pctx, int nva
doclen = matchinfo[2 + icol ];
double weight = col_weights[icol - 1];
if (idf->status == 0 && ndocshitcount)
- idf->value += log(((double)ndoc / ndocshitcount))* weight;
+ idf->value +=
+ log(((double)ndoc / ndocshitcount))* weight;
- /* Dividing the tf by document length to normalize the effect of
- * longer documents.
+ /*
+ * Dividing the tf by document length to normalize
+ * the effect of longer documents.
*/
if (nglobalhitcount > 0 && nhitcount)
- tf += (((double)nhitcount * weight) / (nglobalhitcount * doclen));
+ tf += (((double)nhitcount * weight)
+ / (nglobalhitcount * doclen));
}
}
idf->status = 1;
- /* Final score = (tf * idf)/ ( k + tf)
- * Dividing by k+ tf further normalizes the weight leading to better
- * results.
- * The value of k is experimental
+ /*
+ * Final score: Dividing by k + tf further normalizes the weight
+ * leading to better results. The value of k is experimental
*/
- double score = (tf * idf->value/ ( k + tf)) ;
+ double score = (tf * idf->value) / (k + tf);
sqlite3_result_double(pctx, score);
return;
}
/*
- * run_query --
+ * run_query_internal --
* Performs the searches for the keywords entered by the user.
* The 2nd param: snippet_args is an array of strings providing values for the
* last three parameters to the snippet function of sqlite. (Look at the docs).
@@ -503,11 +518,12 @@ run_query_internal(sqlite3 *db, const ch
sqlite3_stmt *stmt;
if (args->machine)
- easprintf(&machine_clause, "AND machine = \'%s\' ", args->machine);
+ easprintf(&machine_clause, "AND machine = \'%s\' ",
+ args->machine);
/* Register the rank function */
- rc = sqlite3_create_function(db, "rank_func", 1, SQLITE_ANY, (void *)&idf,
- rank_func, NULL, NULL);
+ rc = sqlite3_create_function(db, "rank_func", 1, SQLITE_ANY,
+ (void *)&idf, rank_func, NULL, NULL);
if (rc != SQLITE_OK) {
warnx("Unable to register the ranking function: %s",
sqlite3_errmsg(db));
@@ -519,21 +535,27 @@ run_query_internal(sqlite3 *db, const ch
/* We want to build a query of the form: "select x,y,z from mandb where
* mandb match :query [AND (section LIKE '1' OR section LIKE '2' OR...)]
* ORDER BY rank DESC..."
- * NOTES: 1. The portion in square brackets is optional, it will be there
- * only if the user has specified an option on the command line to search in
- * one or more specific sections.
- * 2. I am using LIKE operator because '=' or IN operators do not seem to be
- * working with the compression option enabled.
+ * NOTES:
+ * 1. The portion in square brackets is optional, it will be there
+ * only if the user has specified an option on the command line
+ * to search in one or more specific sections.
+ * 2. I am using LIKE operator because '=' or IN operators do not
+ * seem to be working with the compression option enabled.
*/
+ char *sections_str = args->sec_nums;
+ char *temp;
+ if (sections_str) {
+ while (*sections_str) {
+ size_t len = strcspn(sections_str, " ");
+ char *sec = sections_str;
+ if (sections_str[len] == 0) {
+ sections_str += len;
+ } else {
+ sections_str[len] = 0;
+ sections_str += len + 1;
+ }
+ easprintf(&temp, "\'%s\',", sec);
- if (args->sec_nums) {
- char *temp;
- int i;
-
- for (i = 0; i < SECMAX; i++) {
- if (args->sec_nums[i] == 0)
- continue;
- easprintf(&temp, " OR section = \'%d\'", i + 1);
if (section_clause) {
concat(§ion_clause, temp);
free(temp);
@@ -544,10 +566,15 @@ run_query_internal(sqlite3 *db, const ch
if (section_clause) {
/*
* At least one section requested, add glue for query.
+ * Before doing that, remove the comma at the end of
+ * section_clause
*/
+ size_t section_clause_len = strlen(section_clause);
+ if (section_clause[section_clause_len - 1] == ',')
+ section_clause[section_clause_len - 1] = 0;
temp = section_clause;
- /* Skip " OR " before first term. */
- easprintf(§ion_clause, " AND (%s)", temp + 4);
+ easprintf(§ion_clause, " AND section IN (%s)",
+ temp);
free(temp);
}
}
@@ -621,15 +648,15 @@ run_query_internal(sqlite3 *db, const ch
name_temp = slash_ptr + 1;
if (machine && machine[0]) {
m = estrdup(machine);
- easprintf(&name, "%s/%s", lower(m),
- name_temp);
+ easprintf(&name, "%s/%s", lower(m), name_temp);
free(m);
} else {
- name = estrdup((const char *) sqlite3_column_text(stmt, 1));
+ name = estrdup((const char *)
+ sqlite3_column_text(stmt, 1));
}
- (args->callback)(args->callback_data, section, name, name_desc, snippet,
- strlen(snippet));
+ (args->callback)(args->callback_data, section, name,
+ name_desc, snippet, strlen(snippet));
free(name);
}
@@ -662,10 +689,12 @@ get_escaped_html_string(const char *src,
}
-#define append(a) do { \
- memcpy(dst, (a), sizeof(a) - 1); \
- dst += sizeof(a) - 1; \
- } while (/*CONSTCOND*/0)
+#define append(a) \
+ do { \
+ memcpy(dst, (a), sizeof(a) - 1); \
+ dst += sizeof(a) - 1; \
+ } while (/*CONSTCOND*/0)
+
ddst = dst = emalloc(*slen + count * 5 + 1);
for (src = ssrc; *src; src++) {
@@ -786,7 +815,7 @@ static int
callback_pager(void *data, const char *section, const char *name,
const char *name_desc, const char *snippet, size_t snippet_length)
{
- struct orig_callback_data *orig_data = (struct orig_callback_data *) data;
+ struct orig_callback_data *orig_data = data;
char *psnippet;
const char *temp = snippet;
int count = 0;
@@ -794,9 +823,9 @@ callback_pager(void *data, const char *s
size_t sz = 0;
size_t psnippet_length;
- /* Count the number of bytes of matching text. For each of these bytes we
- * will use 2 extra bytes to overstrike it so that it appears bold when
- * viewed using a pager.
+ /* Count the number of bytes of matching text. For each of these
+ * bytes we will use 2 extra bytes to overstrike it so that it
+ * appears bold when viewed using a pager.
*/
while (*temp) {
sz = strcspn(temp, "\002\003");
@@ -812,7 +841,8 @@ callback_pager(void *data, const char *s
/* Copy the bytes from snippet to psnippet:
* 1. Copy the bytes before \002 as it is.
- * 2. The bytes after \002 need to be overstriked till we encounter \003.
+ * 2. The bytes after \002 need to be overstriked till we
+ * encounter \003.
* 3. To overstrike a byte 'A' we need to write 'A\bA'
*/
did = 0;
Index: src/usr.sbin/makemandb/apropos-utils.h
diff -u src/usr.sbin/makemandb/apropos-utils.h:1.10 src/usr.sbin/makemandb/apropos-utils.h:1.11
--- src/usr.sbin/makemandb/apropos-utils.h:1.10 Tue Apr 12 21:37:50 2016
+++ src/usr.sbin/makemandb/apropos-utils.h Wed Apr 13 07:48:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.h,v 1.10 2016/04/13 01:37:50 christos Exp $ */
+/* $NetBSD: apropos-utils.h,v 1.11 2016/04/13 11:48:29 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* All rights reserved.
@@ -36,7 +36,6 @@
#include "sqlite3.h"
#define MANCONF "/etc/man.conf"
-#define SECMAX 9
/* Flags for opening the database */
typedef enum mandb_access_mode {
@@ -74,7 +73,7 @@ enum man_sec {
typedef struct query_args {
const char *search_str; // user query
- int *sec_nums; // Section in which to do the search
+ char *sec_nums; // Section in which to do the search
int nrec; // number of records to fetch
int offset; //From which position to start processing the records
int legacy;
Index: src/usr.sbin/makemandb/apropos.c
diff -u src/usr.sbin/makemandb/apropos.c:1.18 src/usr.sbin/makemandb/apropos.c:1.19
--- src/usr.sbin/makemandb/apropos.c:1.18 Thu Mar 31 16:13:37 2016
+++ src/usr.sbin/makemandb/apropos.c Wed Apr 13 07:48:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos.c,v 1.18 2016/03/31 20:13:37 christos Exp $ */
+/* $NetBSD: apropos.c,v 1.19 2016/04/13 11:48:29 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos.c,v 1.18 2016/03/31 20:13:37 christos Exp $");
+__RCSID("$NetBSD: apropos.c,v 1.19 2016/04/13 11:48:29 christos Exp $");
#include <err.h>
#include <stdio.h>
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: apropos.c,v 1.18 2016/
#include "apropos-utils.h"
typedef struct apropos_flags {
- int sec_nums[SECMAX];
+ char *sec_nums;
int nresults;
int pager;
int no_context;
@@ -58,6 +58,8 @@ typedef struct callback_data {
apropos_flags *aflags;
} callback_data;
+static const unsigned int sections_args_length = 16;
+
static char *remove_stopwords(const char *);
static int query_callback(void *, const char * , const char *, const char *,
const char *, size_t);
@@ -69,6 +71,7 @@ static void
parseargs(int argc, char **argv, struct apropos_flags *aflags)
{
int ch;
+ char sec[2] = {0, 0};
while ((ch = getopt(argc, argv, "123456789Cchiln:PprS:s:")) != -1) {
switch (ch) {
case '1':
@@ -80,7 +83,17 @@ parseargs(int argc, char **argv, struct
case '7':
case '8':
case '9':
- aflags->sec_nums[ch - '1'] = 1;
+ /*
+ *Generate a space separated list of all the
+ * requested sections
+ */
+ sec[0] = (char) ch ;
+ if (aflags->sec_nums == NULL) {
+ aflags->sec_nums =
+ emalloc(sections_args_length);
+ memcpy(aflags->sec_nums, sec, 2);
+ } else
+ concat2(&aflags->sec_nums, sec, 1);
break;
case 'C':
aflags->no_context = 1;
@@ -115,10 +128,15 @@ parseargs(int argc, char **argv, struct
aflags->machine = optarg;
break;
case 's':
- ch = atoi(optarg);
- if (ch < 1 || ch > 9)
- errx(EXIT_FAILURE, "Invalid section");
- aflags->sec_nums[ch - 1] = 1;
+ if (aflags->sec_nums == NULL) {
+ size_t arglen = strlen(optarg);
+ aflags->sec_nums =
+ arglen > sections_args_length
+ ? emalloc(arglen + 1)
+ : emalloc(sections_args_length);
+ memcpy(aflags->sec_nums, optarg, arglen + 1);
+ } else
+ concat(&aflags->sec_nums, optarg);
break;
case '?':
default:
@@ -140,6 +158,7 @@ main(int argc, char *argv[])
cbdata.out = stdout; // the default output stream
cbdata.count = 0;
apropos_flags aflags;
+ aflags.sec_nums = NULL;
cbdata.aflags = &aflags;
sqlite3 *db;
setprogname(argv[0]);
@@ -169,12 +188,6 @@ main(int argc, char *argv[])
parseargs(argc, argv, &aflags);
- /*
- * If the user specifies a section number as an option, the
- * corresponding index element in sec_nums is set to the string
- * representing that section number.
- */
-
argc -= optind;
argv += optind;
@@ -232,6 +245,7 @@ main(int argc, char *argv[])
fprintf(cbdata.out, "</table>\n</body>\n</html>\n");
free(query);
+ free(aflags.sec_nums);
close_db(db);
if (errmsg) {
warnx("%s", errmsg);
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.36 src/usr.sbin/makemandb/makemandb.c:1.37
--- src/usr.sbin/makemandb/makemandb.c:1.36 Tue Apr 12 21:41:18 2016
+++ src/usr.sbin/makemandb/makemandb.c Wed Apr 13 07:48:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.36 2016/04/13 01:41:18 christos Exp $ */
+/* $NetBSD: makemandb.c,v 1.37 2016/04/13 11:48:29 christos Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay <[email protected]>
* Copyright (c) 2011 Kristaps Dzonsons <[email protected]>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.36 2016/04/13 01:41:18 christos Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.37 2016/04/13 11:48:29 christos Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -71,7 +71,7 @@ typedef struct mandb_rec {
secbuff exit_status; // EXIT STATUS
secbuff diagnostics; // DIAGNOSTICS
secbuff errors; // ERRORS
- char section[2];
+ char *section;
int xr_found; // To track whether a .Xr was seen when parsing a section
@@ -774,7 +774,7 @@ update_db(sqlite3 *db, struct mparse *mp
rc = sqlite3_prepare_v2(db, sqlstr, -1, &stmt, NULL);
if (rc != SQLITE_OK) {
if (mflags.verbosity)
- warnx("%s", sqlite3_errmsg(db));
+ warnx("%s", sqlite3_errmsg(db));
close_db(db);
errx(EXIT_FAILURE, "Could not query file cache");
}
@@ -809,7 +809,8 @@ update_db(sqlite3 *db, struct mparse *mp
err_count++;
continue;
}
- md5_status = check_md5(file, db, "mandb_meta", &md5sum, buf, buflen);
+ md5_status = check_md5(file, db, "mandb_meta", &md5sum, buf,
+ buflen);
assert(md5sum != NULL);
if (md5_status == -1) {
if (mflags.verbosity)
@@ -870,12 +871,12 @@ update_db(sqlite3 *db, struct mparse *mp
if (mflags.verbosity == 2) {
printf("Total Number of new or updated pages encountered = %d\n"
- "Total number of (hard or symbolic) links found = %d\n"
- "Total number of pages that were successfully"
- " indexed/updated = %d\n"
- "Total number of pages that could not be indexed"
- " due to errors = %d\n",
- total_count - link_count, link_count, new_count, err_count);
+ "Total number of (hard or symbolic) links found = %d\n"
+ "Total number of pages that were successfully"
+ " indexed/updated = %d\n"
+ "Total number of pages that could not be indexed"
+ " due to errors = %d\n",
+ total_count - link_count, link_count, new_count, err_count);
}
if (mflags.recreate)
@@ -954,15 +955,15 @@ set_section(const struct mdoc *md, const
if (md) {
const struct mdoc_meta *md_meta = mdoc_meta(md);
if (md_meta->msec == NULL) {
- rec->section[0] = '?';
+ easprintf(&rec->section, "%s", "?");
} else
- rec->section[0] = md_meta->msec[0];
+ rec->section = estrdup(md_meta->msec);
} else if (m) {
const struct man_meta *m_meta = man_meta(m);
if (m_meta->msec == NULL)
- rec->section[0] = '?';
+ easprintf(&rec->section, "%s", "?");
else
- rec->section[0] = m_meta->msec[0];
+ rec->section = estrdup(m_meta->msec);
} else
return;
@@ -1583,7 +1584,7 @@ insert_into_db(sqlite3 *db, mandb_rec *r
char *tmp;
rec->links = estrdup(rec->name);
free(rec->name);
- int sz = strcspn(rec->links, " \0");
+ size_t sz = strcspn(rec->links, " \0");
rec->name = emalloc(sz + 1);
memcpy(rec->name, rec->links, sz);
if(rec->name[sz - 1] == ',')
@@ -1636,7 +1637,8 @@ insert_into_db(sqlite3 *db, mandb_rec *r
}
idx = sqlite3_bind_parameter_index(stmt, ":lib");
- rc = sqlite3_bind_text(stmt, idx, rec->lib.data, rec->lib.offset + 1, NULL);
+ rc = sqlite3_bind_text(stmt, idx, rec->lib.data,
+ rec->lib.offset + 1, NULL);
if (rc != SQLITE_OK) {
sqlite3_finalize(stmt);
goto Out;
@@ -1651,7 +1653,8 @@ insert_into_db(sqlite3 *db, mandb_rec *r
}
idx = sqlite3_bind_parameter_index(stmt, ":env");
- rc = sqlite3_bind_text(stmt, idx, rec->env.data, rec->env.offset + 1, NULL);
+ rc = sqlite3_bind_text(stmt, idx, rec->env.data,
+ rec->env.offset + 1, NULL);
if (rc != SQLITE_OK) {
sqlite3_finalize(stmt);
goto Out;
@@ -1989,6 +1992,9 @@ cleanup(mandb_rec *rec)
free(rec->md5_hash);
rec->md5_hash = NULL;
+
+ free(rec->section);
+ rec->section = NULL;
}
/*
