WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/UTILS/JatsFileUtil/src/JatsFileUtilWin.c

     for ( ii = 3; ii < argc ; ii++)
+    {
         if ( verbose > 2)
-            fprintf(stderr, "RmItem: %s\n", argv[ii]);
+            fprintf(stderr, "RmItem: %ls\n", argv[ii]);
         target = makePath( argv[ii],NULL);
         rv = GetFileAttributesW( target );
         if ( rv != INVALID_FILE_ATTIBUTES )
+        {
+{
     int lenp = 0;
     int lencwd = 0;
     int len1 = _tcslen(base);
     int len2 = 0;
+    int dlen = _tcslen(TEXT("\\\\?\\"));
     _TCHAR *data;
     _TCHAR *cdata;
     _TCHAR *udst;
     /*
     **  If the base contains a \\?\ then we don't need to add it
     */
     if ( !( len1 > 3 && base[2] == '?' ) )
+    {
-        lenp = _tcslen(TEXT("\\\\?\\"));
+        lenp = dlen;
+    }
     /*
     **  Unless an absolute path we need to insert CWD too
     **  Just determine the length of the entry for now
             *udst = '\\';
+    }
     /*
     **  Now remove silly relative path bits
+    **  Also duplicate '\\'
     */
-    udst = data;
+    udst = data + dlen;
     while ( *udst )
+    {
+        if ( udst[0] == '\\' && udst[1] == '\\' )
+        {
+            TCHAR* ptr1 = udst;
+            TCHAR* ptr2 = udst + 1;
+            while ( *ptr1++ = *ptr2++ ) {}
+            continue;
+        }
         if ( udst[0] == '\\' && udst[1] == '.' && (udst[2] == '\\' || udst[2] == 0) )
+        {
             TCHAR* ptr1 = udst;
             TCHAR* ptr2 = udst + 2;
             while ( *ptr1++ = *ptr2++ ) {}

Subversion Repositories DevTools