← Back to branch summary

~ubuntu-branches/ubuntu/utopic/open-vm-tools/utopic

« back to all changes in this revision

Viewing changes to lib/misc/hostinfoPosix.c

  • Committer: Package Import Robot
  • Author(s): Bernd Zeimetz, 31c30832
  • Date: 2014-01-08 20:28:33 UTC
  • mfrom: (1.4.14) (2.4.42 sid)
  • Revision ID: package-import@ubuntu.com-20140108202833-l0ycdpzq5ayadedn
Tags: 2:9.4.0-1280544-5
[31c30832] Revert "Enable building of vmci again."
This reverts commit 0d55577cd3c262dbbc2bf79593d6f500f84c4170.
Too fast upload, sorry. vmhgfs is indeed (still) broken with
vmci.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/misc/hostinfoPosix.c
100
100
#include "hostinfo.h"
101
101
#include "hostinfoInt.h"
102
102
#include "safetime.h"
 
103
#include "vm_version.h"
103
104
#include "str.h"
104
105
#include "err.h"
105
106
#include "msg.h"
453
454
}
454
455
 
455
456
 
456
 
#if !defined __APPLE__ && !defined USERWORLD
 
457
#if !defined __APPLE__
457
458
/*
458
459
 *-----------------------------------------------------------------------------
459
460
 *
579
580
         Str_Strcpy(distroShort, STR_OS_DEBIAN_6, distroShortSize);
580
581
      } else if (strstr(distroLower, "7.0")) {
581
582
         Str_Strcpy(distroShort, STR_OS_DEBIAN_7, distroShortSize);
582
 
      } else if (strstr(distroLower, "7.1")) {
583
 
         Str_Strcpy(distroShort, STR_OS_DEBIAN_7_1, distroShortSize);
584
583
      }
585
584
   } else if (StrUtil_StartsWith(distroLower, "enterprise linux") ||
586
585
              StrUtil_StartsWith(distroLower, "oracle")) {
744
743
#endif
745
744
 
746
745
 
747
 
#ifndef USERWORLD
748
746
/*
749
747
 *----------------------------------------------------------------------
750
748
 *
830
828
   }
831
829
   return out;
832
830
}
833
 
#endif
834
831
 
835
832
 
836
833
/*
879
876
   Str_Sprintf(osNameFull, sizeof osNameFull, "%s %s", buf.sysname,
880
877
               buf.release);
881
878
 
882
 
#if defined USERWORLD
883
 
   if (buf.release[0] <= '4') {
884
 
      Str_Strcpy(osName, "vmkernel", sizeof osName);
885
 
   } else {
886
 
      Str_Strcpy(osName, "vmkernel5", sizeof osName);
887
 
   }
888
 
   Str_Snprintf(osNameFull, sizeof osNameFull, "VMware ESXi %c.x",
889
 
                buf.release[0]);
890
 
#elif defined __APPLE__
 
879
#if defined __APPLE__
891
880
   {
892
881
      /*
893
882
       * The easiest way is to invoke "system_profiler" and hope that the
1062
1051
   }
1063
1052
#endif
1064
1053
 
1065
 
#ifndef USERWORLD
1066
1054
   if (Hostinfo_GetSystemBitness() == 64) {
1067
1055
      if (strlen(osName) + sizeof STR_OS_64BIT_SUFFIX > sizeof osName) {
1068
1056
         Warning("%s: Error: buffer too small\n", __FUNCTION__);
1071
1059
      }
1072
1060
      Str_Strcat(osName, STR_OS_64BIT_SUFFIX, sizeof osName);
1073
1061
   }
1074
 
#endif
1075
1062
 
1076
1063
   /*
1077
1064
    * Before returning, truncate the \n character at the end of the full name.