debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: You cannot use the destination of snprintf as one of the srcs, undefined

Browse Source
This commit is contained in:
Peter Howkins
2018-04-14 01:23:48 +01:00
parent b410e644c0
commit caef8edac0
5 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cde/lib/tt/mini_isam/isrename.c
View File

@@ -217,6 +217,7 @@ _rename_datfile(isfname, newname)
{
char namebuf[MAXPATHLEN];
char newbuf[MAXPATHLEN];
char newbuftemp[sizeof(newbuf)];
snprintf(namebuf, sizeof(namebuf), "%s", isfname);
snprintf(newbuf, sizeof(newbuf), "%s", isfname);
@@ -225,9 +226,12 @@ _rename_datfile(isfname, newname)
* Replace the last element of the old path with newname.
*/
_removelast(newbuf);
if (strcmp(newbuf, "/") != 0)
snprintf(newbuf, sizeof(newbuf), "%s/", newbuf);
snprintf(newbuf, sizeof(newbuf), "%s%s", newbuf, newname);
if (strcmp(newbuf, "/") != 0) {
snprintf(newbuftemp, sizeof(newbuftemp), "%s/", newbuf);
strcpy(newbuf, newbuftemp);
}
snprintf(newbuftemp, sizeof(newbuftemp), "%s%s", newbuf, newname);
strcpy(newbuf, newbuftemp);
_makedat_isfname(namebuf);
_makedat_isfname(newbuf);
@@ -242,6 +246,7 @@ _rename_indfile(isfname, newname)
{
char namebuf[MAXPATHLEN];
char newbuf[MAXPATHLEN];
char newbuftemp[MAXPATHLEN];
snprintf(namebuf, sizeof(namebuf), "%s", isfname);
snprintf(newbuf, sizeof(newbuf), "%s", isfname);
@@ -250,9 +255,12 @@ _rename_indfile(isfname, newname)
* Replace the last element of the old path with newname.
*/
_removelast(newbuf);
if (strcmp(newbuf, "/") != 0)
snprintf(newbuf, sizeof(newbuf), "%s/", newbuf);
snprintf(newbuf, sizeof(newbuf), "%s%s", newbuf, newname);
if (strcmp(newbuf, "/") != 0) {
snprintf(newbuftemp, sizeof(newbuftemp), "%s/", newbuf);
strcpy(newbuf, newbuftemp);
}
snprintf(newbuftemp, sizeof(newbuftemp), "%s%s", newbuf, newname);
strcpy(newbuf, newbuftemp);
_makeind_isfname(namebuf);
_makeind_isfname(newbuf);
@@ -267,6 +275,7 @@ _rename_varfile(isfname, newname)
{
char namebuf[MAXPATHLEN];
char newbuf[MAXPATHLEN];
char newbuftemp[MAXPATHLEN];
snprintf(namebuf, sizeof(namebuf), "%s", isfname);
snprintf(newbuf, sizeof(newbuf), "%s", isfname);
@@ -275,9 +284,12 @@ _rename_varfile(isfname, newname)
* Replace the last element of the old path with newname.
*/
_removelast(newbuf);
if (strcmp(newbuf, "/") != 0)
snprintf(newbuf, sizeof(newbuf), "%s/", newbuf);
snprintf(newbuf, sizeof(newbuf), "%s%s", newbuf, newname);
if (strcmp(newbuf, "/") != 0) {
snprintf(newbuftemp, sizeof(newbuftemp), "%s/", newbuf);
strcpy(newbuf, newbuftemp);
}
snprintf(newbuftemp, sizeof(newbuftemp), "%s%s", newbuf, newname);
strcpy(newbuf, newbuftemp);
_makevar_isfname(namebuf);
_makevar_isfname(newbuf);