From cfd3ca990d58a2d62db203bae5afa305fccaad48 Mon Sep 17 00:00:00 2001
From: Elliu <goyard.louis@gmail.com>
Date: Wed, 27 May 2020 18:29:58 +0200
Subject: [PATCH] Fixing lkt adm populate in case of id not found
---
PKGBUILD | 2 +-
src/database/update.c | 11 ++++++++---
src/main/lkt.c | 4 +++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index 29880370..606aace2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
pkgname=lektor
-pkgver=mk7.957.7f1fbc7
+pkgver=mk7.1014.3e1d569
pkgrel=1
pkgdesc="The lektor kara player, from the Bakaclub"
arch=(x86_64 i686)
diff --git a/src/database/update.c b/src/database/update.c
index 57e938f5..8f6dae26 100644
--- a/src/database/update.c
+++ b/src/database/update.c
@@ -17,15 +17,20 @@ static inline bool
__add_kara_to_update_job(volatile sqlite3 *db, size_t id)
{
static const char *SQL = NULL;
+ sqlite3_stmt *stmt;
if (id)
+ {
SQL = "INSERT INTO updates (job, kara_id) "
"SELECT MAX(update_job), ? FROM misc;";
+ SQLITE_PREPARE(db, stmt, SQL, error);
+ SQLITE_BIND_INT(db, stmt, 1, (int) id, error);
+ }
else
+ {
SQL = "INSERT INTO updates (job, kara_id) "
"SELECT MAX(update_job), last_insert_rowid() FROM misc;";
- sqlite3_stmt *stmt;
- SQLITE_PREPARE(db, stmt, SQL, error);
- SQLITE_BIND_INT(db, stmt, 1, (int) id, error);
+ SQLITE_PREPARE(db, stmt, SQL, error);
+ }
sqlite3_step(stmt); /* Ignore result of that one */
return true;
error:
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 3999db0f..440f6e45 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -849,6 +849,7 @@ search_get__(struct lkt_cmd_args *args)
fail_if(!strtol(args->argv[0], NULL, 0), "Invalid id");
char buff[LKT_MESSAGE_MAX];
FILE *sock = lkt_connect();
+ int foo;
write_socket(sock, "find %s\n", args->argv[0]);
for (;;) {
@@ -858,7 +859,8 @@ search_get__(struct lkt_cmd_args *args)
exit(EXIT_SUCCESS);
else if (STR_NMATCH(buff, "ACK", 3))
exit(EXIT_FAILURE);
- write(1, buff, strlen(buff));
+ foo = write(1, buff, strlen(buff));
+ (void)foo;
}
}
--
GitLab