Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to Wine-20050419:

Browse source 
Peter Berg Larsen <pebl@math.ku.dk>
- Eliminate a strncpy and remove unused variable.

svn path=/trunk/; revision=14724
This commit is contained in:
Gé van Geldorp 2005-04-20 22:05:23 +00:00
parent 37d076fdc0
commit ee219b0e23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/lib/cabinet/cabextract.c
View file

@ -2068,7 +2068,7 @@ struct cabinet *find_cabs_in_file(LPCSTR name, cab_UBYTE search_buf[])
*/ */
void find_cabinet_file(char **cabname, LPCSTR origcab) { void find_cabinet_file(char **cabname, LPCSTR origcab) {
char *tail, *cab, *name, *nextpart, nametmp[MAX_PATH], *filepart; char *tail, *cab, *name, *nextpart, nametmp[MAX_PATH];
int found = 0; int found = 0;
TRACE("(*cabname == ^%p, origcab == %s)\n", cabname ? *cabname : NULL, debugstr_a(origcab)); TRACE("(*cabname == ^%p, origcab == %s)\n", cabname ? *cabname : NULL, debugstr_a(origcab));
@ -2107,11 +2107,11 @@ void find_cabinet_file(char **cabname, LPCSTR origcab) {
nextpart = strchr(name, '\\'); nextpart = strchr(name, '\\');
if (nextpart) *nextpart = '\0'; if (nextpart) *nextpart = '\0';
found = SearchPathA(cab, name, NULL, MAX_PATH, nametmp, &filepart); found = SearchPathA(cab, name, NULL, MAX_PATH, nametmp, NULL);
/* if the component was not found, look for it in the current dir */ /* if the component was not found, look for it in the current dir */
if (!found) { if (!found) {
found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, &filepart); found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, NULL);
} }
if (found) if (found)
@ -2135,7 +2135,7 @@ void find_cabinet_file(char **cabname, LPCSTR origcab) {
if (found) { if (found) {
free((void *) *cabname); free((void *) *cabname);
*cabname = cab; *cabname = cab;
strncpy(cab, nametmp, found+1); memcpy(cab, nametmp, found+1);
TRACE("result: %s\n", debugstr_a(cab)); TRACE("result: %s\n", debugstr_a(cab));
} else { } else {
free((void *) cab); free((void *) cab);