[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit d7b9467185e8422d7285127ec47c43cc7028652c
Author: Christian Costa <titan.costa at gmail.com>
Date:   Mon Mar 26 22:05:53 2012 +0200

    attrib: Display filenames with absolute path as in native.
    (cherry picked from commit 1ed66392f2f21a75f6f21491245facd8cf3c3c95)

diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c
index 865f59c..1238cb3 100644
--- a/programs/attrib/attrib.c
+++ b/programs/attrib/attrib.c
@@ -128,11 +128,13 @@ int wmain(int argc, WCHAR *argv[])
     HANDLE hff;
     WIN32_FIND_DATAW fd;
     WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'};
-    WCHAR name[128];
+    WCHAR name[MAX_PATH];
+    WCHAR curdir[MAX_PATH];
     DWORD attrib_set = 0;
     DWORD attrib_clear = 0;
     const WCHAR help_option[] = {'/','?','\0'};
-    const WCHAR slashStarW[]  = {'\\','*','\0'};
+    const WCHAR slash[]  = {'\\','\0'};
+    const WCHAR start[]  = {'*','\0'};
     int i = 1;
 
     if ((argc >= 2) && !strcmpW(argv[1], help_option)) {
@@ -141,8 +143,10 @@ int wmain(int argc, WCHAR *argv[])
     }
 
     /* By default all files from current directory are taken into account */
-    GetCurrentDirectoryW(sizeof(name)/sizeof(WCHAR), name);
-    strcatW (name, slashStarW);
+    GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir);
+    strcatW(curdir, slash);
+    strcpyW(name, curdir);
+    strcatW(name, start);
 
     while (i < argc) {
         WCHAR *param = argv[i++];
@@ -212,7 +216,9 @@ int wmain(int argc, WCHAR *argv[])
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) {
                     flags[5] = 'C';
                 }
-                ATTRIB_wprintf(fmt, flags, fd.cFileName);
+                strcpyW(name, curdir);
+                strcatW(name, fd.cFileName);
+                ATTRIB_wprintf(fmt, flags, name);
                 for (count=0; count < 8; count++) flags[count] = ' ';
             }
         } while (FindNextFileW(hff, &fd) != 0);

-- 
Debian Wine packaging