Fix csv_escape #58

This commit is contained in:
simon987 2020-06-05 19:13:03 -04:00
parent 27b4e6403e
commit 018b49fa4c
4 changed files with 8 additions and 6 deletions

View File

@ -22,7 +22,7 @@
#define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0" #define EPILOG "Made by simon987 <me@simon987.net>. Released under GPL-3.0"
static const char *const Version = "2.4.0"; static const char *const Version = "2.4.1";
static const char *const usage[] = { static const char *const usage[] = {
"sist2 scan [OPTION]... PATH", "sist2 scan [OPTION]... PATH",
"sist2 index [OPTION]... INDEX", "sist2 index [OPTION]... INDEX",

View File

@ -11,7 +11,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">2.4.0</span> <span class="badge badge-pill version">2.4.1</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a class="btn ml-auto" href="/stats">Stats</a> <a class="btn ml-auto" href="/stats">Stats</a>
<button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings</button> <button class="btn" type="button" data-toggle="modal" data-target="#settings" onclick="loadSettings()">Settings</button>

View File

@ -10,7 +10,7 @@
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/">sist2</a> <a class="navbar-brand" href="/">sist2</a>
<span class="badge badge-pill version">2.4.0</span> <span class="badge badge-pill version">2.4.1</span>
<span class="tagline">Lightning-fast file system indexer and search tool </span> <span class="tagline">Lightning-fast file system indexer and search tool </span>
<a style="margin-left: auto" class="btn" href="/">Back</a> <a style="margin-left: auto" class="btn" href="/">Back</a>
<button class="btn" type="button" data-toggle="modal" data-target="#settings" <button class="btn" type="button" data-toggle="modal" data-target="#settings"

View File

@ -188,9 +188,9 @@ void csv_escape(char *dst, const char *str) {
return; return;
} }
while (*ptr++ != 0) { *out++ = '"';
char c = *ptr; char c;
while ((c = *ptr++) != 0) {
if (c == '"') { if (c == '"') {
*out++ = '"'; *out++ = '"';
*out++ = '"'; *out++ = '"';
@ -198,6 +198,8 @@ void csv_escape(char *dst, const char *str) {
*out++ = c; *out++ = c;
} }
} }
*out++ = '"';
*out = '\0';
} }
int open_or_exit(const char *path) { int open_or_exit(const char *path) {