apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-16 22:38:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

change strcpy to strlcpy

Browse Source 
Change-Id: I8b9429a3c225a82842fce136bdb14b8b135066d3
Signed-off-by: lilei19 <lilei19@xiaomi.com>
This commit is contained in:
lilei19
2023-02-09 19:01:32 +08:00
committed by Xiang Xiao
parent e86745b9a2
commit 41f60bd669
33 changed files with 238 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
netutils/thttpd/cgi-src/ssi.c
View File

@@ -182,6 +182,7 @@ static int get_filename(char *vfilename, char *filename,
int fnsize)
{
char *cp;
int size;
int vl;
int fl;
@@ -193,6 +194,7 @@ static int get_filename(char *vfilename, char *filename,
vl = strlen(vfilename);
fl = strlen(filename);
size = fl - vl;
if (strcmp(tag, "virtual") == 0)
{
@@ -204,18 +206,18 @@ static int get_filename(char *vfilename, char *filename,
/* Figure out root using difference between vfilename and filename. */
if (vl > fl || strcmp(vfilename, &filename[fl - vl]) != 0)
if (vl > fl || strcmp(vfilename, &filename[size]) != 0)
{
return -1;
}
if (fl - vl + strlen(val) >= fnsize)
if (size + strlen(val) >= fnsize)
{
return -1;
}
strncpy(fn, filename, fl - vl);
strcpy(&fn[fl - vl], val);
strncpy(fn, filename, size);
strlcpy(&fn[size], val, fnsize - size);
}
else if (strcmp(tag, "file") == 0)
{
@@ -230,7 +232,7 @@ static int get_filename(char *vfilename, char *filename,
return -1;
}
strcpy(fn, filename);
strlcpy(fn, filename, fnsize);
cp = strrchr(fn, '/');
if (cp == (char *)0)
{
@@ -238,7 +240,8 @@ static int get_filename(char *vfilename, char *filename,
*cp = '/';
}
strcpy(++cp, val);
cp++;
strlcpy(cp, val, fnsize - (cp - fn));
}
else
{
@@ -314,7 +317,7 @@ static int check_filename(char *filename)
cp = strrchr(dirname, '/');
if (cp == (char *)0)
{
strcpy(dirname, ".");
strlcpy(dirname, ".", fnl + 1);
}
else
{
@@ -354,18 +357,18 @@ static int check_filename(char *filename)
static void show_time(time_t t, int gmt)
{
struct tm *tmP;
struct tm *tmp;
if (gmt)
{
tmP = gmtime(&t);
tmp = gmtime(&t);
}
else
{
tmP = localtime(&t);
tmp = localtime(&t);
}
if (strftime(g_iobuffer2, BUFFER_SIZE, g_timeformat, tmP) > 0)
if (strftime(g_iobuffer2, BUFFER_SIZE, g_timeformat, tmp) > 0)
{
puts(g_iobuffer2);
}
@@ -471,11 +474,11 @@ static void do_include(FILE *instream, char *vfilename, char *filename,
{
if (strlen(val) < BUFFER_SIZE)
{
strcpy(g_iobuffer2, val);
strlcpy(g_iobuffer2, val, sizeof(g_iobuffer2));
}
else
{
strcpy(g_iobuffer2, g_iobuffer1); /* same size, has to fit */
strlcpy(g_iobuffer2, g_iobuffer1, sizeof(g_iobuffer2)); /* same size, has to fit */
}
}
else
@@ -483,7 +486,7 @@ static void do_include(FILE *instream, char *vfilename, char *filename,
if (strlen(vfilename) + 1 + strlen(val) < BUFFER_SIZE)
{
char *cp;
strcpy(g_iobuffer2, vfilename);
strlcpy(g_iobuffer2, vfilename, sizeof(g_iobuffer2));
cp = strrchr(g_iobuffer2, '/');
if (cp == (char *)0)
{
@@ -491,11 +494,12 @@ static void do_include(FILE *instream, char *vfilename, char *filename,
*cp = '/';
}
strcpy(++cp, val);
cp++;
strlcpy(cp, val, sizeof(g_iobuffer2) - (cp - g_iobuffer2));
}
else
{
strcpy(g_iobuffer2, g_iobuffer1); /* same size, has to fit */
strlcpy(g_iobuffer2, g_iobuffer1, sizeof(g_iobuffer2)); /* same size, has to fit */
}
}
@@ -907,7 +911,7 @@ int main(int argc, char *argv[])
/* Default formats. */
strcpy(g_timeformat, "%a %b %e %T %Z %Y");
strlcpy(g_timeformat, "%a %b %e %T %Z %Y", sizeof(g_timeformat));
g_sizefmt = SF_BYTES;
/* The MIME type has to be text/html. */