From 492457499648f1c5cd14b4adabde49daa204602a Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Fri, 16 Apr 2021 12:32:24 -0700
Subject: [PATCH] Fix some crashes on multi-line description import stuff
Even though this is going to be removed / deprecated.
---
src/sbbs3/addfiles.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/sbbs3/addfiles.c b/src/sbbs3/addfiles.c
index a6da5a368c..10dccd4ee1 100644
--- a/src/sbbs3/addfiles.c
+++ b/src/sbbs3/addfiles.c
@@ -207,18 +207,18 @@ void addlist(char *inpath, uint dirnum, const char* uploader, uint dskip, uint s
if(datefmt) {
struct tm tm = {0};
localtime_r(&now, &tm);
- strftime(f.desc, sizeof(f.desc), datefmt, &tm);
+ strftime(fdesc, sizeof(fdesc), datefmt, &tm);
} else
- unixtodstr(&scfg, (time32_t)now, f.desc);
+ unixtodstr(&scfg, (time32_t)now, fdesc);
SAFECAT(fdesc," ");
}
else if(mode&FILE_DATE) { /* get the file date and put into desc */
if(datefmt) {
struct tm tm = {0};
localtime_r(&file_timestamp, &tm);
- strftime(f.desc, sizeof(f.desc), datefmt, &tm);
+ strftime(fdesc, sizeof(fdesc), datefmt, &tm);
} else
- unixtodstr(&scfg,(time32_t)file_timestamp,f.desc);
+ unixtodstr(&scfg,(time32_t)file_timestamp,fdesc);
SAFECAT(fdesc," ");
}
@@ -363,8 +363,8 @@ void addlist(char *inpath, uint dirnum, const char* uploader, uint dskip, uint s
p[i-1]=0;
truncsp(p);
if(p[0]) {
- SAFECAT(f.desc," ");
- SAFECAT(f.desc,p);
+ SAFECAT(fdesc," ");
+ SAFECAT(fdesc,p);
}
}
}
@@ -836,6 +836,7 @@ int main(int argc, char **argv)
sprintf(str,"%s%s.lst",scfg.dir[dirnum]->path, scfg.dir[dirnum]->code);
if(!fexistcase(str) || flength(str)<=0L)
SAFEPRINTF2(str,"%s%s",scfg.dir[dirnum]->path, auto_name);
+ addlist(str, dirnum, uploader, desc_offset, size_offset);
if(mode&SYNC_LIST)
synclist(str, dirnum);
}
--
GitLab