From ee219b0e231d1fa48e1568f369d898ce20230168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Wed, 20 Apr 2005 22:05:23 +0000
Subject: [PATCH] Sync to Wine-20050419: Peter Berg Larsen <pebl@math.ku.dk> -
 Eliminate a strncpy and remove unused variable.

svn path=/trunk/; revision=14724
---
 reactos/lib/cabinet/cabextract.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/lib/cabinet/cabextract.c b/reactos/lib/cabinet/cabextract.c
index f20eb10454e..4845c40bb65 100644
--- a/reactos/lib/cabinet/cabextract.c
+++ b/reactos/lib/cabinet/cabextract.c
@@ -2068,7 +2068,7 @@ struct cabinet *find_cabs_in_file(LPCSTR name, cab_UBYTE search_buf[])
  */
 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;
 
   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, '\\');
       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 (!found) {
-        found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, &filepart);
+        found = SearchPathA(".", name, NULL, MAX_PATH, nametmp, NULL);
       }
       
       if (found) 
@@ -2135,7 +2135,7 @@ void find_cabinet_file(char **cabname, LPCSTR origcab) {
     if (found) {
       free((void *) *cabname);
       *cabname = cab;
-      strncpy(cab, nametmp, found+1);
+      memcpy(cab, nametmp, found+1);
       TRACE("result: %s\n", debugstr_a(cab));
     } else {
       free((void *) cab);