← Back to branch summary

~n-muench/ubuntu/oneiric/open-vm-tools/open-vm-tools.fix-836277

« back to all changes in this revision

Viewing changes to lib/user/utilPosix.c

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2008-08-15 21:21:40 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080815212140-05fhxj8wroosysmj
Tags: 2008.08.08-109361-1ubuntu1
https://launchpad.net/bugs/258393
* Merge from Debian unstable (LP: #258393), remaining Ubuntu change:
  - add ubuntu_toolchain_FTBFS.dpatch patch, fix FTBFS
* Update ubuntu_toolchain_FTBFS.dpatch patch for the new version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/user/utilPosix.c
289
289
      File_GetPathName(tag, &dir, &fileName);
290
290
   } else {
291
291
      dir = Util_GetSafeTmpDir(TRUE);
292
 
      fileName = Unicode_Duplicate(tag ? tag : U("vmware"));
 
292
      fileName = Unicode_Duplicate(tag ? tag : "vmware");
293
293
   }
294
294
 
295
295
   fd = File_MakeTempEx(dir, fileName, presult);
414
414
 
415
415
   for (i = 0; i < numFiles; i++) {
416
416
       if (Unicode_StartsWith(fileList[i], pattern)) {
417
 
          Unicode path = Unicode_Join(baseTmpDir, U(DIRSEPS), fileList[i],
 
417
          Unicode path = Unicode_Join(baseTmpDir, DIRSEPS, fileList[i],
418
418
                                      NULL);
419
419
 
420
420
          if (File_IsDirectory(path) &&