Forgot to 'add' all the modified files.
+2008-05-12 Elliot Lee <elliot@vmware.com>
+
+ * Resync with internal trunk (2008.05.08).
+
+ * configure.ac, **/Makefile.am: Use CPPFLAGS instead of
+ CFLAGS to eliminate warning about proc/sysinfo.h.
+
+ * guestd/foreignVMToolsNetworking.c,
+ vmware-user/foreignVMToolsNetworking.c
+ lib/hgfsServer/hgfsServerLinux.c, lib/include/hgfsServerInt.h,
+ modules/linux/vmhgfs/bdhandler.c, modules/linux/vmhgfs/dir.c,
+ modules/linux/vmhgfs/file.c, modules/linux/vmhgfs/filesystem.h,
+ modules/linux/vmhgfs/fsutil.h, modules/linux/vmhgfs/inode.c,
+ modules/linux/vmhgfs/link.c, modules/linux/vmhgfs/module.h,
+ modules/linux/vmhgfs/page.c, modules/linux/vmhgfs/request.c,
+ modules/linux/vmhgfs/request.h: Whitespace cleanups.
+
+ * guestd/main.c: Removed "blessed app" code for starting
+ vmware-user. Hooray!
+
+ * lib/deployPkg/deployPkg.c: Remove unneeded Utf8 conversion for
+ Windows.
+
+ * lib/file/filePosix.c: Use new Posix_RealPath implementation.
+
+ * lib/guestApp/guestApp.c, lib/include/guestApp.h: Remove/cleanup
+ UTF-8 related RPC functions.
+
+ * lib/guestInfo/guestInfoPerfMonLinux.c,
+ lib/guestInfo/guestInfoPosix.c, lib/include/guestInfo.h,
+ lib/include/guestInfoInt.h, lib/include/guestStats.h: Rename
+ structures to GuestMemInfo, GuestNicInfo, and GuestDiskInfo.
+
+ * lib/guestInfo/guestInfoServer.c, lib/include/guest_msg_def.h: As
+ above, and also GUESTMSG_MAX_IN_SIZE moved to guest_msg_def.h, and
+ misc locking updates. Also add GuestInfoServer_Main(), and cleanup
+ whitespace.
+
+ * lib/hgfsServer/hgfsServer.c: Cleanup UTF-8 handling.
+
+ * lib/include/codeset.h: Update defines that indicate whether the
+ current platform is using UTF-8.
+
+ * lib/include/dnd.h: Add prototypes for a couple of string
+ conversion functions.
+
+ * lib/include/file_extensions.h: Add OVF and Archived OVF file extensions.
+
+ * lib/include/file.h: C++ guard thingies. Update a couple of
+ function prototypes to work on file descriptors instead of
+ filenames.
+
+ * lib/include/hashTable.h, lib/include/guest_os.h,
+ lib/include/loglevel_defs.h, lib/include/stats_user_defs.h,
+ lib/include/stats_user_setup.h, lib/include/str.h,
+ lib/include/unicodeTypes.h, lib/include/util.h: Allow inclusion in
+ kernel modules...
+
+ * lib/include/loglevel_user.h: As above, and add a couple of
+ loglevel variables.
+
+ * lib/include/util.h, lib/misc/util_misc.c: Allow inclusion in
+ kernel modules as above, and add some utility functions on Windows
+ for manipulating canonical paths.
+
+ * lib/include/hgfsProto.h, lib/include/hgfsUtil.h: Move
+ request/reply payload macros to hgfsProto.h.
+
+ * lib/include/hgfsServerPolicy.h: Add ShareList management
+ prototypes and structure members.
+
+ * lib/include/msg.h: Add function prototypes for creating and
+ posting lists of messages.
+
+ * lib/include/system.h: Add types & functions related to desktop
+ switch monitoring on Windows.
+
+ * lib/include/unicodeOperations.h: Add/update inline unicode operations.
+
+ * lib/include/vixCommands.h: Add VIX requests and events.
+
+ * lib/include/vmbackup_def.h, lib/vmBackupLib/stateMachine.c: Move
+ backup status enum to public header.
+
+ * lib/include/vm_basic_asm_x86_64.h: Div643232 now also works on MSC.
+
+ * lib/include/vm_basic_defs.h: Add debug output macros for Windows drivers.
+
+ * lib/include/vm_basic_types.h: Update the FMTPD macro, add
+ SCANF_DECL macro for arg checking on scanf-like functions.
+
+ * lib/include/x86cpuid.h: Defines for AMD L2/L3 cache separately, and CPUID for Nehalem.
+
+ * lib/misc/codesetOld.c: Bug fixes and general unicode handling updates.
+
+ * lib/system/systemLinux.c: Use Posix_Getenv/Posix_Setenv impls.
+
+ * lib/vixTools/vixTools.c, lib/vmBackupLib/scriptOps.c: Bug fixes.
+
+ * modules/freebsd/*, modules/linux/*: Updates to correspond to
+ updates of files in main tree.
+
+ * modules/freebsd/vmhgfs/hgfs_kernel.h: Bug fixes.
+
+ * modules/freebsd/vmxnet/vm_device_version: Add
+ SCSI_IDE_HOSTED_CHANNEL define, update SCSI_MAX_CHANNELS.
+
+ * modules/freebsd/vmxnet/vmnet.def: Add capabilities for IPv6
+ checksumming and TSO, and large packet TSO.
+
+ * lib/include/vmblock.h, modules/linux/vmblock/linux/control.c,
+ modules/linux/vmblock/linux/vmblockInt.h: Use a macro to better
+ abstract the vmblock mount point & device.
+
+ * vmware-user/vmware-user.c: Add SIGPIPE to the list of signals
+ that vmware-user handles.
+
2008-05-02 Adar Dembo <adar@vmware.com>
* Resync with internal trunk (2008.04.19).
-open-vm-tools-2008.05.02-90473:
-total 1676
--rwxr-xr-x 1 mts mts 33 May 2 15:24 AUTHORS
--rwxr-xr-x 1 mts mts 26425 May 2 15:24 COPYING
--rwxr-xr-x 1 mts mts 36356 May 2 15:24 ChangeLog
--r--r--r-- 1 mts mts 9416 May 2 15:25 INSTALL
--rwxr-xr-x 1 mts mts 1361 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 21072 May 2 15:25 Makefile.in
--rwxr-xr-x 1 mts mts 1636 May 2 15:24 NEWS
--rwxr-xr-x 1 mts mts 6311 May 2 15:24 README
--rw-r--r-- 1 mts mts 262309 May 2 15:25 aclocal.m4
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 autom4te.cache
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 checkvm
+open-vm-tools-2008.05.15-93084:
+total 1680
+-rwxr-xr-x 1 mts mts 33 May 16 00:02 AUTHORS
+-rwxr-xr-x 1 mts mts 26425 May 16 00:02 COPYING
+-rwxr-xr-x 1 mts mts 40633 May 16 00:02 ChangeLog
+-r--r--r-- 1 mts mts 9416 May 16 00:02 INSTALL
+-rwxr-xr-x 1 mts mts 1361 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 21050 May 16 00:02 Makefile.in
+-rwxr-xr-x 1 mts mts 2007 May 16 00:02 NEWS
+-rwxr-xr-x 1 mts mts 6311 May 16 00:02 README
+-rw-r--r-- 1 mts mts 262309 May 16 00:02 aclocal.m4
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autom4te.cache
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 checkvm
-r-xr-xr-x 1 mts mts 43668 Apr 28 2007 config.guess
-r-xr-xr-x 1 mts mts 32151 Apr 28 2007 config.sub
--rwxr-xr-x 1 mts mts 910427 May 2 15:25 configure
--rwxr-xr-x 1 mts mts 23279 May 2 15:25 configure.ac
--r-xr-xr-x 1 mts mts 17574 May 2 15:25 depcomp
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 guestd
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsclient
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsmounter
--r-xr-xr-x 1 mts mts 13184 May 2 15:25 install-sh
-drwxr-xr-x 48 mts mts 4096 May 2 15:25 lib
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 libguestlib
+-rwxr-xr-x 1 mts mts 910516 May 16 00:02 configure
+-rwxr-xr-x 1 mts mts 23994 May 16 00:02 configure.ac
+-r-xr-xr-x 1 mts mts 17574 May 16 00:02 depcomp
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 guestd
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsclient
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsmounter
+-r-xr-xr-x 1 mts mts 13184 May 16 00:02 install-sh
+drwxr-xr-x 48 mts mts 4096 May 16 00:02 lib
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 libguestlib
-r--r--r-- 1 mts mts 198422 Apr 28 2007 ltmain.sh
--r-xr-xr-x 1 mts mts 11135 May 2 15:25 missing
-drwxr-xr-x 4 mts mts 4096 May 2 15:25 modules
-drwxr-xr-x 6 mts mts 4096 May 2 15:25 scripts
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 toolbox
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 vmware-user
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 xferlogs
-
-open-vm-tools-2008.05.02-90473/autom4te.cache:
+-r-xr-xr-x 1 mts mts 11135 May 16 00:02 missing
+drwxr-xr-x 4 mts mts 4096 May 16 00:02 modules
+drwxr-xr-x 6 mts mts 4096 May 16 00:02 scripts
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 toolbox
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmware-user
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 xferlogs
+
+open-vm-tools-2008.05.15-93084/autom4te.cache:
total 2304
--rw-r--r-- 1 mts mts 912616 May 2 15:25 output.0
--rw-r--r-- 1 mts mts 912046 May 2 15:25 output.1
--rw-r--r-- 1 mts mts 10783 May 2 15:25 requests
--rw-r--r-- 1 mts mts 440048 May 2 15:25 traces.0
--rw-r--r-- 1 mts mts 60011 May 2 15:25 traces.1
+-rw-r--r-- 1 mts mts 912704 May 16 00:02 output.0
+-rw-r--r-- 1 mts mts 912134 May 16 00:02 output.1
+-rw-r--r-- 1 mts mts 10783 May 16 00:02 requests
+-rw-r--r-- 1 mts mts 439992 May 16 00:02 traces.0
+-rw-r--r-- 1 mts mts 59787 May 16 00:02 traces.1
-open-vm-tools-2008.05.02-90473/checkvm:
+open-vm-tools-2008.05.15-93084/checkvm:
total 60
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 1001 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 14628 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 7107 May 2 15:25 checkvm.c
--r--r--r-- 1 mts mts 1544 May 2 15:25 checkvm_version.h
-
-open-vm-tools-2008.05.02-90473/guestd:
-total 352
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 3496 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 18363 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 6258 May 2 15:25 debugStdio.c
--r--r--r-- 1 mts mts 37366 May 2 15:25 foreignVMToolsDaemon.c
--r--r--r-- 1 mts mts 6210 May 2 15:25 foreignVMToolsDaemon.h
--r--r--r-- 1 mts mts 37059 May 2 15:25 foreignVMToolsNetworking.c
--r--r--r-- 1 mts mts 54676 May 2 15:25 foundryToolsDaemon.c
--r--r--r-- 1 mts mts 1766 May 2 15:25 foundryToolsDaemon.h
--r--r--r-- 1 mts mts 1521 May 2 15:25 guestd_version.h
--r--r--r-- 1 mts mts 61260 May 2 15:25 main.c
--r--r--r-- 1 mts mts 4731 May 2 15:25 stub.c
--r--r--r-- 1 mts mts 54521 May 2 15:25 toolsDaemon.c
--r--r--r-- 1 mts mts 4049 May 2 15:25 toolsDaemon.h
-
-open-vm-tools-2008.05.02-90473/hgfsclient:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 959 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14578 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 7107 May 16 00:02 checkvm.c
+-r--r--r-- 1 mts mts 1544 May 16 00:02 checkvm_version.h
+
+open-vm-tools-2008.05.15-93084/guestd:
+total 328
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3416 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18275 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 6258 May 16 00:02 debugStdio.c
+-r--r--r-- 1 mts mts 37366 May 16 00:02 foreignVMToolsDaemon.c
+-r--r--r-- 1 mts mts 6210 May 16 00:02 foreignVMToolsDaemon.h
+-r--r--r-- 1 mts mts 36992 May 16 00:02 foreignVMToolsNetworking.c
+-r--r--r-- 1 mts mts 54676 May 16 00:02 foundryToolsDaemon.c
+-r--r--r-- 1 mts mts 1766 May 16 00:02 foundryToolsDaemon.h
+-r--r--r-- 1 mts mts 1521 May 16 00:02 guestd_version.h
+-r--r--r-- 1 mts mts 40324 May 16 00:02 main.c
+-r--r--r-- 1 mts mts 4731 May 16 00:02 stub.c
+-r--r--r-- 1 mts mts 54521 May 16 00:02 toolsDaemon.c
+-r--r--r-- 1 mts mts 4049 May 16 00:02 toolsDaemon.h
+
+open-vm-tools-2008.05.15-93084/hgfsclient:
total 76
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 2182 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 16066 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 16756 May 2 15:25 hgfsclient.c
--r--r--r-- 1 mts mts 1576 May 2 15:25 hgfsclient_version.h
--r--r--r-- 1 mts mts 2398 May 2 15:25 stub.c
-
-open-vm-tools-2008.05.02-90473/hgfsmounter:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 2140 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 16016 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 16756 May 16 00:02 hgfsclient.c
+-r--r--r-- 1 mts mts 1576 May 16 00:02 hgfsclient_version.h
+-r--r--r-- 1 mts mts 2398 May 16 00:02 stub.c
+
+open-vm-tools-2008.05.15-93084/hgfsmounter:
total 88
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 1164 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 14930 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 29755 May 2 15:25 hgfsmounter.c
--r--r--r-- 1 mts mts 1578 May 2 15:25 hgfsmounter_version.h
--r--r--r-- 1 mts mts 2113 May 2 15:25 stub.c
-
-open-vm-tools-2008.05.02-90473/lib:
-total 236
--r--r--r-- 1 mts mts 26425 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 1793 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 16403 May 2 15:25 Makefile.in
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 SLPv2Parser
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 auth
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 backdoor
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 conf
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 deployPkg
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 dict
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 dnd
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 err
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 eventManager
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 file
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 foundryMsg
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 ghIntegrationStub
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 guestApp
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 guestInfo
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfs
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsBd
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsServer
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsServerManagerGuest
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 hgfsServerPolicyGuest
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 impersonate
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 include
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 message
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 misc
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 netUtil
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 panic
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 panicDefault
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 printer
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 procMgr
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 rpcIn
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 rpcOut
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 rpcVmx
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 socketMgr
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 strUtil
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 string
-drwxr-xr-x 3 mts mts 4096 May 2 15:25 sync
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 syncDriver
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 system
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 toolsLogger
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 unicode
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 unityStub
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 user
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 vixTools
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 vmBackupLib
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 vmCheck
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 vmSignal
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 wiper
-
-open-vm-tools-2008.05.02-90473/lib/SLPv2Parser:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1122 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14880 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 29755 May 16 00:02 hgfsmounter.c
+-r--r--r-- 1 mts mts 1578 May 16 00:02 hgfsmounter_version.h
+-r--r--r-- 1 mts mts 2113 May 16 00:02 stub.c
+
+open-vm-tools-2008.05.15-93084/lib:
+total 232
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1793 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 16381 May 16 00:02 Makefile.in
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 SLPv2Parser
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 auth
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 backdoor
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 conf
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 deployPkg
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 dict
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 dnd
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 err
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 eventManager
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 file
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 foundryMsg
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 ghIntegrationStub
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 guestApp
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 guestInfo
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfs
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsBd
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsServer
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsServerManagerGuest
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 hgfsServerPolicyGuest
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 impersonate
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 include
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 message
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 misc
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 netUtil
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 panic
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 panicDefault
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 printer
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 procMgr
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 rpcIn
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 rpcOut
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 rpcVmx
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 socketMgr
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 strUtil
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 string
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 sync
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 syncDriver
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 system
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 toolsLogger
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 unicode
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 unityStub
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 user
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vixTools
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmBackupLib
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmCheck
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmSignal
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 wiper
+
+open-vm-tools-2008.05.15-93084/lib/SLPv2Parser:
total 68
--r--r--r-- 1 mts mts 1125 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15026 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 7514 May 2 15:25 SLPv2Match.c
--r--r--r-- 1 mts mts 18294 May 2 15:25 SLPv2MsgAssembler.c
--r--r--r-- 1 mts mts 16818 May 2 15:25 SLPv2MsgParser.c
+-r--r--r-- 1 mts mts 1083 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14976 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 7514 May 16 00:02 SLPv2Match.c
+-r--r--r-- 1 mts mts 18294 May 16 00:02 SLPv2MsgAssembler.c
+-r--r--r-- 1 mts mts 16818 May 16 00:02 SLPv2MsgParser.c
-open-vm-tools-2008.05.02-90473/lib/auth:
+open-vm-tools-2008.05.15-93084/lib/auth:
total 32
--r--r--r-- 1 mts mts 1041 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14639 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8638 May 2 15:25 authPosix.c
+-r--r--r-- 1 mts mts 1001 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14603 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8638 May 16 00:02 authPosix.c
-open-vm-tools-2008.05.02-90473/lib/backdoor:
+open-vm-tools-2008.05.15-93084/lib/backdoor:
total 52
--r--r--r-- 1 mts mts 1177 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 19352 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 6407 May 2 15:24 backdoor.c
--r--r--r-- 1 mts mts 6198 May 2 15:24 backdoorGcc32.c
--r--r--r-- 1 mts mts 5574 May 2 15:24 backdoorGcc64.c
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
-
-open-vm-tools-2008.05.02-90473/lib/backdoor/shared:
+-r--r--r-- 1 mts mts 1135 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 19302 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 6407 May 16 00:02 backdoor.c
+-r--r--r-- 1 mts mts 6198 May 16 00:02 backdoorGcc32.c
+-r--r--r-- 1 mts mts 5574 May 16 00:02 backdoorGcc64.c
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
+
+open-vm-tools-2008.05.15-93084/lib/backdoor/shared:
total 24
--r--r--r-- 1 mts mts 1164 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 18229 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 1122 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18179 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/conf:
+open-vm-tools-2008.05.15-93084/lib/conf:
total 28
--r--r--r-- 1 mts mts 1005 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14606 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 5057 May 2 15:24 conf.c
+-r--r--r-- 1 mts mts 963 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14556 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 5057 May 16 00:02 conf.c
-open-vm-tools-2008.05.02-90473/lib/deployPkg:
+open-vm-tools-2008.05.15-93084/lib/deployPkg:
total 40
--r--r--r-- 1 mts mts 1112 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14975 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8574 May 2 15:25 deployPkg.c
--r--r--r-- 1 mts mts 3246 May 2 15:25 deployPkgLog.c
--r--r--r-- 1 mts mts 3605 May 2 15:25 runDeployPkgPosix.c
+-r--r--r-- 1 mts mts 1070 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14925 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8242 May 16 00:02 deployPkg.c
+-r--r--r-- 1 mts mts 3246 May 16 00:02 deployPkgLog.c
+-r--r--r-- 1 mts mts 3605 May 16 00:02 runDeployPkgPosix.c
-open-vm-tools-2008.05.02-90473/lib/dict:
+open-vm-tools-2008.05.15-93084/lib/dict:
total 36
--r--r--r-- 1 mts mts 1008 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14612 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 15769 May 2 15:25 dictll.c
+-r--r--r-- 1 mts mts 965 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14562 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 15769 May 16 00:02 dictll.c
-open-vm-tools-2008.05.02-90473/lib/dnd:
+open-vm-tools-2008.05.15-93084/lib/dnd:
total 64
--r--r--r-- 1 mts mts 1038 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14702 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 27742 May 2 15:25 dndCommon.c
--r--r--r-- 1 mts mts 15024 May 2 15:25 dndLinux.c
+-r--r--r-- 1 mts mts 996 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14652 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 27742 May 16 00:02 dndCommon.c
+-r--r--r-- 1 mts mts 15024 May 16 00:02 dndLinux.c
-open-vm-tools-2008.05.02-90473/lib/err:
+open-vm-tools-2008.05.15-93084/lib/err:
total 36
--r--r--r-- 1 mts mts 1033 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14684 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 6614 May 2 15:25 err.c
--r--r--r-- 1 mts mts 1172 May 2 15:25 errInt.h
--r--r--r-- 1 mts mts 3158 May 2 15:25 errPosix.c
+-r--r--r-- 1 mts mts 990 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14634 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 6614 May 16 00:02 err.c
+-r--r--r-- 1 mts mts 1172 May 16 00:02 errInt.h
+-r--r--r-- 1 mts mts 3158 May 16 00:02 errPosix.c
-open-vm-tools-2008.05.02-90473/lib/eventManager:
+open-vm-tools-2008.05.15-93084/lib/eventManager:
total 28
--r--r--r-- 1 mts mts 1037 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14798 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 7083 May 2 15:24 eventManager.c
+-r--r--r-- 1 mts mts 995 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14748 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 7083 May 16 00:02 eventManager.c
-open-vm-tools-2008.05.02-90473/lib/file:
+open-vm-tools-2008.05.15-93084/lib/file:
total 288
--r--r--r-- 1 mts mts 1213 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15191 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 49675 May 2 15:25 file.c
--r--r--r-- 1 mts mts 13064 May 2 15:25 fileIO.c
--r--r--r-- 1 mts mts 54842 May 2 15:25 fileIOPosix.c
--r--r--r-- 1 mts mts 26974 May 2 15:25 fileLockPosix.c
--r--r--r-- 1 mts mts 42447 May 2 15:25 fileLockPrimitive.c
--r--r--r-- 1 mts mts 61350 May 2 15:25 filePosix.c
-
-open-vm-tools-2008.05.02-90473/lib/foundryMsg:
+-r--r--r-- 1 mts mts 1173 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15155 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 49675 May 16 00:02 file.c
+-r--r--r-- 1 mts mts 13064 May 16 00:02 fileIO.c
+-r--r--r-- 1 mts mts 54842 May 16 00:02 fileIOPosix.c
+-r--r--r-- 1 mts mts 26974 May 16 00:02 fileLockPosix.c
+-r--r--r-- 1 mts mts 42447 May 16 00:02 fileLockPrimitive.c
+-r--r--r-- 1 mts mts 61431 May 16 00:02 filePosix.c
+
+open-vm-tools-2008.05.15-93084/lib/foundryMsg:
total 108
--r--r--r-- 1 mts mts 1183 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15185 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 24798 May 2 15:25 foundryMsg.c
--r--r--r-- 1 mts mts 42795 May 2 15:25 foundryPropertyListCommon.c
--r--r--r-- 1 mts mts 6874 May 2 15:25 foundryThreads.c
--r--r--r-- 1 mts mts 7449 May 2 15:25 vixTranslateErrOpenSource.c
-
-open-vm-tools-2008.05.02-90473/lib/ghIntegrationStub:
+-r--r--r-- 1 mts mts 1141 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15135 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 24798 May 16 00:02 foundryMsg.c
+-r--r--r-- 1 mts mts 42795 May 16 00:02 foundryPropertyListCommon.c
+-r--r--r-- 1 mts mts 6874 May 16 00:02 foundryThreads.c
+-r--r--r-- 1 mts mts 7449 May 16 00:02 vixTranslateErrOpenSource.c
+
+open-vm-tools-2008.05.15-93084/lib/ghIntegrationStub:
total 24
--r--r--r-- 1 mts mts 1088 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14936 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 1228 May 2 15:25 ghIntegrationStub.c
-
-open-vm-tools-2008.05.02-90473/lib/guestApp:
-total 76
--r--r--r-- 1 mts mts 1062 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14819 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 45993 May 2 15:25 guestApp.c
--r--r--r-- 1 mts mts 5720 May 2 15:25 guestAppPosix.c
-
-open-vm-tools-2008.05.02-90473/lib/guestInfo:
+-r--r--r-- 1 mts mts 1048 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14900 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 1228 May 16 00:02 ghIntegrationStub.c
+
+open-vm-tools-2008.05.15-93084/lib/guestApp:
+total 72
+-r--r--r-- 1 mts mts 1020 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14769 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 42611 May 16 00:02 guestApp.c
+-r--r--r-- 1 mts mts 5720 May 16 00:02 guestAppPosix.c
+
+open-vm-tools-2008.05.15-93084/lib/guestInfo:
total 104
--r--r--r-- 1 mts mts 1181 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15043 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 6480 May 2 15:24 guestInfoPerfMonLinux.c
--r--r--r-- 1 mts mts 25690 May 2 15:24 guestInfoPosix.c
--r--r--r-- 1 mts mts 45285 May 2 15:25 guestInfoServer.c
+-r--r--r-- 1 mts mts 1144 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15009 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 6509 May 16 00:02 guestInfoPerfMonLinux.c
+-r--r--r-- 1 mts mts 25707 May 16 00:02 guestInfoPosix.c
+-r--r--r-- 1 mts mts 47930 May 16 00:02 guestInfoServer.c
-open-vm-tools-2008.05.02-90473/lib/hgfs:
+open-vm-tools-2008.05.15-93084/lib/hgfs:
total 88
--r--r--r-- 1 mts mts 1217 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15290 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 12069 May 2 15:25 cpName.c
--r--r--r-- 1 mts mts 5787 May 2 15:25 cpNameLinux.c
--r--r--r-- 1 mts mts 2666 May 2 15:25 cpNameLite.c
--r--r--r-- 1 mts mts 9115 May 2 15:25 cpNameUtil.c
--r--r--r-- 1 mts mts 1477 May 2 15:25 cpNameUtilInt.h
--r--r--r-- 1 mts mts 5613 May 2 15:25 cpNameUtilLinux.c
--r--r--r-- 1 mts mts 6846 May 2 15:25 hgfsUtil.c
--r--r--r-- 1 mts mts 8847 May 2 15:25 staticEscape.c
-
-open-vm-tools-2008.05.02-90473/lib/hgfsBd:
+-r--r--r-- 1 mts mts 1175 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15240 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 12069 May 16 00:02 cpName.c
+-r--r--r-- 1 mts mts 5787 May 16 00:02 cpNameLinux.c
+-r--r--r-- 1 mts mts 2666 May 16 00:02 cpNameLite.c
+-r--r--r-- 1 mts mts 9115 May 16 00:02 cpNameUtil.c
+-r--r--r-- 1 mts mts 1477 May 16 00:02 cpNameUtilInt.h
+-r--r--r-- 1 mts mts 5613 May 16 00:02 cpNameUtilLinux.c
+-r--r--r-- 1 mts mts 6846 May 16 00:02 hgfsUtil.c
+-r--r--r-- 1 mts mts 8847 May 16 00:02 staticEscape.c
+
+open-vm-tools-2008.05.15-93084/lib/hgfsBd:
total 32
--r--r--r-- 1 mts mts 1013 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14654 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8713 May 2 15:25 hgfsBd.c
-
-open-vm-tools-2008.05.02-90473/lib/hgfsServer:
-total 328
--r--r--r-- 1 mts mts 1112 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14901 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 160457 May 2 15:25 hgfsServer.c
--r--r--r-- 1 mts mts 142329 May 2 15:25 hgfsServerLinux.c
-
-open-vm-tools-2008.05.02-90473/lib/hgfsServerManagerGuest:
+-r--r--r-- 1 mts mts 971 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14604 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8713 May 16 00:02 hgfsBd.c
+
+open-vm-tools-2008.05.15-93084/lib/hgfsServer:
+total 324
+-r--r--r-- 1 mts mts 1072 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14865 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 158068 May 16 00:02 hgfsServer.c
+-r--r--r-- 1 mts mts 142052 May 16 00:02 hgfsServerLinux.c
+
+open-vm-tools-2008.05.15-93084/lib/hgfsServerManagerGuest:
total 28
--r--r--r-- 1 mts mts 1077 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15046 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 6635 May 2 15:25 hgfsServerManagerGuest.c
+-r--r--r-- 1 mts mts 1035 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14996 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 6635 May 16 00:02 hgfsServerManagerGuest.c
-open-vm-tools-2008.05.02-90473/lib/hgfsServerPolicyGuest:
+open-vm-tools-2008.05.15-93084/lib/hgfsServerPolicyGuest:
total 36
--r--r--r-- 1 mts mts 1073 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15022 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 13984 May 2 15:25 hgfsServerPolicyGuest.c
+-r--r--r-- 1 mts mts 1031 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14972 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 13984 May 16 00:02 hgfsServerPolicyGuest.c
-open-vm-tools-2008.05.02-90473/lib/impersonate:
+open-vm-tools-2008.05.15-93084/lib/impersonate:
total 40
--r--r--r-- 1 mts mts 1118 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14928 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8188 May 2 15:25 impersonate.c
--r--r--r-- 1 mts mts 11956 May 2 15:25 impersonatePosix.c
-
-open-vm-tools-2008.05.02-90473/lib/include:
-total 1224
--r--r--r-- 1 mts mts 1935 May 2 15:24 SLPv2.h
--r--r--r-- 1 mts mts 12728 May 2 15:24 SLPv2Private.h
--r--r--r-- 1 mts mts 2232 May 2 15:24 auth.h
--r--r--r-- 1 mts mts 1361 May 2 15:24 backdoor.h
--r--r--r-- 1 mts mts 1056 May 2 15:24 backdoorInt.h
--r--r--r-- 1 mts mts 5907 May 2 15:24 backdoor_def.h
--r--r--r-- 1 mts mts 3567 May 2 15:24 backdoor_types.h
--r--r--r-- 1 mts mts 1698 May 2 15:24 base64.h
--r--r--r-- 1 mts mts 1918 May 2 15:24 bsd_output.h
--r--r--r-- 1 mts mts 3312 May 2 15:24 bsd_output_int.h
--r--r--r-- 1 mts mts 5975 May 2 15:24 bsdfmt.h
--r--r--r-- 1 mts mts 272 May 2 15:24 buildNumber.h
--r--r--r-- 1 mts mts 10265 May 2 15:24 circList.h
--r--r--r-- 1 mts mts 16277 May 2 15:24 codeset.h
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 compat
--r--r--r-- 1 mts mts 3889 May 2 15:24 conf.h
--r--r--r-- 1 mts mts 4810 May 2 15:24 config.h
--r--r--r-- 1 mts mts 4198 May 2 15:24 cpName.h
--r--r--r-- 1 mts mts 1822 May 2 15:24 cpNameInt.h
--r--r--r-- 1 mts mts 1734 May 2 15:24 cpNameLite.h
--r--r--r-- 1 mts mts 2621 May 2 15:24 cpNameUtil.h
--r--r--r-- 1 mts mts 3088 May 2 15:24 cpuid_info.h
--r--r--r-- 1 mts mts 3428 May 2 15:24 cryptoError.h
--r--r--r-- 1 mts mts 2374 May 2 15:24 dbllnklst.h
--r--r--r-- 1 mts mts 1304 May 2 15:24 debug.h
--r--r--r-- 1 mts mts 1114 May 2 15:24 deployPkg.h
--r--r--r-- 1 mts mts 1125 May 2 15:24 deployPkgLog.h
--r--r--r-- 1 mts mts 1793 May 2 15:24 dictll.h
--r--r--r-- 1 mts mts 7079 May 2 15:24 dnd.h
--r--r--r-- 1 mts mts 1819 May 2 15:24 dndInt.h
--r--r--r-- 1 mts mts 8051 May 2 15:24 dynarray.h
--r--r--r-- 1 mts mts 2632 May 2 15:24 dynbuf.h
--r--r--r-- 1 mts mts 1709 May 2 15:24 embed_version.h
--r--r--r-- 1 mts mts 2893 May 2 15:24 err.h
--r--r--r-- 1 mts mts 3856 May 2 15:24 escBitvector.h
--r--r--r-- 1 mts mts 1922 May 2 15:24 escape.h
--r--r--r-- 1 mts mts 1539 May 2 15:24 eventManager.h
--r--r--r-- 1 mts mts 8680 May 2 15:24 file.h
--r--r--r-- 1 mts mts 12660 May 2 15:24 fileIO.h
--r--r--r-- 1 mts mts 6186 May 2 15:24 fileInt.h
--r--r--r-- 1 mts mts 2408 May 2 15:24 fileLock.h
--r--r--r-- 1 mts mts 3373 May 2 15:24 file_extensions.h
--r--r--r-- 1 mts mts 2194 May 2 15:24 foundryThreads.h
--r--r--r-- 1 mts mts 2271 May 2 15:24 ghIntegration.h
--r--r--r-- 1 mts mts 5453 May 2 15:24 guestApp.h
--r--r--r-- 1 mts mts 8794 May 2 15:24 guestInfo.h
--r--r--r-- 1 mts mts 1954 May 2 15:24 guestInfoInt.h
--r--r--r-- 1 mts mts 1415 May 2 15:24 guestInfoServer.h
--r--r--r-- 1 mts mts 2867 May 2 15:24 guest_msg_def.h
--r--r--r-- 1 mts mts 14546 May 2 15:24 guest_os.h
--r--r--r-- 1 mts mts 2954 May 2 15:24 hashTable.h
--r--r--r-- 1 mts mts 7032 May 2 15:24 hgfs.h
--r--r--r-- 1 mts mts 1474 May 2 15:24 hgfsBd.h
--r--r--r-- 1 mts mts 2559 May 2 15:24 hgfsDevLinux.h
--r--r--r-- 1 mts mts 39287 May 2 15:24 hgfsProto.h
--r--r--r-- 1 mts mts 2072 May 2 15:24 hgfsServer.h
--r--r--r-- 1 mts mts 26266 May 2 15:24 hgfsServerInt.h
--r--r--r-- 1 mts mts 2212 May 2 15:24 hgfsServerManager.h
--r--r--r-- 1 mts mts 2786 May 2 15:24 hgfsServerPolicy.h
--r--r--r-- 1 mts mts 4185 May 2 15:24 hgfsUtil.h
--r--r--r-- 1 mts mts 1284 May 2 15:24 hgfsVirtualDir.h
--r--r--r-- 1 mts mts 1279 May 2 15:24 hostType.h
--r--r--r-- 1 mts mts 3463 May 2 15:24 hostinfo.h
--r--r--r-- 1 mts mts 1661 May 2 15:24 impersonate.h
--r--r--r-- 1 mts mts 2031 May 2 15:24 impersonateInt.h
--r--r--r-- 1 mts mts 4286 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 4636 May 2 15:24 iovector.h
--r--r--r-- 1 mts mts 1300 May 2 15:24 localconfig.h
--r--r--r-- 1 mts mts 3878 May 2 15:24 log.h
--r--r--r-- 1 mts mts 3887 May 2 15:24 loglevel_defs.h
--r--r--r-- 1 mts mts 5616 May 2 15:24 loglevel_user.h
--r--r--r-- 1 mts mts 3553 May 2 15:24 message.h
--r--r--r-- 1 mts mts 1268 May 2 15:24 miscSolaris.h
--r--r--r-- 1 mts mts 7510 May 2 15:24 mntinfo.h
--r--r--r-- 1 mts mts 8502 May 2 15:24 msg.h
--r--r--r-- 1 mts mts 5195 May 2 15:24 msgfmt.h
--r--r--r-- 1 mts mts 1751 May 2 15:24 netutil.h
--r--r--r-- 1 mts mts 2584 May 2 15:24 panic.h
--r--r--r-- 1 mts mts 7550 May 2 15:24 posix.h
--r--r--r-- 1 mts mts 2023 May 2 15:24 preference.h
--r--r--r-- 1 mts mts 1393 May 2 15:24 printer.h
--r--r--r-- 1 mts mts 4812 May 2 15:24 procMgr.h
--r--r--r-- 1 mts mts 3166 May 2 15:24 productState.h
--r--r--r-- 1 mts mts 1344 May 2 15:24 random.h
--r--r--r-- 1 mts mts 1162 May 2 15:24 removable_device.h
--r--r--r-- 1 mts mts 2333 May 2 15:24 rpcin.h
--r--r--r-- 1 mts mts 1987 May 2 15:24 rpcout.h
--r--r--r-- 1 mts mts 2708 May 2 15:24 rpcvmx.h
--r--r--r-- 1 mts mts 2148 May 2 15:24 runDeployPkgInt.h
--r--r--r-- 1 mts mts 4882 May 2 15:24 safetime.h
--r--r--r-- 1 mts mts 3484 May 2 15:24 socketMgr.h
--r--r--r-- 1 mts mts 2505 May 2 15:24 staticEscape.h
--r--r--r-- 1 mts mts 2373 May 2 15:24 stats_file.h
--r--r--r-- 1 mts mts 3403 May 2 15:24 stats_user_defs.h
--r--r--r-- 1 mts mts 10734 May 2 15:24 stats_user_setup.h
--r--r--r-- 1 mts mts 7043 May 2 15:24 str.h
--r--r--r-- 1 mts mts 2142 May 2 15:24 strutil.h
--r--r--r-- 1 mts mts 3423 May 2 15:24 su.h
--r--r--r-- 1 mts mts 2061 May 2 15:24 syncDriver.h
--r--r--r-- 1 mts mts 1564 May 2 15:24 syncDriverIoc.h
--r--r--r-- 1 mts mts 2250 May 2 15:24 syncEvent.h
--r--r--r-- 1 mts mts 1938 May 2 15:24 syncMutex.h
--r--r--r-- 1 mts mts 3372 May 2 15:24 syncWaitQ.h
--r--r--r-- 1 mts mts 2797 May 2 15:24 system.h
--r--r--r-- 1 mts mts 3240 May 2 15:24 timeutil.h
--r--r--r-- 1 mts mts 1751 May 2 15:24 toolsDeployPkg.h
--r--r--r-- 1 mts mts 2390 May 2 15:24 toolsLogger.h
--r--r--r-- 1 mts mts 1528 May 2 15:24 toolsLoggerInt.h
--r--r--r-- 1 mts mts 1578 May 2 15:24 unicode.h
--r--r--r-- 1 mts mts 10631 May 2 15:24 unicodeBase.h
--r--r--r-- 1 mts mts 2976 May 2 15:24 unicodeICU.h
--r--r--r-- 1 mts mts 1911 May 2 15:24 unicodeInt.h
--r--r--r-- 1 mts mts 20105 May 2 15:24 unicodeOperations.h
--r--r--r-- 1 mts mts 1853 May 2 15:24 unicodeTransforms.h
--r--r--r-- 1 mts mts 5767 May 2 15:24 unicodeTypes.h
--r--r--r-- 1 mts mts 2465 May 2 15:24 unity.h
--r--r--r-- 1 mts mts 16274 May 2 15:24 util.h
--r--r--r-- 1 mts mts 2994 May 2 15:24 util_shared.h
--r--r--r-- 1 mts mts 1999 May 2 15:24 uuid.h
--r--r--r-- 1 mts mts 38679 May 2 15:24 vix.h
--r--r--r-- 1 mts mts 60614 May 2 15:24 vixCommands.h
--r--r--r-- 1 mts mts 14575 May 2 15:24 vixOpenSource.h
--r--r--r-- 1 mts mts 4132 May 2 15:24 vixTools.h
--r--r--r-- 1 mts mts 6676 May 2 15:24 vmBackup.h
--r--r--r-- 1 mts mts 14163 May 2 15:24 vmGuestLib.h
--r--r--r-- 1 mts mts 1092 May 2 15:24 vmSessionId.h
--r--r--r-- 1 mts mts 4092 May 2 15:24 vm_app.h
--r--r--r-- 1 mts mts 9976 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 54313 May 2 15:24 vm_atomic.h
--r--r--r-- 1 mts mts 17721 May 2 15:24 vm_basic_asm.h
--r--r--r-- 1 mts mts 16137 May 2 15:24 vm_basic_asm_x86.h
--r--r--r-- 1 mts mts 8927 May 2 15:24 vm_basic_asm_x86_64.h
--r--r--r-- 1 mts mts 12206 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21765 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 2430 May 2 15:24 vm_ctype.h
--r--r--r-- 1 mts mts 2118 May 2 15:24 vm_legal.h
--r--r--r-- 1 mts mts 17935 May 2 15:24 vm_product.h
--r--r--r-- 1 mts mts 29860 May 2 15:24 vm_tools_version.h
--r--r--r-- 1 mts mts 15875 May 2 15:24 vm_version.h
--r--r--r-- 1 mts mts 3338 May 2 15:24 vmbackup_def.h
--r--r--r-- 1 mts mts 4284 May 2 15:24 vmblock.h
--r--r--r-- 1 mts mts 1275 May 2 15:24 vmcheck.h
--r--r--r-- 1 mts mts 1270 May 2 15:24 vmsignal.h
--r--r--r-- 1 mts mts 1336 May 2 15:24 vmstdio.h
--r--r--r-- 1 mts mts 1913 May 2 15:24 vmware.h
--r--r--r-- 1 mts mts 1340 May 2 15:24 vmware_pack_begin.h
--r--r--r-- 1 mts mts 1360 May 2 15:24 vmware_pack_end.h
--r--r--r-- 1 mts mts 1980 May 2 15:24 vmware_pack_init.h
--r--r--r-- 1 mts mts 7863 May 2 15:24 win32util.h
--r--r--r-- 1 mts mts 2751 May 2 15:24 wiper.h
--r--r--r-- 1 mts mts 37619 May 2 15:24 x86cpuid.h
-
-open-vm-tools-2008.05.02-90473/lib/include/compat:
+-r--r--r-- 1 mts mts 1078 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14892 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8188 May 16 00:02 impersonate.c
+-r--r--r-- 1 mts mts 11956 May 16 00:02 impersonatePosix.c
+
+open-vm-tools-2008.05.15-93084/lib/include:
+total 1236
+-r--r--r-- 1 mts mts 1935 May 16 00:02 SLPv2.h
+-r--r--r-- 1 mts mts 12728 May 16 00:02 SLPv2Private.h
+-r--r--r-- 1 mts mts 2232 May 16 00:02 auth.h
+-r--r--r-- 1 mts mts 1361 May 16 00:02 backdoor.h
+-r--r--r-- 1 mts mts 1056 May 16 00:02 backdoorInt.h
+-r--r--r-- 1 mts mts 5907 May 16 00:02 backdoor_def.h
+-r--r--r-- 1 mts mts 3567 May 16 00:02 backdoor_types.h
+-r--r--r-- 1 mts mts 1698 May 16 00:02 base64.h
+-r--r--r-- 1 mts mts 1918 May 16 00:02 bsd_output.h
+-r--r--r-- 1 mts mts 3312 May 16 00:02 bsd_output_int.h
+-r--r--r-- 1 mts mts 5975 May 16 00:02 bsdfmt.h
+-r--r--r-- 1 mts mts 272 May 16 00:02 buildNumber.h
+-r--r--r-- 1 mts mts 10265 May 16 00:02 circList.h
+-r--r--r-- 1 mts mts 16338 May 16 00:02 codeset.h
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 compat
+-r--r--r-- 1 mts mts 3889 May 16 00:02 conf.h
+-r--r--r-- 1 mts mts 4810 May 16 00:02 config.h
+-r--r--r-- 1 mts mts 4198 May 16 00:02 cpName.h
+-r--r--r-- 1 mts mts 1822 May 16 00:02 cpNameInt.h
+-r--r--r-- 1 mts mts 1734 May 16 00:02 cpNameLite.h
+-r--r--r-- 1 mts mts 2621 May 16 00:02 cpNameUtil.h
+-r--r--r-- 1 mts mts 3088 May 16 00:02 cpuid_info.h
+-r--r--r-- 1 mts mts 3428 May 16 00:02 cryptoError.h
+-r--r--r-- 1 mts mts 2374 May 16 00:02 dbllnklst.h
+-r--r--r-- 1 mts mts 1304 May 16 00:02 debug.h
+-r--r--r-- 1 mts mts 1114 May 16 00:02 deployPkg.h
+-r--r--r-- 1 mts mts 1125 May 16 00:02 deployPkgLog.h
+-r--r--r-- 1 mts mts 1793 May 16 00:02 dictll.h
+-r--r--r-- 1 mts mts 7310 May 16 00:02 dnd.h
+-r--r--r-- 1 mts mts 1819 May 16 00:02 dndInt.h
+-r--r--r-- 1 mts mts 8051 May 16 00:02 dynarray.h
+-r--r--r-- 1 mts mts 2632 May 16 00:02 dynbuf.h
+-r--r--r-- 1 mts mts 1709 May 16 00:02 embed_version.h
+-r--r--r-- 1 mts mts 2893 May 16 00:02 err.h
+-r--r--r-- 1 mts mts 3856 May 16 00:02 escBitvector.h
+-r--r--r-- 1 mts mts 1922 May 16 00:02 escape.h
+-r--r--r-- 1 mts mts 1539 May 16 00:02 eventManager.h
+-r--r--r-- 1 mts mts 8744 May 16 00:02 file.h
+-r--r--r-- 1 mts mts 12660 May 16 00:02 fileIO.h
+-r--r--r-- 1 mts mts 6186 May 16 00:02 fileInt.h
+-r--r--r-- 1 mts mts 2408 May 16 00:02 fileLock.h
+-r--r--r-- 1 mts mts 3460 May 16 00:02 file_extensions.h
+-r--r--r-- 1 mts mts 2194 May 16 00:02 foundryThreads.h
+-r--r--r-- 1 mts mts 2271 May 16 00:02 ghIntegration.h
+-r--r--r-- 1 mts mts 5244 May 16 00:02 guestApp.h
+-r--r--r-- 1 mts mts 7509 May 16 00:02 guestInfo.h
+-r--r--r-- 1 mts mts 2009 May 16 00:02 guestInfoInt.h
+-r--r--r-- 1 mts mts 1415 May 16 00:02 guestInfoServer.h
+-r--r--r-- 1 mts mts 2949 May 16 00:02 guestStats.h
+-r--r--r-- 1 mts mts 3030 May 16 00:02 guest_msg_def.h
+-r--r--r-- 1 mts mts 14575 May 16 00:02 guest_os.h
+-r--r--r-- 1 mts mts 2983 May 16 00:02 hashTable.h
+-r--r--r-- 1 mts mts 7032 May 16 00:02 hgfs.h
+-r--r--r-- 1 mts mts 1474 May 16 00:02 hgfsBd.h
+-r--r--r-- 1 mts mts 2559 May 16 00:02 hgfsDevLinux.h
+-r--r--r-- 1 mts mts 39712 May 16 00:02 hgfsProto.h
+-r--r--r-- 1 mts mts 2072 May 16 00:02 hgfsServer.h
+-r--r--r-- 1 mts mts 26099 May 16 00:02 hgfsServerInt.h
+-r--r--r-- 1 mts mts 2212 May 16 00:02 hgfsServerManager.h
+-r--r--r-- 1 mts mts 3248 May 16 00:02 hgfsServerPolicy.h
+-r--r--r-- 1 mts mts 3761 May 16 00:02 hgfsUtil.h
+-r--r--r-- 1 mts mts 1284 May 16 00:02 hgfsVirtualDir.h
+-r--r--r-- 1 mts mts 1279 May 16 00:02 hostType.h
+-r--r--r-- 1 mts mts 3463 May 16 00:02 hostinfo.h
+-r--r--r-- 1 mts mts 1661 May 16 00:02 impersonate.h
+-r--r--r-- 1 mts mts 2031 May 16 00:02 impersonateInt.h
+-r--r--r-- 1 mts mts 4286 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 4636 May 16 00:02 iovector.h
+-r--r--r-- 1 mts mts 1300 May 16 00:02 localconfig.h
+-r--r--r-- 1 mts mts 3878 May 16 00:02 log.h
+-r--r--r-- 1 mts mts 3916 May 16 00:02 loglevel_defs.h
+-r--r--r-- 1 mts mts 5701 May 16 00:02 loglevel_user.h
+-r--r--r-- 1 mts mts 3553 May 16 00:02 message.h
+-r--r--r-- 1 mts mts 1268 May 16 00:02 miscSolaris.h
+-r--r--r-- 1 mts mts 7510 May 16 00:02 mntinfo.h
+-r--r--r-- 1 mts mts 8728 May 16 00:02 msg.h
+-r--r--r-- 1 mts mts 5195 May 16 00:02 msgfmt.h
+-r--r--r-- 1 mts mts 1751 May 16 00:02 netutil.h
+-r--r--r-- 1 mts mts 2584 May 16 00:02 panic.h
+-r--r--r-- 1 mts mts 7550 May 16 00:02 posix.h
+-r--r--r-- 1 mts mts 2023 May 16 00:02 preference.h
+-r--r--r-- 1 mts mts 1393 May 16 00:02 printer.h
+-r--r--r-- 1 mts mts 4812 May 16 00:02 procMgr.h
+-r--r--r-- 1 mts mts 3166 May 16 00:02 productState.h
+-r--r--r-- 1 mts mts 1344 May 16 00:02 random.h
+-r--r--r-- 1 mts mts 1162 May 16 00:02 removable_device.h
+-r--r--r-- 1 mts mts 2333 May 16 00:02 rpcin.h
+-r--r--r-- 1 mts mts 1987 May 16 00:02 rpcout.h
+-r--r--r-- 1 mts mts 2708 May 16 00:02 rpcvmx.h
+-r--r--r-- 1 mts mts 2148 May 16 00:02 runDeployPkgInt.h
+-r--r--r-- 1 mts mts 4882 May 16 00:02 safetime.h
+-r--r--r-- 1 mts mts 3484 May 16 00:02 socketMgr.h
+-r--r--r-- 1 mts mts 2505 May 16 00:02 staticEscape.h
+-r--r--r-- 1 mts mts 2373 May 16 00:02 stats_file.h
+-r--r--r-- 1 mts mts 3432 May 16 00:02 stats_user_defs.h
+-r--r--r-- 1 mts mts 10763 May 16 00:02 stats_user_setup.h
+-r--r--r-- 1 mts mts 7072 May 16 00:02 str.h
+-r--r--r-- 1 mts mts 2142 May 16 00:02 strutil.h
+-r--r--r-- 1 mts mts 3423 May 16 00:02 su.h
+-r--r--r-- 1 mts mts 2061 May 16 00:02 syncDriver.h
+-r--r--r-- 1 mts mts 1564 May 16 00:02 syncDriverIoc.h
+-r--r--r-- 1 mts mts 2250 May 16 00:02 syncEvent.h
+-r--r--r-- 1 mts mts 1938 May 16 00:02 syncMutex.h
+-r--r--r-- 1 mts mts 3372 May 16 00:02 syncWaitQ.h
+-r--r--r-- 1 mts mts 3152 May 16 00:02 system.h
+-r--r--r-- 1 mts mts 3240 May 16 00:02 timeutil.h
+-r--r--r-- 1 mts mts 1751 May 16 00:02 toolsDeployPkg.h
+-r--r--r-- 1 mts mts 2390 May 16 00:02 toolsLogger.h
+-r--r--r-- 1 mts mts 1528 May 16 00:02 toolsLoggerInt.h
+-r--r--r-- 1 mts mts 1578 May 16 00:02 unicode.h
+-r--r--r-- 1 mts mts 10631 May 16 00:02 unicodeBase.h
+-r--r--r-- 1 mts mts 2976 May 16 00:02 unicodeICU.h
+-r--r--r-- 1 mts mts 1911 May 16 00:02 unicodeInt.h
+-r--r--r-- 1 mts mts 21686 May 16 00:02 unicodeOperations.h
+-r--r--r-- 1 mts mts 1853 May 16 00:02 unicodeTransforms.h
+-r--r--r-- 1 mts mts 5796 May 16 00:02 unicodeTypes.h
+-r--r--r-- 1 mts mts 2465 May 16 00:02 unity.h
+-r--r--r-- 1 mts mts 16430 May 16 00:02 util.h
+-r--r--r-- 1 mts mts 2994 May 16 00:02 util_shared.h
+-r--r--r-- 1 mts mts 1999 May 16 00:02 uuid.h
+-r--r--r-- 1 mts mts 38679 May 16 00:02 vix.h
+-r--r--r-- 1 mts mts 61555 May 16 00:02 vixCommands.h
+-r--r--r-- 1 mts mts 14575 May 16 00:02 vixOpenSource.h
+-r--r--r-- 1 mts mts 4132 May 16 00:02 vixTools.h
+-r--r--r-- 1 mts mts 6676 May 16 00:02 vmBackup.h
+-r--r--r-- 1 mts mts 14163 May 16 00:02 vmGuestLib.h
+-r--r--r-- 1 mts mts 1092 May 16 00:02 vmSessionId.h
+-r--r--r-- 1 mts mts 4092 May 16 00:02 vm_app.h
+-r--r--r-- 1 mts mts 9976 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 54313 May 16 00:02 vm_atomic.h
+-r--r--r-- 1 mts mts 17721 May 16 00:02 vm_basic_asm.h
+-r--r--r-- 1 mts mts 16137 May 16 00:02 vm_basic_asm_x86.h
+-r--r--r-- 1 mts mts 8968 May 16 00:02 vm_basic_asm_x86_64.h
+-r--r--r-- 1 mts mts 12632 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21770 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 2430 May 16 00:02 vm_ctype.h
+-r--r--r-- 1 mts mts 2118 May 16 00:02 vm_legal.h
+-r--r--r-- 1 mts mts 17935 May 16 00:02 vm_product.h
+-r--r--r-- 1 mts mts 29860 May 16 00:02 vm_tools_version.h
+-r--r--r-- 1 mts mts 15875 May 16 00:02 vm_version.h
+-r--r--r-- 1 mts mts 3582 May 16 00:02 vmbackup_def.h
+-r--r--r-- 1 mts mts 4356 May 16 00:02 vmblock.h
+-r--r--r-- 1 mts mts 1275 May 16 00:02 vmcheck.h
+-r--r--r-- 1 mts mts 1270 May 16 00:02 vmsignal.h
+-r--r--r-- 1 mts mts 1336 May 16 00:02 vmstdio.h
+-r--r--r-- 1 mts mts 1913 May 16 00:02 vmware.h
+-r--r--r-- 1 mts mts 1340 May 16 00:02 vmware_pack_begin.h
+-r--r--r-- 1 mts mts 1360 May 16 00:02 vmware_pack_end.h
+-r--r--r-- 1 mts mts 1980 May 16 00:02 vmware_pack_init.h
+-r--r--r-- 1 mts mts 7863 May 16 00:02 win32util.h
+-r--r--r-- 1 mts mts 2751 May 16 00:02 wiper.h
+-r--r--r-- 1 mts mts 38027 May 16 00:02 x86cpuid.h
+
+open-vm-tools-2008.05.15-93084/lib/include/compat:
total 4
--r--r--r-- 1 mts mts 1906 May 2 15:24 compat_stdarg.h
+-r--r--r-- 1 mts mts 1906 May 16 00:02 compat_stdarg.h
-open-vm-tools-2008.05.02-90473/lib/message:
+open-vm-tools-2008.05.15-93084/lib/message:
total 68
--r--r--r-- 1 mts mts 1126 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 18915 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8278 May 2 15:25 message.c
--r--r--r-- 1 mts mts 17289 May 2 15:25 messageBackdoor.c
--r--r--r-- 1 mts mts 4751 May 2 15:25 messageStub.c
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
-
-open-vm-tools-2008.05.02-90473/lib/message/shared:
+-r--r--r-- 1 mts mts 1084 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18865 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8278 May 16 00:02 message.c
+-r--r--r-- 1 mts mts 17289 May 16 00:02 messageBackdoor.c
+-r--r--r-- 1 mts mts 4751 May 16 00:02 messageStub.c
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
+
+open-vm-tools-2008.05.15-93084/lib/message/shared:
total 24
--r--r--r-- 1 mts mts 1113 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 17847 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 1071 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 17797 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/misc:
+open-vm-tools-2008.05.15-93084/lib/misc:
total 436
--r--r--r-- 1 mts mts 1732 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 21104 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 2146 May 2 15:25 atomic.c
--r--r--r-- 1 mts mts 15371 May 2 15:25 base64.c
--r--r--r-- 1 mts mts 35741 May 2 15:25 codeset.c
--r--r--r-- 1 mts mts 54827 May 2 15:25 codesetOld.c
--r--r--r-- 1 mts mts 6339 May 2 15:25 codesetOld.h
--r--r--r-- 1 mts mts 8241 May 2 15:25 dbllnklst.c
--r--r--r-- 1 mts mts 6500 May 2 15:25 dynarray.c
--r--r--r-- 1 mts mts 9633 May 2 15:25 dynbuf.c
--r--r--r-- 1 mts mts 14569 May 2 15:25 escape.c
--r--r--r-- 1 mts mts 19809 May 2 15:25 hashTable.c
--r--r--r-- 1 mts mts 5943 May 2 15:25 hostinfo_misc.c
--r--r--r-- 1 mts mts 6141 May 2 15:25 hostname.c
--r--r--r-- 1 mts mts 22612 May 2 15:25 idLinux.c
--r--r--r-- 1 mts mts 24760 May 2 15:25 iovector.c
--r--r--r-- 1 mts mts 14910 May 2 15:25 machineID.c
--r--r--r-- 1 mts mts 2017 May 2 15:25 miscSolaris.c
--r--r--r-- 1 mts mts 1701 May 2 15:25 posixDlopen.c
--r--r--r-- 1 mts mts 48102 May 2 15:25 posixPosix.c
--r--r--r-- 1 mts mts 14322 May 2 15:25 posixWin32.c
--r--r--r-- 1 mts mts 5943 May 2 15:25 random.c
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
--r--r--r-- 1 mts mts 25871 May 2 15:25 timeutil.c
--r--r--r-- 1 mts mts 9675 May 2 15:25 util_misc.c
--r--r--r-- 1 mts mts 6627 May 2 15:25 vmstdio.c
-
-open-vm-tools-2008.05.02-90473/lib/misc/shared:
+-r--r--r-- 1 mts mts 1692 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 21068 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 2146 May 16 00:02 atomic.c
+-r--r--r-- 1 mts mts 15371 May 16 00:02 base64.c
+-r--r--r-- 1 mts mts 35741 May 16 00:02 codeset.c
+-r--r--r-- 1 mts mts 55190 May 16 00:02 codesetOld.c
+-r--r--r-- 1 mts mts 6339 May 16 00:02 codesetOld.h
+-r--r--r-- 1 mts mts 8241 May 16 00:02 dbllnklst.c
+-r--r--r-- 1 mts mts 6500 May 16 00:02 dynarray.c
+-r--r--r-- 1 mts mts 9633 May 16 00:02 dynbuf.c
+-r--r--r-- 1 mts mts 14569 May 16 00:02 escape.c
+-r--r--r-- 1 mts mts 19809 May 16 00:02 hashTable.c
+-r--r--r-- 1 mts mts 5943 May 16 00:02 hostinfo_misc.c
+-r--r--r-- 1 mts mts 6141 May 16 00:02 hostname.c
+-r--r--r-- 1 mts mts 22612 May 16 00:02 idLinux.c
+-r--r--r-- 1 mts mts 24760 May 16 00:02 iovector.c
+-r--r--r-- 1 mts mts 14910 May 16 00:02 machineID.c
+-r--r--r-- 1 mts mts 2017 May 16 00:02 miscSolaris.c
+-r--r--r-- 1 mts mts 1701 May 16 00:02 posixDlopen.c
+-r--r--r-- 1 mts mts 48102 May 16 00:02 posixPosix.c
+-r--r--r-- 1 mts mts 14322 May 16 00:02 posixWin32.c
+-r--r--r-- 1 mts mts 5943 May 16 00:02 random.c
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
+-r--r--r-- 1 mts mts 25871 May 16 00:02 timeutil.c
+-r--r--r-- 1 mts mts 12001 May 16 00:02 util_misc.c
+-r--r--r-- 1 mts mts 6627 May 16 00:02 vmstdio.c
+
+open-vm-tools-2008.05.15-93084/lib/misc/shared:
total 40
--r--r--r-- 1 mts mts 1714 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 33800 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 1674 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 33764 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/netUtil:
+open-vm-tools-2008.05.15-93084/lib/netUtil:
total 28
--r--r--r-- 1 mts mts 1022 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14693 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 7417 May 2 15:25 netUtilLinux.c
+-r--r--r-- 1 mts mts 980 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14643 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 7417 May 16 00:02 netUtilLinux.c
-open-vm-tools-2008.05.02-90473/lib/panic:
+open-vm-tools-2008.05.15-93084/lib/panic:
total 36
--r--r--r-- 1 mts mts 1009 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14630 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 12986 May 2 15:25 panic.c
+-r--r--r-- 1 mts mts 967 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14580 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 12986 May 16 00:02 panic.c
-open-vm-tools-2008.05.02-90473/lib/panicDefault:
+open-vm-tools-2008.05.15-93084/lib/panicDefault:
total 24
--r--r--r-- 1 mts mts 1030 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14777 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 1488 May 2 15:25 panic.c
+-r--r--r-- 1 mts mts 988 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14727 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 1488 May 16 00:02 panic.c
-open-vm-tools-2008.05.02-90473/lib/printer:
+open-vm-tools-2008.05.15-93084/lib/printer:
total 32
--r--r--r-- 1 mts mts 1017 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14678 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 9721 May 2 15:25 printer.c
+-r--r--r-- 1 mts mts 975 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14628 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 9721 May 16 00:02 printer.c
-open-vm-tools-2008.05.02-90473/lib/procMgr:
+open-vm-tools-2008.05.15-93084/lib/procMgr:
total 56
--r--r--r-- 1 mts mts 1057 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14715 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 36619 May 2 15:25 procMgrPosix.c
+-r--r--r-- 1 mts mts 1017 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14679 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 36619 May 16 00:02 procMgrPosix.c
-open-vm-tools-2008.05.02-90473/lib/rpcIn:
+open-vm-tools-2008.05.15-93084/lib/rpcIn:
total 40
--r--r--r-- 1 mts mts 1009 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14630 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 17356 May 2 15:25 rpcin.c
+-r--r--r-- 1 mts mts 967 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14580 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 17356 May 16 00:02 rpcin.c
-open-vm-tools-2008.05.02-90473/lib/rpcOut:
+open-vm-tools-2008.05.15-93084/lib/rpcOut:
total 40
--r--r--r-- 1 mts mts 1042 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 18654 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 11694 May 2 15:25 rpcout.c
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
+-r--r--r-- 1 mts mts 1000 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18604 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 11694 May 16 00:02 rpcout.c
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
-open-vm-tools-2008.05.02-90473/lib/rpcOut/shared:
+open-vm-tools-2008.05.15-93084/lib/rpcOut/shared:
total 20
--r--r--r-- 1 mts mts 1021 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15676 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 979 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15626 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/rpcVmx:
+open-vm-tools-2008.05.15-93084/lib/rpcVmx:
total 28
--r--r--r-- 1 mts mts 1013 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14654 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 7278 May 2 15:25 rpcvmx.c
+-r--r--r-- 1 mts mts 971 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14604 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 7278 May 16 00:02 rpcvmx.c
-open-vm-tools-2008.05.02-90473/lib/socketMgr:
+open-vm-tools-2008.05.15-93084/lib/socketMgr:
total 64
--r--r--r-- 1 mts mts 1025 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14726 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 41905 May 2 15:25 socketMgr.c
+-r--r--r-- 1 mts mts 983 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14676 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 41905 May 16 00:02 socketMgr.c
-open-vm-tools-2008.05.02-90473/lib/strUtil:
+open-vm-tools-2008.05.15-93084/lib/strUtil:
total 40
--r--r--r-- 1 mts mts 1017 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14678 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 16861 May 2 15:25 strutil.c
+-r--r--r-- 1 mts mts 975 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14628 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 16861 May 16 00:02 strutil.c
-open-vm-tools-2008.05.02-90473/lib/string:
+open-vm-tools-2008.05.15-93084/lib/string:
total 212
--r--r--r-- 1 mts mts 1230 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 19148 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8168 May 2 15:25 bsd_output_shared.c
--r--r--r-- 1 mts mts 50068 May 2 15:25 bsd_vsnprintf.c
--r--r--r-- 1 mts mts 51480 May 2 15:25 bsd_vsnwprintf.c
--r--r--r-- 1 mts mts 19245 May 2 15:25 convertutf.c
--r--r--r-- 1 mts mts 6119 May 2 15:25 convertutf.h
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
--r--r--r-- 1 mts mts 32823 May 2 15:25 str.c
-
-open-vm-tools-2008.05.02-90473/lib/string/shared:
+-r--r--r-- 1 mts mts 1190 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 19112 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8168 May 16 00:02 bsd_output_shared.c
+-r--r--r-- 1 mts mts 50068 May 16 00:02 bsd_vsnprintf.c
+-r--r--r-- 1 mts mts 51480 May 16 00:02 bsd_vsnwprintf.c
+-r--r--r-- 1 mts mts 19245 May 16 00:02 convertutf.c
+-r--r--r-- 1 mts mts 6119 May 16 00:02 convertutf.h
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
+-r--r--r-- 1 mts mts 32823 May 16 00:02 str.c
+
+open-vm-tools-2008.05.15-93084/lib/string/shared:
total 24
--r--r--r-- 1 mts mts 1225 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 19949 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 1185 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 19913 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/sync:
+open-vm-tools-2008.05.15-93084/lib/sync:
total 60
--r--r--r-- 1 mts mts 1077 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 18741 May 2 15:25 Makefile.in
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 shared
--r--r--r-- 1 mts mts 6533 May 2 15:25 syncMutex.c
--r--r--r-- 1 mts mts 21469 May 2 15:25 syncWaitQPosix.c
+-r--r--r-- 1 mts mts 1035 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18691 May 16 00:02 Makefile.in
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 shared
+-r--r--r-- 1 mts mts 6533 May 16 00:02 syncMutex.c
+-r--r--r-- 1 mts mts 21469 May 16 00:02 syncWaitQPosix.c
-open-vm-tools-2008.05.02-90473/lib/sync/shared:
+open-vm-tools-2008.05.15-93084/lib/sync/shared:
total 24
--r--r--r-- 1 mts mts 1060 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 16778 May 2 15:25 Makefile.in
+-r--r--r-- 1 mts mts 1018 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 16728 May 16 00:02 Makefile.in
-open-vm-tools-2008.05.02-90473/lib/syncDriver:
+open-vm-tools-2008.05.15-93084/lib/syncDriver:
total 32
--r--r--r-- 1 mts mts 1034 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14765 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 8740 May 2 15:25 syncDriverPosix.c
+-r--r--r-- 1 mts mts 992 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14715 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 8740 May 16 00:02 syncDriverPosix.c
-open-vm-tools-2008.05.02-90473/lib/system:
+open-vm-tools-2008.05.15-93084/lib/system:
total 32
--r--r--r-- 1 mts mts 995 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14669 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 9268 May 2 15:25 systemLinux.c
+-r--r--r-- 1 mts mts 953 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14619 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 9382 May 16 00:02 systemLinux.c
-open-vm-tools-2008.05.02-90473/lib/toolsLogger:
+open-vm-tools-2008.05.15-93084/lib/toolsLogger:
total 36
--r--r--r-- 1 mts mts 1028 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14759 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 15172 May 2 15:25 logger.c
+-r--r--r-- 1 mts mts 986 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14709 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 15172 May 16 00:02 logger.c
-open-vm-tools-2008.05.02-90473/lib/unicode:
+open-vm-tools-2008.05.15-93084/lib/unicode:
total 232
--r--r--r-- 1 mts mts 1358 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15952 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 11673 May 2 15:25 unicodeCommon.c
--r--r--r-- 1 mts mts 13870 May 2 15:25 unicodeICU.c
--r--r--r-- 1 mts mts 23227 May 2 15:25 unicodeSimpleBase.c
--r--r--r-- 1 mts mts 34559 May 2 15:25 unicodeSimpleCaseFolding.c
--r--r--r-- 1 mts mts 15794 May 2 15:25 unicodeSimpleOperations.c
--r--r--r-- 1 mts mts 18115 May 2 15:25 unicodeSimpleTransforms.c
--r--r--r-- 1 mts mts 74267 May 2 15:25 unicodeSimpleTypes.c
--r--r--r-- 1 mts mts 5087 May 2 15:25 unicodeStatic.c
-
-open-vm-tools-2008.05.02-90473/lib/unityStub:
+-r--r--r-- 1 mts mts 1315 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15902 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 11673 May 16 00:02 unicodeCommon.c
+-r--r--r-- 1 mts mts 13870 May 16 00:02 unicodeICU.c
+-r--r--r-- 1 mts mts 23227 May 16 00:02 unicodeSimpleBase.c
+-r--r--r-- 1 mts mts 34559 May 16 00:02 unicodeSimpleCaseFolding.c
+-r--r--r-- 1 mts mts 15794 May 16 00:02 unicodeSimpleOperations.c
+-r--r--r-- 1 mts mts 18115 May 16 00:02 unicodeSimpleTransforms.c
+-r--r--r-- 1 mts mts 74267 May 16 00:02 unicodeSimpleTypes.c
+-r--r--r-- 1 mts mts 5087 May 16 00:02 unicodeStatic.c
+
+open-vm-tools-2008.05.15-93084/lib/unityStub:
total 24
--r--r--r-- 1 mts mts 1056 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14744 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 1637 May 2 15:25 unityStub.c
+-r--r--r-- 1 mts mts 1016 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14708 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 1637 May 16 00:02 unityStub.c
-open-vm-tools-2008.05.02-90473/lib/user:
+open-vm-tools-2008.05.15-93084/lib/user:
total 132
--r--r--r-- 1 mts mts 1138 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14951 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 9683 May 2 15:25 hostinfo.c
--r--r--r-- 1 mts mts 38636 May 2 15:25 hostinfoPosix.c
--r--r--r-- 1 mts mts 39710 May 2 15:25 util.c
--r--r--r-- 1 mts mts 18792 May 2 15:25 utilPosix.c
-
-open-vm-tools-2008.05.02-90473/lib/vixTools:
+-r--r--r-- 1 mts mts 1098 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14915 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 9683 May 16 00:02 hostinfo.c
+-r--r--r-- 1 mts mts 38636 May 16 00:02 hostinfoPosix.c
+-r--r--r-- 1 mts mts 39710 May 16 00:02 util.c
+-r--r--r-- 1 mts mts 18792 May 16 00:02 utilPosix.c
+
+open-vm-tools-2008.05.15-93084/lib/vixTools:
total 136
--r--r--r-- 1 mts mts 1021 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14702 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 112022 May 2 15:25 vixTools.c
-
-open-vm-tools-2008.05.02-90473/lib/vmBackupLib:
-total 76
--r--r--r-- 1 mts mts 1118 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 15002 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 12390 May 2 15:25 scriptOps.c
--r--r--r-- 1 mts mts 20512 May 2 15:25 stateMachine.c
--r--r--r-- 1 mts mts 9036 May 2 15:25 syncDriverOps.c
--r--r--r-- 1 mts mts 1264 May 2 15:25 vmBackupInt.h
-
-open-vm-tools-2008.05.02-90473/lib/vmCheck:
+-r--r--r-- 1 mts mts 979 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14652 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 111884 May 16 00:02 vixTools.c
+
+open-vm-tools-2008.05.15-93084/lib/vmBackupLib:
+total 72
+-r--r--r-- 1 mts mts 1076 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14952 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 12762 May 16 00:02 scriptOps.c
+-r--r--r-- 1 mts mts 20320 May 16 00:02 stateMachine.c
+-r--r--r-- 1 mts mts 9036 May 16 00:02 syncDriverOps.c
+-r--r--r-- 1 mts mts 1264 May 16 00:02 vmBackupInt.h
+
+open-vm-tools-2008.05.15-93084/lib/vmCheck:
total 28
--r--r--r-- 1 mts mts 1017 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14678 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 5337 May 2 15:25 vmcheck.c
+-r--r--r-- 1 mts mts 975 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14628 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 5337 May 16 00:02 vmcheck.c
-open-vm-tools-2008.05.02-90473/lib/vmSignal:
+open-vm-tools-2008.05.15-93084/lib/vmSignal:
total 24
--r--r--r-- 1 mts mts 1021 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14702 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 3080 May 2 15:25 vmsignal.c
+-r--r--r-- 1 mts mts 979 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14652 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 3080 May 16 00:02 vmsignal.c
-open-vm-tools-2008.05.02-90473/lib/wiper:
+open-vm-tools-2008.05.15-93084/lib/wiper:
total 44
--r--r--r-- 1 mts mts 1014 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 14645 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 24462 May 2 15:25 wiperPosix.c
+-r--r--r-- 1 mts mts 972 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 14595 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 24462 May 16 00:02 wiperPosix.c
-open-vm-tools-2008.05.02-90473/libguestlib:
+open-vm-tools-2008.05.15-93084/libguestlib:
total 100
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 1799 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 17215 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 1413 May 2 15:25 stubs.c
--r--r--r-- 1 mts mts 26218 May 2 15:25 vmGuestLib.c
--r--r--r-- 1 mts mts 4228 May 2 15:25 vmGuestLibInt.h
--r--r--r-- 1 mts mts 2436 May 2 15:25 vmGuestLibPanic.c
--r--r--r-- 1 mts mts 1547 May 2 15:25 vmguestlib_version.h
-
-open-vm-tools-2008.05.02-90473/modules:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1757 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 17165 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 1413 May 16 00:02 stubs.c
+-r--r--r-- 1 mts mts 26218 May 16 00:02 vmGuestLib.c
+-r--r--r-- 1 mts mts 4228 May 16 00:02 vmGuestLibInt.h
+-r--r--r-- 1 mts mts 2436 May 16 00:02 vmGuestLibPanic.c
+-r--r--r-- 1 mts mts 1547 May 16 00:02 vmguestlib_version.h
+
+open-vm-tools-2008.05.15-93084/modules:
total 24
--rwxr-xr-x 1 mts mts 351 May 2 15:24 Makefile.am
--rw-r--r-- 1 mts mts 9847 May 2 15:25 Makefile.in
-drwxr-xr-x 6 mts mts 4096 May 2 15:24 freebsd
-drwxr-xr-x 7 mts mts 4096 May 2 15:24 linux
+-rwxr-xr-x 1 mts mts 351 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 9825 May 16 00:02 Makefile.in
+drwxr-xr-x 6 mts mts 4096 May 16 00:02 freebsd
+drwxr-xr-x 7 mts mts 4096 May 16 00:02 linux
-open-vm-tools-2008.05.02-90473/modules/freebsd:
+open-vm-tools-2008.05.15-93084/modules/freebsd:
total 16
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 vmblock
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 vmhgfs
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 vmmemctl
-drwxr-xr-x 3 mts mts 4096 May 2 15:24 vmxnet
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmblock
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmhgfs
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmmemctl
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 vmxnet
-open-vm-tools-2008.05.02-90473/modules/freebsd/vmblock:
+open-vm-tools-2008.05.15-93084/modules/freebsd/vmblock:
total 220
--r--r--r-- 1 mts mts 1430 May 2 15:24 COPYING.BSD
--r--r--r-- 1 mts mts 2151 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 17267 May 2 15:24 block.c
--r--r--r-- 1 mts mts 2375 May 2 15:24 block.h
--r--r--r-- 1 mts mts 9048 May 2 15:24 dbllnklst.c
--r--r--r-- 1 mts mts 3181 May 2 15:24 dbllnklst.h
--r--r--r-- 1 mts mts 0 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 5980 May 2 15:24 os.h
--r--r--r-- 1 mts mts 2141 May 2 15:24 stubs.c
--r--r--r-- 1 mts mts 1888 May 2 15:24 stubs.h
--r--r--r-- 1 mts mts 19458 May 2 15:24 subr.c
--r--r--r-- 1 mts mts 13036 May 2 15:24 vfsops.c
--r--r--r-- 1 mts mts 10783 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 13013 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 22572 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 5091 May 2 15:24 vmblock.h
--r--r--r-- 1 mts mts 5872 May 2 15:24 vmblock_k.h
--r--r--r-- 1 mts mts 2720 May 2 15:24 vmware.h
--r--r--r-- 1 mts mts 45731 May 2 15:24 vnops.c
-
-open-vm-tools-2008.05.02-90473/modules/freebsd/vmhgfs:
+-r--r--r-- 1 mts mts 1430 May 16 00:02 COPYING.BSD
+-r--r--r-- 1 mts mts 2151 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 17267 May 16 00:02 block.c
+-r--r--r-- 1 mts mts 2375 May 16 00:02 block.h
+-r--r--r-- 1 mts mts 9048 May 16 00:02 dbllnklst.c
+-r--r--r-- 1 mts mts 3181 May 16 00:02 dbllnklst.h
+-r--r--r-- 1 mts mts 0 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 5980 May 16 00:02 os.h
+-r--r--r-- 1 mts mts 2141 May 16 00:02 stubs.c
+-r--r--r-- 1 mts mts 1888 May 16 00:02 stubs.h
+-r--r--r-- 1 mts mts 19458 May 16 00:02 subr.c
+-r--r--r-- 1 mts mts 13036 May 16 00:02 vfsops.c
+-r--r--r-- 1 mts mts 10783 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 13439 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 22577 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 5163 May 16 00:02 vmblock.h
+-r--r--r-- 1 mts mts 5872 May 16 00:02 vmblock_k.h
+-r--r--r-- 1 mts mts 2720 May 16 00:02 vmware.h
+-r--r--r-- 1 mts mts 45731 May 16 00:02 vnops.c
+
+open-vm-tools-2008.05.15-93084/modules/freebsd/vmhgfs:
total 764
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 2652 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 6383 May 2 15:24 backdoor.c
--r--r--r-- 1 mts mts 1337 May 2 15:24 backdoor.h
--r--r--r-- 1 mts mts 6174 May 2 15:24 backdoorGcc32.c
--r--r--r-- 1 mts mts 5550 May 2 15:24 backdoorGcc64.c
--r--r--r-- 1 mts mts 1032 May 2 15:24 backdoorInt.h
--r--r--r-- 1 mts mts 5883 May 2 15:24 backdoor_def.h
--r--r--r-- 1 mts mts 3543 May 2 15:24 backdoor_types.h
--r--r--r-- 1 mts mts 12045 May 2 15:24 cpName.c
--r--r--r-- 1 mts mts 4174 May 2 15:24 cpName.h
--r--r--r-- 1 mts mts 1798 May 2 15:24 cpNameInt.h
--r--r--r-- 1 mts mts 5763 May 2 15:24 cpNameLinux.c
--r--r--r-- 1 mts mts 2642 May 2 15:24 cpNameLite.c
--r--r--r-- 1 mts mts 1710 May 2 15:24 cpNameLite.h
--r--r--r-- 1 mts mts 8217 May 2 15:24 dbllnklst.c
--r--r--r-- 1 mts mts 2350 May 2 15:24 dbllnklst.h
--r--r--r-- 1 mts mts 4769 May 2 15:24 debug.c
--r--r--r-- 1 mts mts 3358 May 2 15:24 debug.h
--r--r--r-- 1 mts mts 3832 May 2 15:24 escBitvector.h
--r--r--r-- 1 mts mts 25043 May 2 15:24 fsutil.c
--r--r--r-- 1 mts mts 3506 May 2 15:24 fsutil.h
--r--r--r-- 1 mts mts 2843 May 2 15:24 guest_msg_def.h
--r--r--r-- 1 mts mts 7008 May 2 15:24 hgfs.h
--r--r--r-- 1 mts mts 8689 May 2 15:24 hgfsBd.c
--r--r--r-- 1 mts mts 1450 May 2 15:24 hgfsBd.h
--r--r--r-- 1 mts mts 39263 May 2 15:24 hgfsProto.h
--r--r--r-- 1 mts mts 6822 May 2 15:24 hgfsUtil.c
--r--r--r-- 1 mts mts 4161 May 2 15:24 hgfsUtil.h
--r--r--r-- 1 mts mts 5685 May 2 15:24 hgfs_kernel.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 4774 May 2 15:24 kernelStubs.h
--r--r--r-- 1 mts mts 6043 May 2 15:24 kernelStubsBSD.c
--r--r--r-- 1 mts mts 8254 May 2 15:24 message.c
--r--r--r-- 1 mts mts 3529 May 2 15:24 message.h
--r--r--r-- 1 mts mts 17265 May 2 15:24 messageBackdoor.c
--r--r--r-- 1 mts mts 16112 May 2 15:24 os.c
--r--r--r-- 1 mts mts 4229 May 2 15:24 os.h
--r--r--r-- 1 mts mts 22550 May 2 15:24 request.c
--r--r--r-- 1 mts mts 3184 May 2 15:24 request.h
--r--r--r-- 1 mts mts 6298 May 2 15:24 requestInt.h
--r--r--r-- 1 mts mts 11670 May 2 15:24 rpcout.c
--r--r--r-- 1 mts mts 1963 May 2 15:24 rpcout.h
--r--r--r-- 1 mts mts 6515 May 2 15:24 sha1.c
--r--r--r-- 1 mts mts 2207 May 2 15:24 sha1.h
--r--r--r-- 1 mts mts 46819 May 2 15:24 state.c
--r--r--r-- 1 mts mts 6710 May 2 15:24 state.h
--r--r--r-- 1 mts mts 8823 May 2 15:24 staticEscape.c
--r--r--r-- 1 mts mts 2481 May 2 15:24 staticEscape.h
--r--r--r-- 1 mts mts 9540 May 2 15:24 vfsops.c
--r--r--r-- 1 mts mts 9952 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 17697 May 2 15:24 vm_basic_asm.h
--r--r--r-- 1 mts mts 16113 May 2 15:24 vm_basic_asm_x86.h
--r--r--r-- 1 mts mts 8903 May 2 15:24 vm_basic_asm_x86_64.h
--r--r--r-- 1 mts mts 12182 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 1889 May 2 15:24 vmware.h
--r--r--r-- 1 mts mts 1316 May 2 15:24 vmware_pack_begin.h
--r--r--r-- 1 mts mts 1336 May 2 15:24 vmware_pack_end.h
--r--r--r-- 1 mts mts 1956 May 2 15:24 vmware_pack_init.h
--r--r--r-- 1 mts mts 23185 May 2 15:24 vnops.c
--r--r--r-- 1 mts mts 77726 May 2 15:24 vnopscommon.c
--r--r--r-- 1 mts mts 3216 May 2 15:24 vnopscommon.h
--r--r--r-- 1 mts mts 6265 May 2 15:24 worker.c
--r--r--r-- 1 mts mts 37595 May 2 15:24 x86cpuid.h
-
-open-vm-tools-2008.05.02-90473/modules/freebsd/vmmemctl:
-total 180
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 1259 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 430 May 2 15:24 README
--r--r--r-- 1 mts mts 1337 May 2 15:24 backdoor.h
--r--r--r-- 1 mts mts 6174 May 2 15:24 backdoorGcc32.c
--r--r--r-- 1 mts mts 5550 May 2 15:24 backdoorGcc64.c
--r--r--r-- 1 mts mts 1032 May 2 15:24 backdoorInt.h
--r--r--r-- 1 mts mts 1338 May 2 15:24 backdoor_balloon.h
--r--r--r-- 1 mts mts 3543 May 2 15:24 backdoor_types.h
--r--r--r-- 1 mts mts 2622 May 2 15:24 balloon_def.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 10240 May 2 15:24 os.c
--r--r--r-- 1 mts mts 2441 May 2 15:24 os.h
--r--r--r-- 1 mts mts 9952 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 12182 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 37545 May 2 15:24 vmballoon.c
--r--r--r-- 1 mts mts 2048 May 2 15:24 vmballoon.h
-
-open-vm-tools-2008.05.02-90473/modules/freebsd/vmxnet:
-total 140
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 1222 May 2 15:24 Makefile
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
--r--r--r-- 1 mts mts 35544 May 2 15:24 if_vxn.c
--r--r--r-- 1 mts mts 0 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 2426 May 2 15:24 net.h
--r--r--r-- 1 mts mts 6515 May 2 15:24 net_compat.h
--r--r--r-- 1 mts mts 2240 May 2 15:24 net_sg.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 7137 May 2 15:24 vm_device_version.h
--r--r--r-- 1 mts mts 2915 May 2 15:24 vmnet_def.h
--r--r--r-- 1 mts mts 14595 May 2 15:24 vmxnet2_def.h
--r--r--r-- 1 mts mts 6793 May 2 15:24 vmxnet_def.h
-
-open-vm-tools-2008.05.02-90473/modules/freebsd/vmxnet/autoconf:
-total 0
-
-open-vm-tools-2008.05.02-90473/modules/linux:
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 2652 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 6383 May 16 00:02 backdoor.c
+-r--r--r-- 1 mts mts 1337 May 16 00:02 backdoor.h
+-r--r--r-- 1 mts mts 6174 May 16 00:02 backdoorGcc32.c
+-r--r--r-- 1 mts mts 5550 May 16 00:02 backdoorGcc64.c
+-r--r--r-- 1 mts mts 1032 May 16 00:02 backdoorInt.h
+-r--r--r-- 1 mts mts 5883 May 16 00:02 backdoor_def.h
+-r--r--r-- 1 mts mts 3543 May 16 00:02 backdoor_types.h
+-r--r--r-- 1 mts mts 12045 May 16 00:02 cpName.c
+-r--r--r-- 1 mts mts 4174 May 16 00:02 cpName.h
+-r--r--r-- 1 mts mts 1798 May 16 00:02 cpNameInt.h
+-r--r--r-- 1 mts mts 5763 May 16 00:02 cpNameLinux.c
+-r--r--r-- 1 mts mts 2642 May 16 00:02 cpNameLite.c
+-r--r--r-- 1 mts mts 1710 May 16 00:02 cpNameLite.h
+-r--r--r-- 1 mts mts 8217 May 16 00:02 dbllnklst.c
+-r--r--r-- 1 mts mts 2350 May 16 00:02 dbllnklst.h
+-r--r--r-- 1 mts mts 4769 May 16 00:02 debug.c
+-r--r--r-- 1 mts mts 3358 May 16 00:02 debug.h
+-r--r--r-- 1 mts mts 3832 May 16 00:02 escBitvector.h
+-r--r--r-- 1 mts mts 25043 May 16 00:02 fsutil.c
+-r--r--r-- 1 mts mts 3506 May 16 00:02 fsutil.h
+-r--r--r-- 1 mts mts 3006 May 16 00:02 guest_msg_def.h
+-r--r--r-- 1 mts mts 7008 May 16 00:02 hgfs.h
+-r--r--r-- 1 mts mts 8689 May 16 00:02 hgfsBd.c
+-r--r--r-- 1 mts mts 1450 May 16 00:02 hgfsBd.h
+-r--r--r-- 1 mts mts 39688 May 16 00:02 hgfsProto.h
+-r--r--r-- 1 mts mts 6822 May 16 00:02 hgfsUtil.c
+-r--r--r-- 1 mts mts 3737 May 16 00:02 hgfsUtil.h
+-r--r--r-- 1 mts mts 5685 May 16 00:02 hgfs_kernel.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 4774 May 16 00:02 kernelStubs.h
+-r--r--r-- 1 mts mts 6043 May 16 00:02 kernelStubsBSD.c
+-r--r--r-- 1 mts mts 8254 May 16 00:02 message.c
+-r--r--r-- 1 mts mts 3529 May 16 00:02 message.h
+-r--r--r-- 1 mts mts 17265 May 16 00:02 messageBackdoor.c
+-r--r--r-- 1 mts mts 16112 May 16 00:02 os.c
+-r--r--r-- 1 mts mts 4229 May 16 00:02 os.h
+-r--r--r-- 1 mts mts 22550 May 16 00:02 request.c
+-r--r--r-- 1 mts mts 3184 May 16 00:02 request.h
+-r--r--r-- 1 mts mts 6298 May 16 00:02 requestInt.h
+-r--r--r-- 1 mts mts 11670 May 16 00:02 rpcout.c
+-r--r--r-- 1 mts mts 1963 May 16 00:02 rpcout.h
+-r--r--r-- 1 mts mts 6515 May 16 00:02 sha1.c
+-r--r--r-- 1 mts mts 2207 May 16 00:02 sha1.h
+-r--r--r-- 1 mts mts 46819 May 16 00:02 state.c
+-r--r--r-- 1 mts mts 6710 May 16 00:02 state.h
+-r--r--r-- 1 mts mts 8823 May 16 00:02 staticEscape.c
+-r--r--r-- 1 mts mts 2481 May 16 00:02 staticEscape.h
+-r--r--r-- 1 mts mts 9540 May 16 00:02 vfsops.c
+-r--r--r-- 1 mts mts 9952 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 17697 May 16 00:02 vm_basic_asm.h
+-r--r--r-- 1 mts mts 16113 May 16 00:02 vm_basic_asm_x86.h
+-r--r--r-- 1 mts mts 8944 May 16 00:02 vm_basic_asm_x86_64.h
+-r--r--r-- 1 mts mts 12608 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 1889 May 16 00:02 vmware.h
+-r--r--r-- 1 mts mts 1316 May 16 00:02 vmware_pack_begin.h
+-r--r--r-- 1 mts mts 1336 May 16 00:02 vmware_pack_end.h
+-r--r--r-- 1 mts mts 1956 May 16 00:02 vmware_pack_init.h
+-r--r--r-- 1 mts mts 23185 May 16 00:02 vnops.c
+-r--r--r-- 1 mts mts 77726 May 16 00:02 vnopscommon.c
+-r--r--r-- 1 mts mts 3216 May 16 00:02 vnopscommon.h
+-r--r--r-- 1 mts mts 6265 May 16 00:02 worker.c
+-r--r--r-- 1 mts mts 38003 May 16 00:02 x86cpuid.h
+
+open-vm-tools-2008.05.15-93084/modules/freebsd/vmmemctl:
+total 184
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1259 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 430 May 16 00:02 README
+-r--r--r-- 1 mts mts 1337 May 16 00:02 backdoor.h
+-r--r--r-- 1 mts mts 6174 May 16 00:02 backdoorGcc32.c
+-r--r--r-- 1 mts mts 5550 May 16 00:02 backdoorGcc64.c
+-r--r--r-- 1 mts mts 1032 May 16 00:02 backdoorInt.h
+-r--r--r-- 1 mts mts 1338 May 16 00:02 backdoor_balloon.h
+-r--r--r-- 1 mts mts 3543 May 16 00:02 backdoor_types.h
+-r--r--r-- 1 mts mts 2622 May 16 00:02 balloon_def.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 10240 May 16 00:02 os.c
+-r--r--r-- 1 mts mts 2441 May 16 00:02 os.h
+-r--r--r-- 1 mts mts 9952 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 12608 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 37545 May 16 00:02 vmballoon.c
+-r--r--r-- 1 mts mts 2048 May 16 00:02 vmballoon.h
+
+open-vm-tools-2008.05.15-93084/modules/freebsd/vmxnet:
+total 136
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1222 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 35544 May 16 00:02 if_vxn.c
+-r--r--r-- 1 mts mts 0 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 2426 May 16 00:02 net.h
+-r--r--r-- 1 mts mts 6515 May 16 00:02 net_compat.h
+-r--r--r-- 1 mts mts 2240 May 16 00:02 net_sg.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 7197 May 16 00:02 vm_device_version.h
+-r--r--r-- 1 mts mts 3180 May 16 00:02 vmnet_def.h
+-r--r--r-- 1 mts mts 14595 May 16 00:02 vmxnet2_def.h
+-r--r--r-- 1 mts mts 6793 May 16 00:02 vmxnet_def.h
+
+open-vm-tools-2008.05.15-93084/modules/linux:
total 20
-drwxr-xr-x 5 mts mts 4096 May 2 15:24 vmblock
-drwxr-xr-x 3 mts mts 4096 May 2 15:24 vmhgfs
-drwxr-xr-x 3 mts mts 4096 May 2 15:24 vmmemctl
-drwxr-xr-x 3 mts mts 4096 May 2 15:24 vmsync
-drwxr-xr-x 3 mts mts 4096 May 2 15:24 vmxnet
+drwxr-xr-x 5 mts mts 4096 May 16 00:02 vmblock
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 vmhgfs
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 vmmemctl
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 vmsync
+drwxr-xr-x 3 mts mts 4096 May 16 00:02 vmxnet
-open-vm-tools-2008.05.02-90473/modules/linux/vmblock:
+open-vm-tools-2008.05.15-93084/modules/linux/vmblock:
total 52
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 3761 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 2009 May 2 15:24 Makefile.kernel
--r--r--r-- 1 mts mts 4136 May 2 15:24 Makefile.normal
--r--r--r-- 1 mts mts 481 May 2 15:24 README
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 include
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 linux
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmblock/autoconf:
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3761 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 2009 May 16 00:02 Makefile.kernel
+-r--r--r-- 1 mts mts 4136 May 16 00:02 Makefile.normal
+-r--r--r-- 1 mts mts 481 May 16 00:02 README
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autoconf
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 include
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 linux
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmblock/autoconf:
total 36
--r--r--r-- 1 mts mts 1670 May 2 15:24 cachecreate.c
--r--r--r-- 1 mts mts 1718 May 2 15:24 cachector.c
--r--r--r-- 1 mts mts 1261 May 2 15:24 epoll.c
--r--r--r-- 1 mts mts 1710 May 2 15:24 filldir1.c
--r--r--r-- 1 mts mts 1204 May 2 15:24 geninclude.c
--r--r--r-- 1 mts mts 1596 May 2 15:24 getsb1.c
--r--r--r-- 1 mts mts 1139 May 2 15:24 setnice.c
--r--r--r-- 1 mts mts 1259 May 2 15:24 skas1.c
--r--r--r-- 1 mts mts 1463 May 2 15:24 statfs1.c
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmblock/include:
-total 168
--r--r--r-- 1 mts mts 6088 May 2 15:24 compat_completion.h
--r--r--r-- 1 mts mts 1875 May 2 15:24 compat_file.h
--r--r--r-- 1 mts mts 9850 May 2 15:24 compat_fs.h
--r--r--r-- 1 mts mts 1261 May 2 15:24 compat_init.h
--r--r--r-- 1 mts mts 2659 May 2 15:24 compat_kernel.h
--r--r--r-- 1 mts mts 1917 May 2 15:24 compat_list.h
--r--r--r-- 1 mts mts 4231 May 2 15:24 compat_mm.h
--r--r--r-- 1 mts mts 2298 May 2 15:24 compat_module.h
--r--r--r-- 1 mts mts 2118 May 2 15:24 compat_namei.h
--r--r--r-- 1 mts mts 2483 May 2 15:24 compat_page.h
--r--r--r-- 1 mts mts 9843 May 2 15:24 compat_sched.h
--r--r--r-- 1 mts mts 1456 May 2 15:24 compat_semaphore.h
--r--r--r-- 1 mts mts 2764 May 2 15:24 compat_slab.h
--r--r--r-- 1 mts mts 2438 May 2 15:24 compat_spinlock.h
--r--r--r-- 1 mts mts 1222 May 2 15:24 compat_statfs.h
--r--r--r-- 1 mts mts 1907 May 2 15:24 compat_string.h
--r--r--r-- 1 mts mts 3122 May 2 15:24 compat_uaccess.h
--r--r--r-- 1 mts mts 3189 May 2 15:24 compat_version.h
--r--r--r-- 1 mts mts 6854 May 2 15:24 compat_wait.h
--r--r--r-- 1 mts mts 2216 May 2 15:24 driver-config.h
--r--r--r-- 1 mts mts 0 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 9952 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 12182 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 4260 May 2 15:24 vmblock.h
--r--r--r-- 1 mts mts 1889 May 2 15:24 vmware.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmblock/linux:
+-r--r--r-- 1 mts mts 1670 May 16 00:02 cachecreate.c
+-r--r--r-- 1 mts mts 1718 May 16 00:02 cachector.c
+-r--r--r-- 1 mts mts 1261 May 16 00:02 epoll.c
+-r--r--r-- 1 mts mts 1710 May 16 00:02 filldir1.c
+-r--r--r-- 1 mts mts 1204 May 16 00:02 geninclude.c
+-r--r--r-- 1 mts mts 1596 May 16 00:02 getsb1.c
+-r--r--r-- 1 mts mts 1139 May 16 00:02 setnice.c
+-r--r--r-- 1 mts mts 1259 May 16 00:02 skas1.c
+-r--r--r-- 1 mts mts 1463 May 16 00:02 statfs1.c
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmblock/include:
+total 172
+-r--r--r-- 1 mts mts 6088 May 16 00:02 compat_completion.h
+-r--r--r-- 1 mts mts 1875 May 16 00:02 compat_file.h
+-r--r--r-- 1 mts mts 9850 May 16 00:02 compat_fs.h
+-r--r--r-- 1 mts mts 1261 May 16 00:02 compat_init.h
+-r--r--r-- 1 mts mts 2659 May 16 00:02 compat_kernel.h
+-r--r--r-- 1 mts mts 1917 May 16 00:02 compat_list.h
+-r--r--r-- 1 mts mts 4231 May 16 00:02 compat_mm.h
+-r--r--r-- 1 mts mts 2298 May 16 00:02 compat_module.h
+-r--r--r-- 1 mts mts 2118 May 16 00:02 compat_namei.h
+-r--r--r-- 1 mts mts 2483 May 16 00:02 compat_page.h
+-r--r--r-- 1 mts mts 9843 May 16 00:02 compat_sched.h
+-r--r--r-- 1 mts mts 1456 May 16 00:02 compat_semaphore.h
+-r--r--r-- 1 mts mts 2764 May 16 00:02 compat_slab.h
+-r--r--r-- 1 mts mts 2438 May 16 00:02 compat_spinlock.h
+-r--r--r-- 1 mts mts 1222 May 16 00:02 compat_statfs.h
+-r--r--r-- 1 mts mts 1907 May 16 00:02 compat_string.h
+-r--r--r-- 1 mts mts 3122 May 16 00:02 compat_uaccess.h
+-r--r--r-- 1 mts mts 3189 May 16 00:02 compat_version.h
+-r--r--r-- 1 mts mts 6854 May 16 00:02 compat_wait.h
+-r--r--r-- 1 mts mts 2216 May 16 00:02 driver-config.h
+-r--r--r-- 1 mts mts 0 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 9952 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 12608 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 4332 May 16 00:02 vmblock.h
+-r--r--r-- 1 mts mts 1889 May 16 00:02 vmware.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmblock/linux:
total 140
--r--r--r-- 1 mts mts 16436 May 2 15:24 block.c
--r--r--r-- 1 mts mts 1544 May 2 15:24 block.h
--r--r--r-- 1 mts mts 8894 May 2 15:24 control.c
--r--r--r-- 1 mts mts 8217 May 2 15:24 dbllnklst.c
--r--r--r-- 1 mts mts 2350 May 2 15:24 dbllnklst.h
--r--r--r-- 1 mts mts 3749 May 2 15:24 dentry.c
--r--r--r-- 1 mts mts 8089 May 2 15:24 file.c
--r--r--r-- 1 mts mts 20088 May 2 15:24 filesystem.c
--r--r--r-- 1 mts mts 4856 May 2 15:24 filesystem.h
--r--r--r-- 1 mts mts 6794 May 2 15:24 inode.c
--r--r--r-- 1 mts mts 4286 May 2 15:24 module.c
--r--r--r-- 1 mts mts 4292 May 2 15:24 os.h
--r--r--r-- 1 mts mts 1310 May 2 15:24 stubs.c
--r--r--r-- 1 mts mts 1057 May 2 15:24 stubs.h
--r--r--r-- 1 mts mts 5026 May 2 15:24 super.c
--r--r--r-- 1 mts mts 3399 May 2 15:24 vmblockInt.h
--r--r--r-- 1 mts mts 1176 May 2 15:24 vmblock_version.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmhgfs:
+-r--r--r-- 1 mts mts 16436 May 16 00:02 block.c
+-r--r--r-- 1 mts mts 1544 May 16 00:02 block.h
+-r--r--r-- 1 mts mts 8732 May 16 00:02 control.c
+-r--r--r-- 1 mts mts 8217 May 16 00:02 dbllnklst.c
+-r--r--r-- 1 mts mts 2350 May 16 00:02 dbllnklst.h
+-r--r--r-- 1 mts mts 3749 May 16 00:02 dentry.c
+-r--r--r-- 1 mts mts 8089 May 16 00:02 file.c
+-r--r--r-- 1 mts mts 20088 May 16 00:02 filesystem.c
+-r--r--r-- 1 mts mts 4856 May 16 00:02 filesystem.h
+-r--r--r-- 1 mts mts 6794 May 16 00:02 inode.c
+-r--r--r-- 1 mts mts 4286 May 16 00:02 module.c
+-r--r--r-- 1 mts mts 4292 May 16 00:02 os.h
+-r--r--r-- 1 mts mts 1310 May 16 00:02 stubs.c
+-r--r--r-- 1 mts mts 1057 May 16 00:02 stubs.h
+-r--r--r-- 1 mts mts 5026 May 16 00:02 super.c
+-r--r--r-- 1 mts mts 3351 May 16 00:02 vmblockInt.h
+-r--r--r-- 1 mts mts 1176 May 16 00:02 vmblock_version.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmhgfs:
total 920
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 3760 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 2291 May 2 15:24 Makefile.kernel
--r--r--r-- 1 mts mts 3429 May 2 15:24 Makefile.normal
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
--r--r--r-- 1 mts mts 6383 May 2 15:24 backdoor.c
--r--r--r-- 1 mts mts 1337 May 2 15:24 backdoor.h
--r--r--r-- 1 mts mts 6174 May 2 15:24 backdoorGcc32.c
--r--r--r-- 1 mts mts 5550 May 2 15:24 backdoorGcc64.c
--r--r--r-- 1 mts mts 1032 May 2 15:24 backdoorInt.h
--r--r--r-- 1 mts mts 5883 May 2 15:24 backdoor_def.h
--r--r--r-- 1 mts mts 3543 May 2 15:24 backdoor_types.h
--r--r--r-- 1 mts mts 8759 May 2 15:24 bdhandler.c
--r--r--r-- 1 mts mts 1167 May 2 15:24 bdhandler.h
--r--r--r-- 1 mts mts 6088 May 2 15:24 compat_completion.h
--r--r--r-- 1 mts mts 2052 May 2 15:24 compat_dcache.h
--r--r--r-- 1 mts mts 1875 May 2 15:24 compat_file.h
--r--r--r-- 1 mts mts 9850 May 2 15:24 compat_fs.h
--r--r--r-- 1 mts mts 1391 May 2 15:24 compat_highmem.h
--r--r--r-- 1 mts mts 2659 May 2 15:24 compat_kernel.h
--r--r--r-- 1 mts mts 8066 May 2 15:24 compat_kthread.h
--r--r--r-- 1 mts mts 1917 May 2 15:24 compat_list.h
--r--r--r-- 1 mts mts 4231 May 2 15:24 compat_mm.h
--r--r--r-- 1 mts mts 2298 May 2 15:24 compat_module.h
--r--r--r-- 1 mts mts 2118 May 2 15:24 compat_namei.h
--r--r--r-- 1 mts mts 2591 May 2 15:24 compat_page-flags.h
--r--r--r-- 1 mts mts 2483 May 2 15:24 compat_page.h
--r--r--r-- 1 mts mts 9843 May 2 15:24 compat_sched.h
--r--r--r-- 1 mts mts 1456 May 2 15:24 compat_semaphore.h
--r--r--r-- 1 mts mts 2764 May 2 15:24 compat_slab.h
--r--r--r-- 1 mts mts 2438 May 2 15:24 compat_spinlock.h
--r--r--r-- 1 mts mts 1222 May 2 15:24 compat_statfs.h
--r--r--r-- 1 mts mts 1907 May 2 15:24 compat_string.h
--r--r--r-- 1 mts mts 3122 May 2 15:24 compat_uaccess.h
--r--r--r-- 1 mts mts 3189 May 2 15:24 compat_version.h
--r--r--r-- 1 mts mts 6854 May 2 15:24 compat_wait.h
--r--r--r-- 1 mts mts 12045 May 2 15:24 cpName.c
--r--r--r-- 1 mts mts 4174 May 2 15:24 cpName.h
--r--r--r-- 1 mts mts 1798 May 2 15:24 cpNameInt.h
--r--r--r-- 1 mts mts 5763 May 2 15:24 cpNameLinux.c
--r--r--r-- 1 mts mts 2642 May 2 15:24 cpNameLite.c
--r--r--r-- 1 mts mts 1710 May 2 15:24 cpNameLite.h
--r--r--r-- 1 mts mts 2350 May 2 15:24 dbllnklst.h
--r--r--r-- 1 mts mts 3112 May 2 15:24 dentry.c
--r--r--r-- 1 mts mts 27897 May 2 15:24 dir.c
--r--r--r-- 1 mts mts 2216 May 2 15:24 driver-config.h
--r--r--r-- 1 mts mts 3832 May 2 15:24 escBitvector.h
--r--r--r-- 1 mts mts 36841 May 2 15:24 file.c
--r--r--r-- 1 mts mts 20296 May 2 15:24 filesystem.c
--r--r--r-- 1 mts mts 1233 May 2 15:24 filesystem.h
--r--r--r-- 1 mts mts 57268 May 2 15:24 fsutil.c
--r--r--r-- 1 mts mts 3981 May 2 15:24 fsutil.h
--r--r--r-- 1 mts mts 2843 May 2 15:24 guest_msg_def.h
--r--r--r-- 1 mts mts 7008 May 2 15:24 hgfs.h
--r--r--r-- 1 mts mts 8689 May 2 15:24 hgfsBd.c
--r--r--r-- 1 mts mts 1450 May 2 15:24 hgfsBd.h
--r--r--r-- 1 mts mts 2535 May 2 15:24 hgfsDevLinux.h
--r--r--r-- 1 mts mts 39263 May 2 15:24 hgfsProto.h
--r--r--r-- 1 mts mts 6822 May 2 15:24 hgfsUtil.c
--r--r--r-- 1 mts mts 4161 May 2 15:24 hgfsUtil.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 64072 May 2 15:24 inode.c
--r--r--r-- 1 mts mts 1318 May 2 15:24 inode.h
--r--r--r-- 1 mts mts 4774 May 2 15:24 kernelStubs.h
--r--r--r-- 1 mts mts 9629 May 2 15:24 kernelStubsLinux.c
--r--r--r-- 1 mts mts 5304 May 2 15:24 link.c
--r--r--r-- 1 mts mts 8254 May 2 15:24 message.c
--r--r--r-- 1 mts mts 3529 May 2 15:24 message.h
--r--r--r-- 1 mts mts 17265 May 2 15:24 messageBackdoor.c
--r--r--r-- 1 mts mts 2677 May 2 15:24 module.c
--r--r--r-- 1 mts mts 8784 May 2 15:24 module.h
--r--r--r-- 1 mts mts 27195 May 2 15:24 page.c
--r--r--r-- 1 mts mts 7040 May 2 15:24 request.c
--r--r--r-- 1 mts mts 3959 May 2 15:24 request.h
--r--r--r-- 1 mts mts 11670 May 2 15:24 rpcout.c
--r--r--r-- 1 mts mts 1963 May 2 15:24 rpcout.h
--r--r--r-- 1 mts mts 8823 May 2 15:24 staticEscape.c
--r--r--r-- 1 mts mts 2481 May 2 15:24 staticEscape.h
--r--r--r-- 1 mts mts 1985 May 2 15:24 stubs.c
--r--r--r-- 1 mts mts 12791 May 2 15:24 super.c
--r--r--r-- 1 mts mts 9952 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 17697 May 2 15:24 vm_basic_asm.h
--r--r--r-- 1 mts mts 16113 May 2 15:24 vm_basic_asm_x86.h
--r--r--r-- 1 mts mts 8903 May 2 15:24 vm_basic_asm_x86_64.h
--r--r--r-- 1 mts mts 12182 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 1168 May 2 15:24 vmhgfs_version.h
--r--r--r-- 1 mts mts 1889 May 2 15:24 vmware.h
--r--r--r-- 1 mts mts 1316 May 2 15:24 vmware_pack_begin.h
--r--r--r-- 1 mts mts 1336 May 2 15:24 vmware_pack_end.h
--r--r--r-- 1 mts mts 1956 May 2 15:24 vmware_pack_init.h
--r--r--r-- 1 mts mts 37595 May 2 15:24 x86cpuid.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmhgfs/autoconf:
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3760 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 2291 May 16 00:02 Makefile.kernel
+-r--r--r-- 1 mts mts 3429 May 16 00:02 Makefile.normal
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autoconf
+-r--r--r-- 1 mts mts 6383 May 16 00:02 backdoor.c
+-r--r--r-- 1 mts mts 1337 May 16 00:02 backdoor.h
+-r--r--r-- 1 mts mts 6174 May 16 00:02 backdoorGcc32.c
+-r--r--r-- 1 mts mts 5550 May 16 00:02 backdoorGcc64.c
+-r--r--r-- 1 mts mts 1032 May 16 00:02 backdoorInt.h
+-r--r--r-- 1 mts mts 5883 May 16 00:02 backdoor_def.h
+-r--r--r-- 1 mts mts 3543 May 16 00:02 backdoor_types.h
+-r--r--r-- 1 mts mts 8725 May 16 00:02 bdhandler.c
+-r--r--r-- 1 mts mts 1167 May 16 00:02 bdhandler.h
+-r--r--r-- 1 mts mts 6088 May 16 00:02 compat_completion.h
+-r--r--r-- 1 mts mts 2052 May 16 00:02 compat_dcache.h
+-r--r--r-- 1 mts mts 1875 May 16 00:02 compat_file.h
+-r--r--r-- 1 mts mts 9850 May 16 00:02 compat_fs.h
+-r--r--r-- 1 mts mts 1391 May 16 00:02 compat_highmem.h
+-r--r--r-- 1 mts mts 2659 May 16 00:02 compat_kernel.h
+-r--r--r-- 1 mts mts 8066 May 16 00:02 compat_kthread.h
+-r--r--r-- 1 mts mts 1917 May 16 00:02 compat_list.h
+-r--r--r-- 1 mts mts 4231 May 16 00:02 compat_mm.h
+-r--r--r-- 1 mts mts 2298 May 16 00:02 compat_module.h
+-r--r--r-- 1 mts mts 2118 May 16 00:02 compat_namei.h
+-r--r--r-- 1 mts mts 2591 May 16 00:02 compat_page-flags.h
+-r--r--r-- 1 mts mts 2483 May 16 00:02 compat_page.h
+-r--r--r-- 1 mts mts 9843 May 16 00:02 compat_sched.h
+-r--r--r-- 1 mts mts 1456 May 16 00:02 compat_semaphore.h
+-r--r--r-- 1 mts mts 2764 May 16 00:02 compat_slab.h
+-r--r--r-- 1 mts mts 2438 May 16 00:02 compat_spinlock.h
+-r--r--r-- 1 mts mts 1222 May 16 00:02 compat_statfs.h
+-r--r--r-- 1 mts mts 1907 May 16 00:02 compat_string.h
+-r--r--r-- 1 mts mts 3122 May 16 00:02 compat_uaccess.h
+-r--r--r-- 1 mts mts 3189 May 16 00:02 compat_version.h
+-r--r--r-- 1 mts mts 6854 May 16 00:02 compat_wait.h
+-r--r--r-- 1 mts mts 12045 May 16 00:02 cpName.c
+-r--r--r-- 1 mts mts 4174 May 16 00:02 cpName.h
+-r--r--r-- 1 mts mts 1798 May 16 00:02 cpNameInt.h
+-r--r--r-- 1 mts mts 5763 May 16 00:02 cpNameLinux.c
+-r--r--r-- 1 mts mts 2642 May 16 00:02 cpNameLite.c
+-r--r--r-- 1 mts mts 1710 May 16 00:02 cpNameLite.h
+-r--r--r-- 1 mts mts 2350 May 16 00:02 dbllnklst.h
+-r--r--r-- 1 mts mts 3112 May 16 00:02 dentry.c
+-r--r--r-- 1 mts mts 27803 May 16 00:02 dir.c
+-r--r--r-- 1 mts mts 2216 May 16 00:02 driver-config.h
+-r--r--r-- 1 mts mts 3832 May 16 00:02 escBitvector.h
+-r--r--r-- 1 mts mts 36805 May 16 00:02 file.c
+-r--r--r-- 1 mts mts 20296 May 16 00:02 filesystem.c
+-r--r--r-- 1 mts mts 1232 May 16 00:02 filesystem.h
+-r--r--r-- 1 mts mts 57268 May 16 00:02 fsutil.c
+-r--r--r-- 1 mts mts 3980 May 16 00:02 fsutil.h
+-r--r--r-- 1 mts mts 3006 May 16 00:02 guest_msg_def.h
+-r--r--r-- 1 mts mts 7008 May 16 00:02 hgfs.h
+-r--r--r-- 1 mts mts 8689 May 16 00:02 hgfsBd.c
+-r--r--r-- 1 mts mts 1450 May 16 00:02 hgfsBd.h
+-r--r--r-- 1 mts mts 2535 May 16 00:02 hgfsDevLinux.h
+-r--r--r-- 1 mts mts 39688 May 16 00:02 hgfsProto.h
+-r--r--r-- 1 mts mts 6822 May 16 00:02 hgfsUtil.c
+-r--r--r-- 1 mts mts 3737 May 16 00:02 hgfsUtil.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 63943 May 16 00:02 inode.c
+-r--r--r-- 1 mts mts 1318 May 16 00:02 inode.h
+-r--r--r-- 1 mts mts 4774 May 16 00:02 kernelStubs.h
+-r--r--r-- 1 mts mts 9629 May 16 00:02 kernelStubsLinux.c
+-r--r--r-- 1 mts mts 5268 May 16 00:02 link.c
+-r--r--r-- 1 mts mts 8254 May 16 00:02 message.c
+-r--r--r-- 1 mts mts 3529 May 16 00:02 message.h
+-r--r--r-- 1 mts mts 17265 May 16 00:02 messageBackdoor.c
+-r--r--r-- 1 mts mts 2677 May 16 00:02 module.c
+-r--r--r-- 1 mts mts 8774 May 16 00:02 module.h
+-r--r--r-- 1 mts mts 27061 May 16 00:02 page.c
+-r--r--r-- 1 mts mts 7026 May 16 00:02 request.c
+-r--r--r-- 1 mts mts 3951 May 16 00:02 request.h
+-r--r--r-- 1 mts mts 11670 May 16 00:02 rpcout.c
+-r--r--r-- 1 mts mts 1963 May 16 00:02 rpcout.h
+-r--r--r-- 1 mts mts 8823 May 16 00:02 staticEscape.c
+-r--r--r-- 1 mts mts 2481 May 16 00:02 staticEscape.h
+-r--r--r-- 1 mts mts 1985 May 16 00:02 stubs.c
+-r--r--r-- 1 mts mts 12791 May 16 00:02 super.c
+-r--r--r-- 1 mts mts 9952 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 17697 May 16 00:02 vm_basic_asm.h
+-r--r--r-- 1 mts mts 16113 May 16 00:02 vm_basic_asm_x86.h
+-r--r--r-- 1 mts mts 8944 May 16 00:02 vm_basic_asm_x86_64.h
+-r--r--r-- 1 mts mts 12608 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 1168 May 16 00:02 vmhgfs_version.h
+-r--r--r-- 1 mts mts 1889 May 16 00:02 vmware.h
+-r--r--r-- 1 mts mts 1316 May 16 00:02 vmware_pack_begin.h
+-r--r--r-- 1 mts mts 1336 May 16 00:02 vmware_pack_end.h
+-r--r--r-- 1 mts mts 1956 May 16 00:02 vmware_pack_init.h
+-r--r--r-- 1 mts mts 38003 May 16 00:02 x86cpuid.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmhgfs/autoconf:
total 36
--r--r--r-- 1 mts mts 1670 May 2 15:24 cachecreate.c
--r--r--r-- 1 mts mts 1718 May 2 15:24 cachector.c
--r--r--r-- 1 mts mts 1261 May 2 15:24 epoll.c
--r--r--r-- 1 mts mts 1204 May 2 15:24 geninclude.c
--r--r--r-- 1 mts mts 1596 May 2 15:24 getsb1.c
--r--r--r-- 1 mts mts 1473 May 2 15:24 inode1.c
--r--r--r-- 1 mts mts 1345 May 2 15:24 maxbytes.c
--r--r--r-- 1 mts mts 1139 May 2 15:24 setnice.c
--r--r--r-- 1 mts mts 1463 May 2 15:24 statfs1.c
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmmemctl:
-total 288
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 3762 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 1696 May 2 15:24 Makefile.kernel
--r--r--r-- 1 mts mts 2868 May 2 15:24 Makefile.normal
--r--r--r-- 1 mts mts 453 May 2 15:24 README
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
--r--r--r-- 1 mts mts 1337 May 2 15:24 backdoor.h
--r--r--r-- 1 mts mts 6174 May 2 15:24 backdoorGcc32.c
--r--r--r-- 1 mts mts 5550 May 2 15:24 backdoorGcc64.c
--r--r--r-- 1 mts mts 1032 May 2 15:24 backdoorInt.h
--r--r--r-- 1 mts mts 1338 May 2 15:24 backdoor_balloon.h
--r--r--r-- 1 mts mts 5883 May 2 15:24 backdoor_def.h
--r--r--r-- 1 mts mts 3543 May 2 15:24 backdoor_types.h
--r--r--r-- 1 mts mts 2622 May 2 15:24 balloon_def.h
--r--r--r-- 1 mts mts 6088 May 2 15:24 compat_completion.h
--r--r--r-- 1 mts mts 1875 May 2 15:24 compat_file.h
--r--r--r-- 1 mts mts 2659 May 2 15:24 compat_kernel.h
--r--r--r-- 1 mts mts 8066 May 2 15:24 compat_kthread.h
--r--r--r-- 1 mts mts 1917 May 2 15:24 compat_list.h
--r--r--r-- 1 mts mts 4231 May 2 15:24 compat_mm.h
--r--r--r-- 1 mts mts 2298 May 2 15:24 compat_module.h
--r--r--r-- 1 mts mts 2483 May 2 15:24 compat_page.h
--r--r--r-- 1 mts mts 9843 May 2 15:24 compat_sched.h
--r--r--r-- 1 mts mts 1456 May 2 15:24 compat_semaphore.h
--r--r--r-- 1 mts mts 2438 May 2 15:24 compat_spinlock.h
--r--r--r-- 1 mts mts 3189 May 2 15:24 compat_version.h
--r--r--r-- 1 mts mts 6854 May 2 15:24 compat_wait.h
--r--r--r-- 1 mts mts 2216 May 2 15:24 driver-config.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 13341 May 2 15:24 os.c
--r--r--r-- 1 mts mts 2441 May 2 15:24 os.h
--r--r--r-- 1 mts mts 9952 May 2 15:24 vm_assert.h
--r--r--r-- 1 mts mts 12182 May 2 15:24 vm_basic_defs.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 37545 May 2 15:24 vmballoon.c
--r--r--r-- 1 mts mts 2048 May 2 15:24 vmballoon.h
--r--r--r-- 1 mts mts 1193 May 2 15:24 vmmemctl_version.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmmemctl/autoconf:
+-r--r--r-- 1 mts mts 1670 May 16 00:02 cachecreate.c
+-r--r--r-- 1 mts mts 1718 May 16 00:02 cachector.c
+-r--r--r-- 1 mts mts 1261 May 16 00:02 epoll.c
+-r--r--r-- 1 mts mts 1204 May 16 00:02 geninclude.c
+-r--r--r-- 1 mts mts 1596 May 16 00:02 getsb1.c
+-r--r--r-- 1 mts mts 1473 May 16 00:02 inode1.c
+-r--r--r-- 1 mts mts 1345 May 16 00:02 maxbytes.c
+-r--r--r-- 1 mts mts 1139 May 16 00:02 setnice.c
+-r--r--r-- 1 mts mts 1463 May 16 00:02 statfs1.c
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmmemctl:
+total 292
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3762 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 1696 May 16 00:02 Makefile.kernel
+-r--r--r-- 1 mts mts 2868 May 16 00:02 Makefile.normal
+-r--r--r-- 1 mts mts 453 May 16 00:02 README
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autoconf
+-r--r--r-- 1 mts mts 1337 May 16 00:02 backdoor.h
+-r--r--r-- 1 mts mts 6174 May 16 00:02 backdoorGcc32.c
+-r--r--r-- 1 mts mts 5550 May 16 00:02 backdoorGcc64.c
+-r--r--r-- 1 mts mts 1032 May 16 00:02 backdoorInt.h
+-r--r--r-- 1 mts mts 1338 May 16 00:02 backdoor_balloon.h
+-r--r--r-- 1 mts mts 5883 May 16 00:02 backdoor_def.h
+-r--r--r-- 1 mts mts 3543 May 16 00:02 backdoor_types.h
+-r--r--r-- 1 mts mts 2622 May 16 00:02 balloon_def.h
+-r--r--r-- 1 mts mts 6088 May 16 00:02 compat_completion.h
+-r--r--r-- 1 mts mts 1875 May 16 00:02 compat_file.h
+-r--r--r-- 1 mts mts 2659 May 16 00:02 compat_kernel.h
+-r--r--r-- 1 mts mts 8066 May 16 00:02 compat_kthread.h
+-r--r--r-- 1 mts mts 1917 May 16 00:02 compat_list.h
+-r--r--r-- 1 mts mts 4231 May 16 00:02 compat_mm.h
+-r--r--r-- 1 mts mts 2298 May 16 00:02 compat_module.h
+-r--r--r-- 1 mts mts 2483 May 16 00:02 compat_page.h
+-r--r--r-- 1 mts mts 9843 May 16 00:02 compat_sched.h
+-r--r--r-- 1 mts mts 1456 May 16 00:02 compat_semaphore.h
+-r--r--r-- 1 mts mts 2438 May 16 00:02 compat_spinlock.h
+-r--r--r-- 1 mts mts 3189 May 16 00:02 compat_version.h
+-r--r--r-- 1 mts mts 6854 May 16 00:02 compat_wait.h
+-r--r--r-- 1 mts mts 2216 May 16 00:02 driver-config.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 13341 May 16 00:02 os.c
+-r--r--r-- 1 mts mts 2441 May 16 00:02 os.h
+-r--r--r-- 1 mts mts 9952 May 16 00:02 vm_assert.h
+-r--r--r-- 1 mts mts 12608 May 16 00:02 vm_basic_defs.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 37545 May 16 00:02 vmballoon.c
+-r--r--r-- 1 mts mts 2048 May 16 00:02 vmballoon.h
+-r--r--r-- 1 mts mts 1193 May 16 00:02 vmmemctl_version.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmmemctl/autoconf:
total 12
--r--r--r-- 1 mts mts 1261 May 2 15:24 epoll.c
--r--r--r-- 1 mts mts 1204 May 2 15:24 geninclude.c
--r--r--r-- 1 mts mts 1139 May 2 15:24 setnice.c
+-r--r--r-- 1 mts mts 1261 May 16 00:02 epoll.c
+-r--r--r-- 1 mts mts 1204 May 16 00:02 geninclude.c
+-r--r--r-- 1 mts mts 1139 May 16 00:02 setnice.c
-open-vm-tools-2008.05.02-90473/modules/linux/vmsync:
+open-vm-tools-2008.05.15-93084/modules/linux/vmsync:
total 108
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 3760 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 1473 May 2 15:24 Makefile.kernel
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
--r--r--r-- 1 mts mts 9850 May 2 15:24 compat_fs.h
--r--r--r-- 1 mts mts 2298 May 2 15:24 compat_module.h
--r--r--r-- 1 mts mts 2118 May 2 15:24 compat_namei.h
--r--r--r-- 1 mts mts 2764 May 2 15:24 compat_slab.h
--r--r--r-- 1 mts mts 3189 May 2 15:24 compat_version.h
--r--r--r-- 1 mts mts 6345 May 2 15:24 compat_workqueue.h
--r--r--r-- 1 mts mts 2216 May 2 15:24 driver-config.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 18797 May 2 15:24 sync.c
--r--r--r-- 1 mts mts 1540 May 2 15:24 syncDriverIoc.h
--r--r--r-- 1 mts mts 1168 May 2 15:24 vmsync_version.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmsync/autoconf:
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3760 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 1473 May 16 00:02 Makefile.kernel
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autoconf
+-r--r--r-- 1 mts mts 9850 May 16 00:02 compat_fs.h
+-r--r--r-- 1 mts mts 2298 May 16 00:02 compat_module.h
+-r--r--r-- 1 mts mts 2118 May 16 00:02 compat_namei.h
+-r--r--r-- 1 mts mts 2764 May 16 00:02 compat_slab.h
+-r--r--r-- 1 mts mts 3189 May 16 00:02 compat_version.h
+-r--r--r-- 1 mts mts 6345 May 16 00:02 compat_workqueue.h
+-r--r--r-- 1 mts mts 2216 May 16 00:02 driver-config.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 18797 May 16 00:02 sync.c
+-r--r--r-- 1 mts mts 1540 May 16 00:02 syncDriverIoc.h
+-r--r--r-- 1 mts mts 1168 May 16 00:02 vmsync_version.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmsync/autoconf:
total 8
--r--r--r-- 1 mts mts 1670 May 2 15:24 cachecreate.c
--r--r--r-- 1 mts mts 1718 May 2 15:24 cachector.c
+-r--r--r-- 1 mts mts 1670 May 16 00:02 cachecreate.c
+-r--r--r-- 1 mts mts 1718 May 16 00:02 cachector.c
-open-vm-tools-2008.05.02-90473/modules/linux/vmxnet:
+open-vm-tools-2008.05.15-93084/modules/linux/vmxnet:
total 280
--r--r--r-- 1 mts mts 17987 May 2 15:24 COPYING
--r--r--r-- 1 mts mts 3760 May 2 15:24 Makefile
--r--r--r-- 1 mts mts 1279 May 2 15:24 Makefile.kernel
--r--r--r-- 1 mts mts 2665 May 2 15:24 Makefile.normal
--r--r--r-- 1 mts mts 460 May 2 15:24 README
-drwxr-xr-x 2 mts mts 4096 May 2 15:24 autoconf
--r--r--r-- 1 mts mts 1966 May 2 15:24 bpf_meta.h
--r--r--r-- 1 mts mts 1734 May 2 15:24 compat_ethtool.h
--r--r--r-- 1 mts mts 1391 May 2 15:24 compat_highmem.h
--r--r--r-- 1 mts mts 1261 May 2 15:24 compat_init.h
--r--r--r-- 1 mts mts 1700 May 2 15:24 compat_interrupt.h
--r--r--r-- 1 mts mts 2081 May 2 15:24 compat_ioport.h
--r--r--r-- 1 mts mts 2298 May 2 15:24 compat_module.h
--r--r--r-- 1 mts mts 8121 May 2 15:24 compat_netdevice.h
--r--r--r-- 1 mts mts 16725 May 2 15:24 compat_pci.h
--r--r--r-- 1 mts mts 6453 May 2 15:24 compat_skbuff.h
--r--r--r-- 1 mts mts 2764 May 2 15:24 compat_slab.h
--r--r--r-- 1 mts mts 2438 May 2 15:24 compat_spinlock.h
--r--r--r-- 1 mts mts 2795 May 2 15:24 compat_timer.h
--r--r--r-- 1 mts mts 3189 May 2 15:24 compat_version.h
--r--r--r-- 1 mts mts 2216 May 2 15:24 driver-config.h
--r--r--r-- 1 mts mts 4262 May 2 15:24 includeCheck.h
--r--r--r-- 1 mts mts 2426 May 2 15:24 net.h
--r--r--r-- 1 mts mts 2240 May 2 15:24 net_sg.h
--r--r--r-- 1 mts mts 21741 May 2 15:24 vm_basic_types.h
--r--r--r-- 1 mts mts 7137 May 2 15:24 vm_device_version.h
--r--r--r-- 1 mts mts 2915 May 2 15:24 vmnet_def.h
--r--r--r-- 1 mts mts 68841 May 2 15:24 vmxnet.c
--r--r--r-- 1 mts mts 14595 May 2 15:24 vmxnet2_def.h
--r--r--r-- 1 mts mts 3735 May 2 15:24 vmxnetInt.h
--r--r--r-- 1 mts mts 6793 May 2 15:24 vmxnet_def.h
--r--r--r-- 1 mts mts 1168 May 2 15:24 vmxnet_version.h
-
-open-vm-tools-2008.05.02-90473/modules/linux/vmxnet/autoconf:
+-r--r--r-- 1 mts mts 17987 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3760 May 16 00:02 Makefile
+-r--r--r-- 1 mts mts 1279 May 16 00:02 Makefile.kernel
+-r--r--r-- 1 mts mts 2665 May 16 00:02 Makefile.normal
+-r--r--r-- 1 mts mts 460 May 16 00:02 README
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 autoconf
+-r--r--r-- 1 mts mts 1966 May 16 00:02 bpf_meta.h
+-r--r--r-- 1 mts mts 1734 May 16 00:02 compat_ethtool.h
+-r--r--r-- 1 mts mts 1391 May 16 00:02 compat_highmem.h
+-r--r--r-- 1 mts mts 1261 May 16 00:02 compat_init.h
+-r--r--r-- 1 mts mts 1700 May 16 00:02 compat_interrupt.h
+-r--r--r-- 1 mts mts 2081 May 16 00:02 compat_ioport.h
+-r--r--r-- 1 mts mts 2298 May 16 00:02 compat_module.h
+-r--r--r-- 1 mts mts 8121 May 16 00:02 compat_netdevice.h
+-r--r--r-- 1 mts mts 16725 May 16 00:02 compat_pci.h
+-r--r--r-- 1 mts mts 6453 May 16 00:02 compat_skbuff.h
+-r--r--r-- 1 mts mts 2764 May 16 00:02 compat_slab.h
+-r--r--r-- 1 mts mts 2438 May 16 00:02 compat_spinlock.h
+-r--r--r-- 1 mts mts 2795 May 16 00:02 compat_timer.h
+-r--r--r-- 1 mts mts 3189 May 16 00:02 compat_version.h
+-r--r--r-- 1 mts mts 2216 May 16 00:02 driver-config.h
+-r--r--r-- 1 mts mts 4262 May 16 00:02 includeCheck.h
+-r--r--r-- 1 mts mts 2426 May 16 00:02 net.h
+-r--r--r-- 1 mts mts 2240 May 16 00:02 net_sg.h
+-r--r--r-- 1 mts mts 21746 May 16 00:02 vm_basic_types.h
+-r--r--r-- 1 mts mts 7197 May 16 00:02 vm_device_version.h
+-r--r--r-- 1 mts mts 3180 May 16 00:02 vmnet_def.h
+-r--r--r-- 1 mts mts 68841 May 16 00:02 vmxnet.c
+-r--r--r-- 1 mts mts 14595 May 16 00:02 vmxnet2_def.h
+-r--r--r-- 1 mts mts 3735 May 16 00:02 vmxnetInt.h
+-r--r--r-- 1 mts mts 6793 May 16 00:02 vmxnet_def.h
+-r--r--r-- 1 mts mts 1168 May 16 00:02 vmxnet_version.h
+
+open-vm-tools-2008.05.15-93084/modules/linux/vmxnet/autoconf:
total 8
--r--r--r-- 1 mts mts 1204 May 2 15:24 geninclude.c
--r--r--r-- 1 mts mts 1400 May 2 15:24 skblin.c
+-r--r--r-- 1 mts mts 1204 May 16 00:02 geninclude.c
+-r--r--r-- 1 mts mts 1400 May 16 00:02 skblin.c
-open-vm-tools-2008.05.02-90473/scripts:
+open-vm-tools-2008.05.15-93084/scripts:
total 44
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 common
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 freebsd
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 linux
-drwxr-xr-x 2 mts mts 4096 May 2 15:25 solaris
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 common
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 freebsd
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 linux
+drwxr-xr-x 2 mts mts 4096 May 16 00:02 solaris
-open-vm-tools-2008.05.02-90473/scripts/common:
+open-vm-tools-2008.05.15-93084/scripts/common:
total 8
--r--r--r-- 1 mts mts 7452 May 2 15:25 vm-support
+-r--r--r-- 1 mts mts 7452 May 16 00:02 vm-support
-open-vm-tools-2008.05.02-90473/scripts/freebsd:
+open-vm-tools-2008.05.15-93084/scripts/freebsd:
total 16
--r--r--r-- 1 mts mts 1354 May 2 15:25 poweroff-vm-default
--r--r--r-- 1 mts mts 1353 May 2 15:25 poweron-vm-default
--r--r--r-- 1 mts mts 1393 May 2 15:25 resume-vm-default
--r--r--r-- 1 mts mts 1750 May 2 15:25 suspend-vm-default
+-r--r--r-- 1 mts mts 1354 May 16 00:02 poweroff-vm-default
+-r--r--r-- 1 mts mts 1353 May 16 00:02 poweron-vm-default
+-r--r--r-- 1 mts mts 1393 May 16 00:02 resume-vm-default
+-r--r--r-- 1 mts mts 1750 May 16 00:02 suspend-vm-default
-open-vm-tools-2008.05.02-90473/scripts/linux:
+open-vm-tools-2008.05.15-93084/scripts/linux:
total 16
--r--r--r-- 1 mts mts 1351 May 2 15:25 poweroff-vm-default
--r--r--r-- 1 mts mts 1351 May 2 15:25 poweron-vm-default
--r--r--r-- 1 mts mts 3042 May 2 15:25 resume-vm-default
--r--r--r-- 1 mts mts 2638 May 2 15:25 suspend-vm-default
+-r--r--r-- 1 mts mts 1351 May 16 00:02 poweroff-vm-default
+-r--r--r-- 1 mts mts 1351 May 16 00:02 poweron-vm-default
+-r--r--r-- 1 mts mts 3042 May 16 00:02 resume-vm-default
+-r--r--r-- 1 mts mts 2638 May 16 00:02 suspend-vm-default
-open-vm-tools-2008.05.02-90473/scripts/solaris:
+open-vm-tools-2008.05.15-93084/scripts/solaris:
total 16
--r--r--r-- 1 mts mts 1354 May 2 15:25 poweroff-vm-default
--r--r--r-- 1 mts mts 1353 May 2 15:25 poweron-vm-default
--r--r--r-- 1 mts mts 1553 May 2 15:25 resume-vm-default
--r--r--r-- 1 mts mts 1904 May 2 15:25 suspend-vm-default
+-r--r--r-- 1 mts mts 1354 May 16 00:02 poweroff-vm-default
+-r--r--r-- 1 mts mts 1353 May 16 00:02 poweron-vm-default
+-r--r--r-- 1 mts mts 1553 May 16 00:02 resume-vm-default
+-r--r--r-- 1 mts mts 1904 May 16 00:02 suspend-vm-default
-open-vm-tools-2008.05.02-90473/toolbox:
+open-vm-tools-2008.05.15-93084/toolbox:
total 176
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 2615 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 17046 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 2696 May 2 15:25 bigIcon.xpm
--r--r--r-- 1 mts mts 6258 May 2 15:25 debugStdio.c
--r--r--r-- 1 mts mts 458 May 2 15:25 smallIcon.xpm
--r--r--r-- 1 mts mts 4731 May 2 15:25 stub.c
--r--r--r-- 1 mts mts 29581 May 2 15:25 toolbox-gtk.c
--r--r--r-- 1 mts mts 6323 May 2 15:25 toolboxAbout.c
--r--r--r-- 1 mts mts 7085 May 2 15:25 toolboxDevices.c
--r--r--r-- 1 mts mts 2835 May 2 15:25 toolboxInt.h
--r--r--r-- 1 mts mts 3898 May 2 15:25 toolboxOptions.c
--r--r--r-- 1 mts mts 24460 May 2 15:25 toolboxScripts.c
--r--r--r-- 1 mts mts 14826 May 2 15:25 toolboxShrink.c
--r--r--r-- 1 mts mts 1557 May 2 15:25 toolboxgtk_version.h
-
-open-vm-tools-2008.05.02-90473/vmware-user:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 2575 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 17010 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 2696 May 16 00:02 bigIcon.xpm
+-r--r--r-- 1 mts mts 6258 May 16 00:02 debugStdio.c
+-r--r--r-- 1 mts mts 458 May 16 00:02 smallIcon.xpm
+-r--r--r-- 1 mts mts 4731 May 16 00:02 stub.c
+-r--r--r-- 1 mts mts 29581 May 16 00:02 toolbox-gtk.c
+-r--r--r-- 1 mts mts 6323 May 16 00:02 toolboxAbout.c
+-r--r--r-- 1 mts mts 7085 May 16 00:02 toolboxDevices.c
+-r--r--r-- 1 mts mts 2835 May 16 00:02 toolboxInt.h
+-r--r--r-- 1 mts mts 3898 May 16 00:02 toolboxOptions.c
+-r--r--r-- 1 mts mts 24460 May 16 00:02 toolboxScripts.c
+-r--r--r-- 1 mts mts 14826 May 16 00:02 toolboxShrink.c
+-r--r--r-- 1 mts mts 1557 May 16 00:02 toolboxgtk_version.h
+
+open-vm-tools-2008.05.15-93084/vmware-user:
total 456
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 3938 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 18781 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 65610 May 2 15:25 copyPaste.c
--r--r--r-- 1 mts mts 6258 May 2 15:25 debugStdio.c
--r--r--r-- 1 mts mts 83230 May 2 15:25 dnd.c
--r--r--r-- 1 mts mts 37366 May 2 15:25 foreignVMToolsDaemon.c
--r--r--r-- 1 mts mts 6210 May 2 15:25 foreignVMToolsDaemon.h
--r--r--r-- 1 mts mts 37059 May 2 15:25 foreignVMToolsNetworking.c
--r--r--r-- 1 mts mts 54676 May 2 15:25 foundryToolsDaemon.c
--r--r--r-- 1 mts mts 1766 May 2 15:25 foundryToolsDaemon.h
--r--r--r-- 1 mts mts 7478 May 2 15:25 libvmwarectrl.c
--r--r--r-- 1 mts mts 2031 May 2 15:25 libvmwarectrl.h
--r--r--r-- 1 mts mts 6157 May 2 15:25 pointer.c
--r--r--r-- 1 mts mts 16123 May 2 15:25 resolution.c
--r--r--r-- 1 mts mts 4731 May 2 15:25 stub.c
--r--r--r-- 1 mts mts 24364 May 2 15:25 vmware-user.c
--r--r--r-- 1 mts mts 1868 May 2 15:25 vmwarectrl.h
--r--r--r-- 1 mts mts 3636 May 2 15:25 vmwarectrlproto.h
--r--r--r-- 1 mts mts 2896 May 2 15:25 vmwareuserInt.h
--r--r--r-- 1 mts mts 1564 May 2 15:25 vmwareuser_version.h
-
-open-vm-tools-2008.05.02-90473/xferlogs:
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 3913 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 18747 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 65610 May 16 00:02 copyPaste.c
+-r--r--r-- 1 mts mts 6258 May 16 00:02 debugStdio.c
+-r--r--r-- 1 mts mts 83230 May 16 00:02 dnd.c
+-r--r--r-- 1 mts mts 37366 May 16 00:02 foreignVMToolsDaemon.c
+-r--r--r-- 1 mts mts 6210 May 16 00:02 foreignVMToolsDaemon.h
+-r--r--r-- 1 mts mts 36992 May 16 00:02 foreignVMToolsNetworking.c
+-r--r--r-- 1 mts mts 54676 May 16 00:02 foundryToolsDaemon.c
+-r--r--r-- 1 mts mts 1766 May 16 00:02 foundryToolsDaemon.h
+-r--r--r-- 1 mts mts 7478 May 16 00:02 libvmwarectrl.c
+-r--r--r-- 1 mts mts 2031 May 16 00:02 libvmwarectrl.h
+-r--r--r-- 1 mts mts 6157 May 16 00:02 pointer.c
+-r--r--r-- 1 mts mts 16123 May 16 00:02 resolution.c
+-r--r--r-- 1 mts mts 4731 May 16 00:02 stub.c
+-r--r--r-- 1 mts mts 24375 May 16 00:02 vmware-user.c
+-r--r--r-- 1 mts mts 1868 May 16 00:02 vmwarectrl.h
+-r--r--r-- 1 mts mts 3636 May 16 00:02 vmwarectrlproto.h
+-r--r--r-- 1 mts mts 2896 May 16 00:02 vmwareuserInt.h
+-r--r--r-- 1 mts mts 1564 May 16 00:02 vmwareuser_version.h
+
+open-vm-tools-2008.05.15-93084/xferlogs:
total 64
--r--r--r-- 1 mts mts 26425 May 2 15:25 COPYING
--r--r--r-- 1 mts mts 1533 May 2 15:25 Makefile.am
--rw-r--r-- 1 mts mts 15220 May 2 15:25 Makefile.in
--r--r--r-- 1 mts mts 9303 May 2 15:25 xferlogs.c
--r--r--r-- 1 mts mts 1554 May 2 15:25 xferlogs_version.h
+-r--r--r-- 1 mts mts 26425 May 16 00:02 COPYING
+-r--r--r-- 1 mts mts 1491 May 16 00:02 Makefile.am
+-rw-r--r-- 1 mts mts 15170 May 16 00:02 Makefile.in
+-r--r--r-- 1 mts mts 9303 May 16 00:02 xferlogs.c
+-r--r--r-- 1 mts mts 1554 May 16 00:02 xferlogs_version.h
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
+open-vm-tools 2008.05.15 changes:
+ * guestd no longer starts vmware-user. Packagers will need to use
+ the XDG autostart spec, Xsession drop-in scripts, or other appropriate
+ mechanisms to make sure that vmware-user is started as part of
+ X session initialization. Please see
+ http://open-vm-tools.wiki.sourceforge.net/Packaging for more details.
+
+ * Bug fixes as usual.
+
open-vm-tools 2008.05.02 changes:
* Continued Unicode support.
noinst_PROGRAMS = checkvm
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
checkvm_SOURCES =
checkvm_SOURCES += checkvm.c
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @COMMON_CFLAGS@
checkvm_SOURCES = checkvm.c
all: all-am
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for open-vm-tools 2008.05.02-90473.
+# Generated by GNU Autoconf 2.61 for open-vm-tools 2008.05.15-93084.
#
# Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
#
# Identity of this package.
PACKAGE_NAME='open-vm-tools'
PACKAGE_TARNAME='open-vm-tools'
-PACKAGE_VERSION='2008.05.02-90473'
-PACKAGE_STRING='open-vm-tools 2008.05.02-90473'
+PACKAGE_VERSION='2008.05.15-93084'
+PACKAGE_STRING='open-vm-tools 2008.05.15-93084'
PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
ac_unique_file="checkvm/checkvm.c"
NO_ICU_FALSE
MODULES_OS
MODULES
-COMMON_CFLAGS
-COMMON_PROG_CFLAGS
COMMON_XLIBS
-GTK_CFLAGS
+GTK_CPPFLAGS
GTK_LIBS
-DNET_CFLAGS
+DNET_CPPFLAGS
DNET_LIBS
-PROCPS_CFLAGS
+PROCPS_CPPFLAGS
PROCPS_LIBS
-ICU_CFLAGS
+ICU_CPPFLAGS
ICU_LIBS
-LIB_AUTH_CFLAGS
-LIB_FILE_CFLAGS
-LIB_HGFS_SERVER_CFLAGS
-LIB_IMPERSONATE_CFLAGS
-LIB_MISC_CFLAGS
-LIB_PROC_MGR_CFLAGS
-LIB_STRING_CFLAGS
-LIB_USER_CFLAGS
+LIB_AUTH_CPPFLAGS
+LIB_FILE_CPPFLAGS
+LIB_HGFS_SERVER_CPPFLAGS
+LIB_IMPERSONATE_CPPFLAGS
+LIB_MISC_CPPFLAGS
+LIB_PROC_MGR_CPPFLAGS
+LIB_STRING_CPPFLAGS
+LIB_USER_CPPFLAGS
GUESTD_LDADD
-VMWARE_USER_CFLAGS
+VMWARE_USER_CPPFLAGS
VMWARE_USER_LDADD
LIBOBJS
LTLIBOBJS'
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures open-vm-tools 2008.05.02-90473 to adapt to many kinds of systems.
+\`configure' configures open-vm-tools 2008.05.15-93084 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of open-vm-tools 2008.05.02-90473:";;
+ short | recursive ) echo "Configuration of open-vm-tools 2008.05.15-93084:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-open-vm-tools configure 2008.05.02-90473
+open-vm-tools configure 2008.05.15-93084
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by open-vm-tools $as_me 2008.05.02-90473, which was
+It was created by open-vm-tools $as_me 2008.05.15-93084, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='open-vm-tools'
- VERSION='2008.05.02-90473'
+ VERSION='2008.05.15-93084'
cat >>confdefs.h <<_ACEOF
###
# These need to be declared after initialization.
-# Some of our macro call-sites require changes to CFLAGS/LDFLAGS. In such
-# places, we save the original value of CFLAGS/LDFLAGS before the macro call
-# and restore it when the call is done. We must perform this save at each macro
-# site, because CFLAGS/LDFLAGS may change over the course of configuration.
-CFLAGS="$CFLAGS -DUSING_AUTOCONF=1"
+# Some of our macro call-sites require changes to
+# CPPFLAGS/CFLAGS/LDFLAGS. In such places, we save the original value
+# of CPPFLAGS/CFLAGS/LDFLAGS before the macro call and restore it when
+# the call is done. We must perform this save at each macro site,
+# because CPPFLAGS/CFLAGS/LDFLAGS may change over the course of
+# configuration.
+#
+# CPPFLAGS is intended for preprocessor options (-D and -I mainly)
+# CFLAGS is intended for compiler options (-O, -f, -W, and so forth)
+
+CPPFLAGS="$CPPFLAGS -DUSING_AUTOCONF=1"
###
### Programs
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5587 "configure"' > conftest.$ac_ext
+ echo '#line 5591 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8088: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8092: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8092: \$? = $ac_status" >&5
+ echo "$as_me:8096: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8356: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8360: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8360: \$? = $ac_status" >&5
+ echo "$as_me:8364: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8460: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8464: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8464: \$? = $ac_status" >&5
+ echo "$as_me:8468: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 9925 "configure"' > conftest.$ac_ext
+ echo '#line 9929 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10789 "configure"
+#line 10793 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10889 "configure"
+#line 10893 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13228: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13232: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13232: \$? = $ac_status" >&5
+ echo "$as_me:13236: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13332: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13336: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13336: \$? = $ac_status" >&5
+ echo "$as_me:13340: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 13868 "configure"' > conftest.$ac_ext
+ echo '#line 13872 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14926: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14930: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14930: \$? = $ac_status" >&5
+ echo "$as_me:14934: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15030: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15034: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15034: \$? = $ac_status" >&5
+ echo "$as_me:15038: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 16475 "configure"' > conftest.$ac_ext
+ echo '#line 16479 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17252: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17256: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17256: \$? = $ac_status" >&5
+ echo "$as_me:17260: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17524: \$? = $ac_status" >&5
+ echo "$as_me:17528: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17624: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17628: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17628: \$? = $ac_status" >&5
+ echo "$as_me:17632: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 19089 "configure"' > conftest.$ac_ext
+ echo '#line 19093 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
{ (exit 1); exit 1; }; }
else
LIBS="$LIBS $X_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
COMMON_XLIBS="-lX11"
COMMON_XLIBS="-lXext $COMMON_XLIBS"
fi
- if test -n "$CUSTOM_GTK_CFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
+ if test -n "$CUSTOM_GTK_CPPFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
# Check to see if we have some version of GTK. gtk_accel_group_add
# is a random function that is present in Gtk 1.2 but not Gtk
# 2.0. Similarly, gtk_tree_view_new is a random function in Gtk 2.0
# 'pkg-config --cflags gtk+-2.0' gives an error.
if test "$HAVE_GTK2" = "yes" -a "$HAVE_PKG_CONFIG" = "yes" \
&& ! pkg-config --exists gtk+-2.0 \
- && test -z "$CUSTOM_GTK_CFLAGS" -a -z "$CUSTOM_GTK_LIBS"; then
+ && test -z "$CUSTOM_GTK_CPPFLAGS" -a -z "$CUSTOM_GTK_LIBS"; then
HAVE_GTK2="no"
fi
if test "$HAVE_GTK2" = "yes"; then
# Gtk 2.0
- GTK_CFLAGS="$GTK_CFLAGS -DGTK2"
+ GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"
gtkPackageName="gtk+-2.0"
elif test "$HAVE_GTK1" = "yes"; then
# Gtk 1.2
fi
# Prefer flags specified, in the environment, by the user.
- if test -n "$CUSTOM_GTK_CFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
- GTK_CFLAGS="$GTK_CFLAGS $CUSTOM_GTK_CFLAGS"
+ if test -n "$CUSTOM_GTK_CPPFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
+ GTK_CPPFLAGS="$GTK_CPPFLAGS $CUSTOM_GTK_CPPFLAGS"
GTK_LIBS="$GTK_LIBS $CUSTOM_GTK_LIBS"
# Use pkg-config if available and there are no user-specified flags.
elif test "$HAVE_PKG_CONFIG" = "yes"; then
- GTK_CFLAGS="$GTK_CFLAGS $(pkg-config --cflags $gtkPackageName)"
+ GTK_CPPFLAGS="$GTK_CPPFLAGS $(pkg-config --cflags $gtkPackageName)"
GTK_LIBS="$GTK_LIBS $(pkg-config --libs $gtkPackageName)"
# Otherwise, we have a problem.
else
- { { echo "$as_me:$LINENO: error: pkg-config not found. Get pkg-config or set CUSTOM_GTK_CFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations." >&5
-echo "$as_me: error: pkg-config not found. Get pkg-config or set CUSTOM_GTK_CFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations." >&2;}
+ { { echo "$as_me:$LINENO: error: pkg-config not found. Get pkg-config or set CUSTOM_GTK_CPPFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations." >&5
+echo "$as_me: error: pkg-config not found. Get pkg-config or set CUSTOM_GTK_CPPFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations." >&2;}
{ (exit 1); exit 1; }; }
fi
# 'procps' package installed without 'libproc-dev' would lead to
# compilation errors down the line, so to avoid that we explicitly
# check for one of the libproc headers that is consumed in the build.
- if test -n "$CUSTOM_PROCPS_CFLAGS"; then
- PROCPS_CFLAGS="$CUSTOM_PROCPS_CFLAGS"
+ if test -n "$CUSTOM_PROCPS_CPPFLAGS"; then
+ PROCPS_CPPFLAGS="$CUSTOM_PROCPS_CPPFLAGS"
else
# XXX: Unfortunately, the libproc devel package doesn't appear
# to ship with a configuration script or pkg-config manifest
# file, so there's no portable way to get the location of its
# headers. For now we default to /usr/include.
- PROCPS_CFLAGS="-I/usr/include"
+ PROCPS_CPPFLAGS="-I/usr/include"
fi
- ORIGINAL_CFLAGS="$CFLAGS"
- CFLAGS="$PROCPS_CFLAGS $CFLAGS"
+ ORIGINAL_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$PROCPS_CPPFLAGS $CPPFLAGS"
if test "${ac_cv_header_proc_sysinfo_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for proc/sysinfo.h" >&5
echo $ECHO_N "checking for proc/sysinfo.h... $ECHO_C" >&6; }
fi
- CFLAGS="$ORIGINAL_CFLAGS"
+ CPPFLAGS="$ORIGINAL_CPPFLAGS"
fi
if test "$with_procps" != "yes"; then
if test "$DNET_CONFIG" != no; then
- DNET_CFLAGS="`$DNET_CONFIG --cflags`"
+ DNET_CPPFLAGS="`$DNET_CONFIG --cflags`"
DNET_LIBS="`$DNET_CONFIG --libs`"
GUESTD_LDADD="$GUESTD_LDADD $DNET_LIBS"
if test "$ICU_CONFIG" != no; then
- ICU_CFLAGS="`$ICU_CONFIG --cppflags` -DUSE_ICU"
+ ICU_CPPFLAGS="`$ICU_CONFIG --cppflags` -DUSE_ICU"
ICU_LIBS="`$ICU_CONFIG --ldflags`"
{ echo "$as_me:$LINENO: checking for ucasemap_utf8ToTitle_3_8 in -licuuc" >&5
if test "$have_ICU_38" = "yes"; then
- ICU_CFLAGS="$ICU_CFLAGS -DHAVE_ICU_38"
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DHAVE_ICU_38"
fi
# Easier to give all modules the ICU defines/includes...
- COMMON_CFLAGS="$COMMON_CFLAGS $ICU_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
else
{ { echo "$as_me:$LINENO: error: icu-config was not found on your PATH. Please configure without ICU (using --without-icu) or install ICU - http://www.icu-project.org" >&5
echo "$as_me: error: icu-config was not found on your PATH. Please configure without ICU (using --without-icu) or install ICU - http://www.icu-project.org" >&2;}
fi
### General flags / actions
-COMMON_CFLAGS="$COMMON_CFLAGS -Wall"
-COMMON_CFLAGS="$COMMON_CFLAGS -Werror"
+CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Werror"
# -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' in Xlib.h on OpenSolaris.
for TEST_CFLAG in -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing \
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- COMMON_CFLAGS="$COMMON_CFLAGS $TEST_CFLAG"
+ CFLAGS="$CFLAGS $TEST_CFLAG"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$ORIGINAL_CFLAGS"
done
-COMMON_CFLAGS="$COMMON_CFLAGS -DVMX86_TOOLS"
-COMMON_CFLAGS="$COMMON_CFLAGS -DNO_CORE_ICU"
+CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
+CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
-COMMON_CFLAGS="$COMMON_CFLAGS -I$INCLUDE_DIR"
+CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
### OS/arch-specific flags / actions
buildHgfsmounter=no
if test "$os" = "linux"; then
- COMMON_CFLAGS="$COMMON_CFLAGS -D_FILE_OFFSET_BITS=64"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_LARGEFILE64_SOURCE"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_XOPEN_SOURCE=500"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_BSD_SOURCE"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_SVID_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+ CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_SVID_SOURCE"
if test "$osVersion" -ge 202000; then
MODULES="$MODULES vmxnet vmmemctl"
fi
if test "$os" = "solaris"; then
- LIB_IMPERSONATE_CFLAGS="$LIB_IMPERSONATE_CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
- LIB_USER_CFLAGS="$LIB_USER_CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+ LIB_IMPERSONATE_CPPFLAGS="$LIB_IMPERSONATE_CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+ LIB_USER_CPPFLAGS="$LIB_USER_CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
GUESTD_LDADD="$GUESTD_LDADD -lsocket"
GUESTD_LDADD="$GUESTD_LDADD -lnsl"
- VMWARE_USER_CFLAGS="$VMWARE_USER_CFLAGS -I/usr/X11/include/"
+ VMWARE_USER_CPPFLAGS="$VMWARE_USER_CPPFLAGS -I/usr/X11/include/"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lXext"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lX11"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lsocket"
# uname -r on Solaris 10 reports "5.10"
if test "$osVersion" -ge 510000; then
- COMMON_CFLAGS="$COMMON_CFLAGS -DSOL10"
+ CPPFLAGS="$CPPFLAGS -DSOL10"
fi
fi
fi
if test "$os$userSpaceBitness" = "linux64" || test "$HAVE_SYS_SETUID" = "yes"; then
- LIB_MISC_CFLAGS="$LIB_MISC_CFLAGS -DGLIBC_VERSION_21"
+ LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_21"
fi
if test "$HAVE_NEW_ICONV" = "yes"; then
- LIB_MISC_CFLAGS="$LIB_MISC_CFLAGS -DGLIBC_VERSION_22"
+ LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_22"
fi
if test "$HAVE_LSEEK" = "yes"; then
- LIB_FILE_CFLAGS="$LIB_FILE_CFLAGS -DGLIBC_VERSION_21"
- LIB_HGFS_SERVER_CFLAGS="$LIB_HGFS_SERVER_CFLAGS -DGLIBC_VERSION_21"
+ LIB_FILE_CPPFLAGS="$LIB_FILE_CPPFLAGS -DGLIBC_VERSION_21"
+ LIB_HGFS_SERVER_CPPFLAGS="$LIB_HGFS_SERVER_CPPFLAGS -DGLIBC_VERSION_21"
fi
if test "$HAVE_SETRESUID" = "yes"; then
- LIB_PROC_MGR_CFLAGS="$LIB_PROC_MGR_CFLAGS -DGLIBC_VERSION_23"
+ LIB_PROC_MGR_CPPFLAGS="$LIB_PROC_MGR_CPPFLAGS -DGLIBC_VERSION_23"
fi
if test "$HAVE_CRYPT" = "yes"; then
- LIB_AUTH_CFLAGS="$LIB_AUTH_CFLAGS -DGLIBC_VERSION_22"
+ LIB_AUTH_CPPFLAGS="$LIB_AUTH_CPPFLAGS -DGLIBC_VERSION_22"
fi
if test "$HAVE_WCHAR_H" = "yes"; then
- LIB_STRING_CFLAGS="$LIB_STRING_CFLAGS -DGLIBC_VERSION_22"
+ LIB_STRING_CPPFLAGS="$LIB_STRING_CPPFLAGS -DGLIBC_VERSION_22"
fi
### General substs
-
-
### Lib substs
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by open-vm-tools $as_me 2008.05.02-90473, which was
+This file was extended by open-vm-tools $as_me 2008.05.15-93084, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-open-vm-tools config.status 2008.05.02-90473
+open-vm-tools config.status 2008.05.15-93084
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
NO_ICU_FALSE!$NO_ICU_FALSE$ac_delim
MODULES_OS!$MODULES_OS$ac_delim
MODULES!$MODULES$ac_delim
-COMMON_CFLAGS!$COMMON_CFLAGS$ac_delim
-COMMON_PROG_CFLAGS!$COMMON_PROG_CFLAGS$ac_delim
COMMON_XLIBS!$COMMON_XLIBS$ac_delim
-GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_CPPFLAGS!$GTK_CPPFLAGS$ac_delim
GTK_LIBS!$GTK_LIBS$ac_delim
-DNET_CFLAGS!$DNET_CFLAGS$ac_delim
+DNET_CPPFLAGS!$DNET_CPPFLAGS$ac_delim
DNET_LIBS!$DNET_LIBS$ac_delim
-PROCPS_CFLAGS!$PROCPS_CFLAGS$ac_delim
+PROCPS_CPPFLAGS!$PROCPS_CPPFLAGS$ac_delim
PROCPS_LIBS!$PROCPS_LIBS$ac_delim
-ICU_CFLAGS!$ICU_CFLAGS$ac_delim
+ICU_CPPFLAGS!$ICU_CPPFLAGS$ac_delim
ICU_LIBS!$ICU_LIBS$ac_delim
-LIB_AUTH_CFLAGS!$LIB_AUTH_CFLAGS$ac_delim
-LIB_FILE_CFLAGS!$LIB_FILE_CFLAGS$ac_delim
-LIB_HGFS_SERVER_CFLAGS!$LIB_HGFS_SERVER_CFLAGS$ac_delim
-LIB_IMPERSONATE_CFLAGS!$LIB_IMPERSONATE_CFLAGS$ac_delim
-LIB_MISC_CFLAGS!$LIB_MISC_CFLAGS$ac_delim
-LIB_PROC_MGR_CFLAGS!$LIB_PROC_MGR_CFLAGS$ac_delim
-LIB_STRING_CFLAGS!$LIB_STRING_CFLAGS$ac_delim
-LIB_USER_CFLAGS!$LIB_USER_CFLAGS$ac_delim
+LIB_AUTH_CPPFLAGS!$LIB_AUTH_CPPFLAGS$ac_delim
+LIB_FILE_CPPFLAGS!$LIB_FILE_CPPFLAGS$ac_delim
+LIB_HGFS_SERVER_CPPFLAGS!$LIB_HGFS_SERVER_CPPFLAGS$ac_delim
+LIB_IMPERSONATE_CPPFLAGS!$LIB_IMPERSONATE_CPPFLAGS$ac_delim
+LIB_MISC_CPPFLAGS!$LIB_MISC_CPPFLAGS$ac_delim
+LIB_PROC_MGR_CPPFLAGS!$LIB_PROC_MGR_CPPFLAGS$ac_delim
+LIB_STRING_CPPFLAGS!$LIB_STRING_CPPFLAGS$ac_delim
+LIB_USER_CPPFLAGS!$LIB_USER_CPPFLAGS$ac_delim
GUESTD_LDADD!$GUESTD_LDADD$ac_delim
-VMWARE_USER_CFLAGS!$VMWARE_USER_CFLAGS$ac_delim
+VMWARE_USER_CPPFLAGS!$VMWARE_USER_CPPFLAGS$ac_delim
VMWARE_USER_LDADD!$VMWARE_USER_LDADD$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
################################################################################
+################################################################################
+# In addition to the usual environment variables and command line
+# arguments that a configure script usually takes (CFLAGS, LDFLAGS,
+# etc.), this script also accepts:
+# $CUSTOM_GTK_CPPFLAGS - compile-time flags to find Gtk headers.
+# $CUSTOM_GTK_LIBS - link-time flags to find and link the Gtk libraries.
+# $CUSTOM_PROCPS_CPPFLAGS - compile-time flags to find procps headers
+# $CUSTOM_PROCPS_LIBS - link-time flags to find and link the procps library.
+################################################################################
+
###
### Initialization
###
AC_INIT(
[open-vm-tools],
- [2008.05.02-90473],
+ [2008.05.15-93084],
[open-vm-tools-devel@lists.sourceforge.net])
# In order to make this configure script auto-detect situations where
###
# These need to be declared after initialization.
-# Some of our macro call-sites require changes to CFLAGS/LDFLAGS. In such
-# places, we save the original value of CFLAGS/LDFLAGS before the macro call
-# and restore it when the call is done. We must perform this save at each macro
-# site, because CFLAGS/LDFLAGS may change over the course of configuration.
-CFLAGS="$CFLAGS -DUSING_AUTOCONF=1"
+# Some of our macro call-sites require changes to
+# CPPFLAGS/CFLAGS/LDFLAGS. In such places, we save the original value
+# of CPPFLAGS/CFLAGS/LDFLAGS before the macro call and restore it when
+# the call is done. We must perform this save at each macro site,
+# because CPPFLAGS/CFLAGS/LDFLAGS may change over the course of
+# configuration.
+#
+# CPPFLAGS is intended for preprocessor options (-D and -I mainly)
+# CFLAGS is intended for compiler options (-O, -f, -W, and so forth)
+
+CPPFLAGS="$CPPFLAGS -DUSING_AUTOCONF=1"
###
### Programs
[The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s).])
else
LIBS="$LIBS $X_LIBS"
- CFLAGS="$CFLAGS $X_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
COMMON_XLIBS="-lX11"
COMMON_XLIBS="-lXext $COMMON_XLIBS"
[libXtst not found. Please configure without X11 (using --without-x) or install the libXtst devel package(s).])],
[$COMMON_XLIBS])
- if test -n "$CUSTOM_GTK_CFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
+ if test -n "$CUSTOM_GTK_CPPFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
# Check to see if we have some version of GTK. gtk_accel_group_add
# is a random function that is present in Gtk 1.2 but not Gtk
# 2.0. Similarly, gtk_tree_view_new is a random function in Gtk 2.0
# 'pkg-config --cflags gtk+-2.0' gives an error.
if test "$HAVE_GTK2" = "yes" -a "$HAVE_PKG_CONFIG" = "yes" \
&& ! pkg-config --exists gtk+-2.0 \
- && test -z "$CUSTOM_GTK_CFLAGS" -a -z "$CUSTOM_GTK_LIBS"; then
+ && test -z "$CUSTOM_GTK_CPPFLAGS" -a -z "$CUSTOM_GTK_LIBS"; then
HAVE_GTK2="no"
fi
if test "$HAVE_GTK2" = "yes"; then
# Gtk 2.0
- GTK_CFLAGS="$GTK_CFLAGS -DGTK2"
+ GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"
gtkPackageName="gtk+-2.0"
elif test "$HAVE_GTK1" = "yes"; then
# Gtk 1.2
fi
# Prefer flags specified, in the environment, by the user.
- if test -n "$CUSTOM_GTK_CFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
- GTK_CFLAGS="$GTK_CFLAGS $CUSTOM_GTK_CFLAGS"
+ if test -n "$CUSTOM_GTK_CPPFLAGS" -o -n "$CUSTOM_GTK_LIBS"; then
+ GTK_CPPFLAGS="$GTK_CPPFLAGS $CUSTOM_GTK_CPPFLAGS"
GTK_LIBS="$GTK_LIBS $CUSTOM_GTK_LIBS"
# Use pkg-config if available and there are no user-specified flags.
elif test "$HAVE_PKG_CONFIG" = "yes"; then
- GTK_CFLAGS="$GTK_CFLAGS $(pkg-config --cflags $gtkPackageName)"
+ GTK_CPPFLAGS="$GTK_CPPFLAGS $(pkg-config --cflags $gtkPackageName)"
GTK_LIBS="$GTK_LIBS $(pkg-config --libs $gtkPackageName)"
# Otherwise, we have a problem.
else
- AC_MSG_ERROR([pkg-config not found. Get pkg-config or set CUSTOM_GTK_CFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations.])
+ AC_MSG_ERROR([pkg-config not found. Get pkg-config or set CUSTOM_GTK_CPPFLAGS and CUSTOM_GTK_LIBS to specify gtk header file and library locations.])
fi
else
# 'procps' package installed without 'libproc-dev' would lead to
# compilation errors down the line, so to avoid that we explicitly
# check for one of the libproc headers that is consumed in the build.
- if test -n "$CUSTOM_PROCPS_CFLAGS"; then
- PROCPS_CFLAGS="$CUSTOM_PROCPS_CFLAGS"
+ if test -n "$CUSTOM_PROCPS_CPPFLAGS"; then
+ PROCPS_CPPFLAGS="$CUSTOM_PROCPS_CPPFLAGS"
else
# XXX: Unfortunately, the libproc devel package doesn't appear
# to ship with a configuration script or pkg-config manifest
# file, so there's no portable way to get the location of its
# headers. For now we default to /usr/include.
- PROCPS_CFLAGS="-I/usr/include"
+ PROCPS_CPPFLAGS="-I/usr/include"
fi
- ORIGINAL_CFLAGS="$CFLAGS"
- CFLAGS="$PROCPS_CFLAGS $CFLAGS"
+ ORIGINAL_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$PROCPS_CPPFLAGS $CPPFLAGS"
AC_CHECK_HEADER(
[proc/sysinfo.h],
[],
[AC_MSG_ERROR(
[libproc headers not found. Please configure without procps (using --without-procps) or install libproc devel package])])
- CFLAGS="$ORIGINAL_CFLAGS"
+ CPPFLAGS="$ORIGINAL_CPPFLAGS"
fi
if test "$with_procps" != "yes"; then
[no])
if test "$DNET_CONFIG" != no; then
- DNET_CFLAGS="`$DNET_CONFIG --cflags`"
+ DNET_CPPFLAGS="`$DNET_CONFIG --cflags`"
DNET_LIBS="`$DNET_CONFIG --libs`"
GUESTD_LDADD="$GUESTD_LDADD $DNET_LIBS"
[no])
if test "$ICU_CONFIG" != no; then
- ICU_CFLAGS="`$ICU_CONFIG --cppflags` -DUSE_ICU"
+ ICU_CPPFLAGS="`$ICU_CONFIG --cppflags` -DUSE_ICU"
ICU_LIBS="`$ICU_CONFIG --ldflags`"
AC_CHECK_LIB([icuuc],
[$ICU_LIBS])
if test "$have_ICU_38" = "yes"; then
- ICU_CFLAGS="$ICU_CFLAGS -DHAVE_ICU_38"
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DHAVE_ICU_38"
fi
# Easier to give all modules the ICU defines/includes...
- COMMON_CFLAGS="$COMMON_CFLAGS $ICU_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
else
AC_MSG_ERROR(
[icu-config was not found on your PATH. Please configure without ICU (using --without-icu) or install ICU - http://www.icu-project.org])
fi
### General flags / actions
-COMMON_CFLAGS="$COMMON_CFLAGS -Wall"
-COMMON_CFLAGS="$COMMON_CFLAGS -Werror"
+CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Werror"
# -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' in Xlib.h on OpenSolaris.
for TEST_CFLAG in -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing \
[
return 0;
],
- [COMMON_CFLAGS="$COMMON_CFLAGS $TEST_CFLAG"
+ [CFLAGS="$CFLAGS $TEST_CFLAG"
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
CFLAGS="$ORIGINAL_CFLAGS"
done
-COMMON_CFLAGS="$COMMON_CFLAGS -DVMX86_TOOLS"
-COMMON_CFLAGS="$COMMON_CFLAGS -DNO_CORE_ICU"
+CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
+CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
-COMMON_CFLAGS="$COMMON_CFLAGS -I$INCLUDE_DIR"
+CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
### OS/arch-specific flags / actions
buildHgfsmounter=no
if test "$os" = "linux"; then
- COMMON_CFLAGS="$COMMON_CFLAGS -D_FILE_OFFSET_BITS=64"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_LARGEFILE64_SOURCE"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_XOPEN_SOURCE=500"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_BSD_SOURCE"
- COMMON_CFLAGS="$COMMON_CFLAGS -D_SVID_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+ CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE"
+ CPPFLAGS="$CPPFLAGS -D_SVID_SOURCE"
if test "$osVersion" -ge 202000; then
MODULES="$MODULES vmxnet vmmemctl"
fi
if test "$os" = "solaris"; then
- LIB_IMPERSONATE_CFLAGS="$LIB_IMPERSONATE_CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
- LIB_USER_CFLAGS="$LIB_USER_CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+ LIB_IMPERSONATE_CPPFLAGS="$LIB_IMPERSONATE_CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+ LIB_USER_CPPFLAGS="$LIB_USER_CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
GUESTD_LDADD="$GUESTD_LDADD -lsocket"
GUESTD_LDADD="$GUESTD_LDADD -lnsl"
- VMWARE_USER_CFLAGS="$VMWARE_USER_CFLAGS -I/usr/X11/include/"
+ VMWARE_USER_CPPFLAGS="$VMWARE_USER_CPPFLAGS -I/usr/X11/include/"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lXext"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lX11"
VMWARE_USER_LDADD="$VMWARE_USER_LDADD -lsocket"
# uname -r on Solaris 10 reports "5.10"
if test "$osVersion" -ge 510000; then
- COMMON_CFLAGS="$COMMON_CFLAGS -DSOL10"
+ CPPFLAGS="$CPPFLAGS -DSOL10"
fi
fi
fi
if test "$os$userSpaceBitness" = "linux64" || test "$HAVE_SYS_SETUID" = "yes"; then
- LIB_MISC_CFLAGS="$LIB_MISC_CFLAGS -DGLIBC_VERSION_21"
+ LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_21"
fi
if test "$HAVE_NEW_ICONV" = "yes"; then
- LIB_MISC_CFLAGS="$LIB_MISC_CFLAGS -DGLIBC_VERSION_22"
+ LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_22"
fi
if test "$HAVE_LSEEK" = "yes"; then
- LIB_FILE_CFLAGS="$LIB_FILE_CFLAGS -DGLIBC_VERSION_21"
- LIB_HGFS_SERVER_CFLAGS="$LIB_HGFS_SERVER_CFLAGS -DGLIBC_VERSION_21"
+ LIB_FILE_CPPFLAGS="$LIB_FILE_CPPFLAGS -DGLIBC_VERSION_21"
+ LIB_HGFS_SERVER_CPPFLAGS="$LIB_HGFS_SERVER_CPPFLAGS -DGLIBC_VERSION_21"
fi
if test "$HAVE_SETRESUID" = "yes"; then
- LIB_PROC_MGR_CFLAGS="$LIB_PROC_MGR_CFLAGS -DGLIBC_VERSION_23"
+ LIB_PROC_MGR_CPPFLAGS="$LIB_PROC_MGR_CPPFLAGS -DGLIBC_VERSION_23"
fi
if test "$HAVE_CRYPT" = "yes"; then
- LIB_AUTH_CFLAGS="$LIB_AUTH_CFLAGS -DGLIBC_VERSION_22"
+ LIB_AUTH_CPPFLAGS="$LIB_AUTH_CPPFLAGS -DGLIBC_VERSION_22"
fi
if test "$HAVE_WCHAR_H" = "yes"; then
- LIB_STRING_CFLAGS="$LIB_STRING_CFLAGS -DGLIBC_VERSION_22"
+ LIB_STRING_CPPFLAGS="$LIB_STRING_CPPFLAGS -DGLIBC_VERSION_22"
fi
### General substs
AC_SUBST([MODULES_OS])
AC_SUBST([MODULES])
-AC_SUBST([COMMON_CFLAGS])
-AC_SUBST([COMMON_PROG_CFLAGS])
AC_SUBST([COMMON_XLIBS])
-AC_SUBST([GTK_CFLAGS])
+AC_SUBST([GTK_CPPFLAGS])
AC_SUBST([GTK_LIBS])
-AC_SUBST([DNET_CFLAGS])
+AC_SUBST([DNET_CPPFLAGS])
AC_SUBST([DNET_LIBS])
-AC_SUBST([PROCPS_CFLAGS])
+AC_SUBST([PROCPS_CPPFLAGS])
AC_SUBST([PROCPS_LIBS])
-AC_SUBST([ICU_CFLAGS])
+AC_SUBST([ICU_CPPFLAGS])
AC_SUBST([ICU_LIBS])
### Lib substs
-AC_SUBST([LIB_AUTH_CFLAGS])
-AC_SUBST([LIB_FILE_CFLAGS])
-AC_SUBST([LIB_HGFS_SERVER_CFLAGS])
-AC_SUBST([LIB_IMPERSONATE_CFLAGS])
-AC_SUBST([LIB_MISC_CFLAGS])
-AC_SUBST([LIB_PROC_MGR_CFLAGS])
-AC_SUBST([LIB_STRING_CFLAGS])
-AC_SUBST([LIB_USER_CFLAGS])
+AC_SUBST([LIB_AUTH_CPPFLAGS])
+AC_SUBST([LIB_FILE_CPPFLAGS])
+AC_SUBST([LIB_HGFS_SERVER_CPPFLAGS])
+AC_SUBST([LIB_IMPERSONATE_CPPFLAGS])
+AC_SUBST([LIB_MISC_CPPFLAGS])
+AC_SUBST([LIB_PROC_MGR_CPPFLAGS])
+AC_SUBST([LIB_STRING_CPPFLAGS])
+AC_SUBST([LIB_USER_CPPFLAGS])
### Program substs
AC_SUBST([GUESTD_LDADD])
-AC_SUBST([VMWARE_USER_CFLAGS])
+AC_SUBST([VMWARE_USER_CPPFLAGS])
AC_SUBST([VMWARE_USER_LDADD])
###
### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
################################################################################
-###
-### This Makefile describes
-###
-
noinst_PROGRAMS = guestd
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
guestd_LDADD =
guestd_LDADD += ../lib/backdoor/libBackdoor.a
guestd_LDADD += ../lib/conf/libConf.a
### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
################################################################################
-###
-### This Makefile describes
-###
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @COMMON_CFLAGS@
# In the absence of the linker options --start-group and --end-group (which
# can't be put in LDADD), we need to bring the following libraries out of the
# alphabetical order so their symbols are properly resolved.
*
* We cannot link with winsock, since the DLL may not be present in all guests.
* That would create a dll link problem that would prevent the tools from loading.
- * Instead, we try to get the procedure pointer ourselves at runtime, and quietly
+ * Instead, we try to get the procedure pointer ourselves at runtime, and quietly
* fail if it is not there.
*-----------------------------------------------------------------------------
*/
int tolen);
typedef int (WSAAPI *SendSockOptProcType)(SOCKET s,
- int level,
- int optname,
+ int level,
+ int optname,
const void *optval,
socklen_t optlen);
#define VMToolsNet_FDIsSet FD_ISSET
#define VMToolsNet_Recvfrom recvfrom
-#endif
+#endif
Bool ForeignToolsMakeNonBlocking(int fd);
char *ipAddressStr = NULL;
char *destPtr;
char *endDestPtr;
- NicInfo nicInfo;
+ GuestNicInfo nicInfo;
#ifdef _WIN32
HMODULE hWs2_32 = NULL;
WSADATA wsaData;
VixSocketListenerPort);
/*
- * Find out how big the IP_ADAPTER_INFO table needs to be.
+ * Find out how big the IP_ADAPTER_INFO table needs to be.
*/
success = GuestInfoGetNicInfo(&nicInfo);
if (success) {
NicEntry *nicEntryPtr = NULL;
DblLnkLst_Links *nicEntryLink;
-
+
DblLnkLst_ForEach(nicEntryLink, &nicInfo.nicList) {
nicEntryPtr = DblLnkLst_Container(nicEntryLink, NicEntry, links);
destPtr += Str_Snprintf(destPtr,
"%s=%s;",
VIX_SLPV2_PROPERTY_MAC_ADDR,
nicEntryPtr->nicEntryProto.macAddress);
- }
+ }
GuestInfo_FreeDynamicMemoryInNicInfo(&nicInfo);
}
goto abort;
}
//success = ForeignToolsMakeNonBlocking(tcpListenerSocket);
- success = ForeignToolsSocketBind(tcpListenerSocket,
- INADDR_ANY,
+ success = ForeignToolsSocketBind(tcpListenerSocket,
+ INADDR_ANY,
VixSocketListenerPort);
if (!success) {
goto abort;
goto abort;
}
//success = ForeignToolsMakeNonBlocking(tcpListenerSocket);
- success = ForeignToolsSocketBind(udpListenerSocket,
- INADDR_ANY,
+ success = ForeignToolsSocketBind(udpListenerSocket,
+ INADDR_ANY,
SLPv2SocketListenerPort);
if (!success) {
goto abort;
}
- VMToolsNet_SetSockOpt(udpListenerSocket,
- SOL_SOCKET,
+ VMToolsNet_SetSockOpt(udpListenerSocket,
+ SOL_SOCKET,
SO_BROADCAST,
- (const void *) &bcast,
+ (const void *) &bcast,
sizeof(bcast));
#ifdef _WIN32
DWORD dwBytesReturned = 0;
BOOL bNewBehavior = FALSE;
DWORD status;
- status = VMToolsNet_WSAIoctl(udpListenerSocket,
+ status = VMToolsNet_WSAIoctl(udpListenerSocket,
SIO_UDP_CONNRESET,
- &bNewBehavior,
+ &bNewBehavior,
sizeof(bNewBehavior),
- NULL,
- 0,
+ NULL,
+ 0,
&dwBytesReturned,
- NULL,
+ NULL,
NULL);
if (SOCKET_ERROR == status) {
}
if (udpListenerSocket != -1) {
VMToolsNet_CloseSocket(udpListenerSocket);
udpListenerSocket = -1;
- }
+ }
} // ForeignToolsSelectLoop
}
}
-
+
VIX_ENTER_LOCK(&globalLock);
-
+
/*
* Allocate some state for the connection
*/
/*
* Read the message header.
*/
- result = VMToolsNet_Recv(connectionState->socket,
- (char *) &(connectionState->requestHeader),
+ result = VMToolsNet_Recv(connectionState->socket,
+ (char *) &(connectionState->requestHeader),
sizeof(connectionState->requestHeader),
0);
if (result <= 0) {
goto abort;
}
- connectionState->completeRequest
+ connectionState->completeRequest
= Util_SafeMalloc(connectionState->requestHeader.commonHeader.totalMessageLength);
memcpy(connectionState->completeRequest,
&(connectionState->requestHeader),
/*
* If this request has a variable-sized part, like a body or a user credential,
- * then start reading that. Otherwise, if the request only has a fixed-size header,
+ * then start reading that. Otherwise, if the request only has a fixed-size header,
* then we can start processing it now.
*/
if (connectionState->requestHeader.commonHeader.totalMessageLength > result) {
- result = VMToolsNet_Recv(connectionState->socket,
- connectionState->completeRequest + result,
+ result = VMToolsNet_Recv(connectionState->socket,
+ connectionState->completeRequest + result,
connectionState->requestHeader.commonHeader.totalMessageLength - result,
0);
if (result <= 0) {
responseHeader->responseFlags |= responseFlags;
- result = VMToolsNet_Send(connectionState->socket,
+ result = VMToolsNet_Send(connectionState->socket,
(const char *) responseHeader,
- totalMessageSize,
+ totalMessageSize,
0);
if (result <= 0) {
}
responseHeader->responseFlags |= responseFlags;
- result = VMToolsNet_Send(connectionState->socket,
+ result = VMToolsNet_Send(connectionState->socket,
(const char *) responseHeader,
- totalMessageSize,
+ totalMessageSize,
0);
if (result <= 0) {
}
char *replyPacket = NULL;
int replyPacketSize = 0;
- actualPacketLength = VMToolsNet_Recvfrom(udpListenerSocket,
- receiveBuffer,
+ actualPacketLength = VMToolsNet_Recvfrom(udpListenerSocket,
+ receiveBuffer,
sizeof(receiveBuffer),
0,
- (struct sockaddr *) &clientAddr,
+ (struct sockaddr *) &clientAddr,
&clientAddrLen);
if (actualPacketLength <= 0) {
goto abort;
"", // LDAPv3 predicate
&xid);
if (match) {
- Str_Sprintf(urlBuffer,
- sizeof urlBuffer,
- "%s://%s/",
+ Str_Sprintf(urlBuffer,
+ sizeof urlBuffer,
+ "%s://%s/",
VIX_SLPV2_SERVICE_NAME_TOOLS_SERVICE,
globalHostName);
success = SLPv2MsgAssembler_ServiceReply(&replyPacket,
* for more responses.
*/
if (NULL != replyPacket) {
- VMToolsNet_Sendto(udpListenerSocket,
- replyPacket,
+ VMToolsNet_Sendto(udpListenerSocket,
+ replyPacket,
replyPacketSize,
0, // flags
- (struct sockaddr *) &clientAddr,
+ (struct sockaddr *) &clientAddr,
clientAddrLen);
}
/*
* It's possible that data on a connection arrives late, after we have
- * closed it. In that case, VMAutomationReceiveMessage will correctly
+ * closed it. In that case, VMAutomationReceiveMessage will correctly
* not process the data. But, be careful that we don't try to close
* the connection again.
*/
ForeignToolsDiscardCommand(command);
}
-
+
command = nextCommand;
} // while (NULL != command)
localAddr.sin_addr.s_addr = VMToolsNet_htonl(INADDR_ANY);
localAddr.sin_port = VMToolsNet_htons(SLPv2SocketListenerPort);
- VMToolsNet_Sendto(udpListenerSocket,
- packet,
+ VMToolsNet_Sendto(udpListenerSocket,
+ packet,
sizeof(packet),
0, // flags
- (struct sockaddr *) &localAddr,
+ (struct sockaddr *) &localAddr,
sizeof(localAddr));
} // ForeignToolsWakeSelectThread
#include <sys/wait.h>
#include <errno.h>
#include <stdlib.h>
-#if !defined(__FreeBSD__) && !defined(sun)
-#include <utmp.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/ioctl.h>
-#include <linux/vt.h>
-#include <dirent.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
#include "vmware.h"
#if !defined(__FreeBSD__) && !defined(sun)
#include "socketMgr.h"
-#include "dnd.h"
#endif
/* Header to get prototype of daemon() implementation for Solaris. */
# endif
#endif
-#if !defined(__FreeBSD__) && !defined(sun)
-#define VMWAREUSER_CHECK_TIME 1000 /* 10 seconds */
-#define XAUTOSTART_CONF "xautostart.conf"
-#define NR_XBLESSED_APP_DEFAULT 2
-/* Default blessed app for gnome. */
-#define XBLESSED_APP1_DEFAULT "gnome-panel"
-/*
- * Default blessed app for KDE. Only a few apps can be chosen, because most
- * X apps, like kicker, are loaded by kdeinit with empty environ. ksmserver
- * is KDE session manager and has environ.
- */
-#define XBLESSED_APP2_DEFAULT "ksmserver"
-#endif
/*
* All signals that:
* . Can terminate the process
* Global variables
*/
-#if !defined(__FreeBSD__) && !defined(sun)
-static const char *gBinDir;
-static char *gDefaultBlessedApp[] = {
- XBLESSED_APP1_DEFAULT,
- XBLESSED_APP2_DEFAULT,
-};
-typedef struct blessedAppNode {
- char *name;
- struct blessedAppNode *next;
-} blessedAppNode;
-#endif
/*
* What a pity that the signal API doesn't allow to pass a clientData
#endif /* VM_GUESTD_MOUNTS_HGFS */
-#if !defined(__FreeBSD__) && !defined(sun)
-/*
- *----------------------------------------------------------------------
- *
- * GuestdInitBlessedAppList --
- *
- * Initialize blessed app list.
- *
- * Results:
- * Head of blessed app list.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-static blessedAppNode*
-GuestdInitBlessedAppList(char *name)
-{
- blessedAppNode *head;
- head = Util_SafeMalloc(sizeof *head);
- head->name = name;
- head->next = NULL;
- return head;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GuestdAddBlessedAppNode --
- *
- * Add a node to end of the blessed app list.
- *
- * Results:
- * None.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-static void
-GuestdAddBlessedAppNode(blessedAppNode *head, char *name)
-{
- ASSERT(head);
- while (head->next) {
- head = head->next;
- }
- head->next = Util_SafeMalloc(sizeof *head);
- head = head->next;
- head->name = name;
- head->next = NULL;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GuestdFreeBlessedAppList --
- *
- * Free blessed app list.
- *
- * Results:
- * None.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-static void
-GuestdFreeBlessedAppList(blessedAppNode *head)
-{
- blessedAppNode *cur = head;
- while (cur) {
- head = cur->next;
- free(cur->name);
- free(cur);
- cur = head;
- }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GuestdGetBlessedApp --
- *
- * Try to get blessed app list from X autostart conf file. The conf
- * is used to set blessed file list, which is used to check if X is
- * loaded or not. Blessed file lists for different X distro are
- * not same. If failed, try to get default list.
- *
- * Results:
- * Blessed app name list if any, NULL otherwise.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-static blessedAppNode*
-GuestdGetBlessedAppList(void)
-{
- FILE* confFile = NULL;
- char *fileName = NULL;
- char *fileNameUtf8 = NULL;
- char *installPath = GuestApp_GetInstallPath();
- char *appName = NULL;
- size_t myLineLen;
- int index;
- blessedAppNode *ret = NULL;
-
- if (installPath == NULL) {
- Debug("GuestdGetBlessedAppList: Unable to get install path\n");
- goto exit;
- }
-
- fileNameUtf8 = Str_Asprintf(NULL, "%s"DIRSEPS"%s", installPath, XAUTOSTART_CONF);
- free(installPath);
- if (NULL == fileNameUtf8) {
- Debug("GuestdGetBlessedAppList: Unable to allocate memory\n");
- goto exit;
- }
-
- if (!CodeSet_Utf8ToCurrent(fileNameUtf8,
- strlen(fileNameUtf8),
- (char **)&fileName,
- NULL)) {
- Debug("GuestdGetBlessedAppList: Unable to convert to current encoding\n");
- goto exit;
- }
- confFile = fopen(fileName, "r");
- free(fileName);
- if (NULL == confFile) {
- /* If can not open conf file, use default value. */
- Debug("GuestdGetBlessedAppList: Unable to open conf file, use default value.\n");
- goto default_exit;
- }
-
- while (TRUE) {
- switch (StdIO_ReadNextLine(confFile, &appName, 0, &myLineLen)) {
- case StdIO_Error:
- Debug("GuestdGetBlessedAppList: Unable to read conf file, use default value.\n");
- goto default_exit;
-
- case StdIO_EOF:
- goto exit;
-
- case StdIO_Success:
- if (ret == NULL) {
- ret = GuestdInitBlessedAppList(appName);
- } else {
- GuestdAddBlessedAppNode(ret, appName);
- }
- break;
-
- default:
- NOT_IMPLEMENTED();
- }
- }
- NOT_REACHED();
-
-default_exit:
- if (ret != NULL) {
- GuestdFreeBlessedAppList(ret);
- ret = NULL;
- }
- for (index = 0; index < NR_XBLESSED_APP_DEFAULT; index++) {
- appName = Str_Asprintf(NULL, "%s", gDefaultBlessedApp[index]);
- if (appName == NULL) {
- Debug("GuestdGetBlessedAppList: Unable to allocate memory\n");
- goto exit;
- }
- if (ret == NULL) {
- ret = GuestdInitBlessedAppList(appName);
- } else {
- GuestdAddBlessedAppNode(ret, appName);
- }
- }
-exit:
- free(fileNameUtf8);
- if (confFile) {
- fclose(confFile);
- }
- return ret;
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestdGetAppEnv --
- *
- * Get an environ string from environ table.
- *
- * Results:
- * Environ string if found, NULL otherwise.
- *
- * Side effects:
- * None.
- *
- *-----------------------------------------------------------------------------
- */
-
-static char *
-GuestdGetAppEnv(pid_t pid, // IN: app pid;
- const char *envName) // IN: env variable name
-{
- char *fileName = NULL;
- FILE *envFile;
- char buffer[65536];
- size_t readSize;
- unsigned int index = 0;
- char *ret = NULL;
-
- fileName = Str_Asprintf(NULL, "/proc/%d/environ", pid);
- if (NULL == fileName) {
- Debug("GuestdGetAppEnv: Unable to allocate memory\n");
- return ret;
- }
- envFile = fopen(fileName, "r");
- if (NULL == envFile) {
- /*
- * We may not be able to open the file due to the security reason.
- */
- Debug("GuestdGetAppEnv: Unable to open env file for %s.\n", fileName);
- free(fileName);
- return ret;
- }
-
- readSize = fread(buffer, 1, sizeof buffer, envFile);
-
- /* Separator in environ is '\0'. */
- while (index < readSize) {
- if (!strncmp(&buffer[index], envName, strlen(envName))) {
- ret = Str_Asprintf(NULL, "%s", &buffer[index]);
- break;
- }
- index += strlen(&buffer[index]) + 1;
- }
- free(fileName);
- fclose(envFile);
- return ret;
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestdGetAppDisplay --
- *
- * Get app $DISPLAY from environ.
- *
- * Results:
- * $DISPALY if any, -1 otherwise.
- *
- * Side effects:
- * None.
- *
- *-----------------------------------------------------------------------------
- */
-
-static int
-GuestdGetAppDisplay(pid_t pid) // IN: app pid
-{
- int ret = -1;
- int display;
-
- char *env = GuestdGetAppEnv(pid, "DISPLAY");
- if (env) {
- if (sscanf(env, "DISPLAY=:%d.", &display) == 1) {
- ret = display;
- }
- free(env);
- }
- return ret;
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestdGetActiveXDisplay --
- *
- * Get active X display. Call the VT_GETSTATE ioctl on /dev/tty0 or
- * /dev/vc/0, this returns the current VT number. Then Iterate all X in
- * /tmp/.X#-lock, and get all X PIDs. For each XPID, Iterate the X server's
- * file descriptors in /proc/<PID>/fd/ looking for open /dev/tty# devices.
- * Compare the current VT and tty#, find out active $DISPLAY.
- *
- * Results:
- * Active X display, -1 otherwise.
- *
- * Side effects:
- * None
- *
- *-----------------------------------------------------------------------------
- */
-
-static int
-GuestdGetActiveXDisplay(void)
-{
- char fileName[PATH_MAX];
- FILE *xPidFile = NULL;
- pid_t xPid = 0;
- int tty;
- int display;
- struct vt_stat state;
- DIR *tmpdir = NULL;
- struct dirent *tmpent;
- char linkName[PATH_MAX];
- char ttyName[32];
- char vcName[32];
- char *dirName = NULL;
- int ret = -1;
-
- /*
- * Call the VT_GETSTATE ioctl on /dev/tty0 or /dev/vc/0, this returns the
- * current VT number.
- */
- tty = open("/dev/tty0", O_RDONLY);
- if (tty < 0) {
- tty = open("/dev/vc/0", O_RDONLY);
- }
-
- if (tty < 0) {
- Debug("GuestdGetActiveXDisplay: Cannot get current tty\n");
- goto exit;
- }
-
- if (ioctl(tty, VT_GETSTATE, &state) < 0) {
- Debug("GuestdGetActiveXDisplay: Cannot get state info for tty\n");
- close(tty);
- goto exit;
- }
- close(tty);
-
- Str_Sprintf(ttyName, sizeof(ttyName), "/dev/tty%u", state.v_active);
- Str_Sprintf(vcName, sizeof(vcName), "/dev/vc/%u", state.v_active);
- Debug("GuestdGetActiveXDisplay: active tty is %d\n", state.v_active);
-
- /* Try to get all X PIDs from /tmp/.X#-lock. */
- tmpdir = opendir("/tmp");
- if (NULL == tmpdir) {
- Debug("GuestdGetActiveXDisplay: Unable to open /tmp\n");
- goto exit;
- }
-
- while ((tmpent = readdir(tmpdir))) {
- int res = sscanf(tmpent->d_name, ".X%u%s", &display, fileName);
- if ((res == 2) && (strncmp(fileName, "-lock", 5) == 0)) {
- DIR *xdir;
- struct dirent *xent;
-
- Str_Snprintf(fileName, sizeof fileName, "/tmp/%s", tmpent->d_name);
- xPidFile = fopen(fileName, "r");
- if (xPidFile) {
- fscanf(xPidFile, "%"FMTPID"\n", &xPid);
- fclose(xPidFile);
- } else {
- Debug("GuestdGetActiveXDisplay: Cannot get current X pid.\n");
- goto exit;
- }
-
- /*
- * Iterate the X server's file descriptors in /proc/<PID>/fd/ looking
- * for open /dev/tty# devices.
- */
- dirName = Str_Asprintf(NULL, "/proc/%d/fd", xPid);
- if (NULL == dirName) {
- Debug("GuestdGetActiveXDisplay: Unable to allocate memory\n");
- goto exit;
- }
- xdir = opendir(dirName);
-
- if (NULL == xdir) {
- Debug("GuestdGetActiveXDisplay: Unable to open %s\n", dirName);
- free(dirName);
- goto exit;
- }
- free(dirName);
-
- while ((xent = readdir(xdir))) {
- Str_Snprintf(fileName, sizeof fileName, "/proc/%u/fd/%s",
- xPid, xent->d_name);
- memset(linkName, 0, sizeof linkName);
- readlink(fileName, linkName, sizeof linkName);
- if ((strcmp(linkName, ttyName) == 0) ||
- (strcmp(linkName, vcName) == 0)) {
- closedir(xdir);
- ret = display;
- goto exit;
- }
- }
- closedir(xdir);
- }
- }
-exit:
- if (tmpdir) {
- closedir(tmpdir);
- }
- return ret;
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestdRunVMwareUser --
- *
- * Run vmware-user as "foundUser" with environ from blessedPid. We do this
- * so that we get a reasonable login environment for "foundUser". We take
- * care to shell escape the username.
- *
- * Results:
- * None.
- *
- * Side effects:
- * May start vmware-user. Because it is running is a separated process,
- * in any case it will exit.
- *
- *-----------------------------------------------------------------------------
- */
-
-static void
-GuestdRunVMwareUser(pid_t blessedPid) // IN: blessed pid
-{
- char *fileName = NULL;
- char *xauth = NULL;
- Bool isXauthSet = FALSE;
- FILE *envFile = NULL;
- char buffer[65536];
- size_t readSize;
- char *cmd;
- struct passwd *pwd;
- unsigned int index = 0;
- int blockFd;
- struct stat sb;
- int envFd = -1;
-
- /*
- * If current active account is non-root, vmware-user can not initialize
- * blocking driver for host->guest file copy paste. So open here before
- * setuid and pass fd to vmware-user.
- */
- blockFd = DnD_InitializeBlocking();
- if (blockFd < 0) {
- Debug("GuestdRunVMwareUser: Unable to initialize block driver.\n");
- }
-
- /* Try to get user from blessed pid's environ. */
- fileName = Str_Asprintf(NULL, "/proc/%d/environ", blessedPid);
- if (NULL == fileName) {
- Debug("GuestdRunVMwareUser: Unable to allocate memory\n");
- goto childerror;
- }
- envFile = fopen(fileName, "r");
- if (NULL == envFile) {
- /*
- * We may not be able to open the file due to the security reason.
- */
- Debug("GuestdRunVMwareUser: Unable to open env file for %s\n", fileName);
- goto childerror;
- }
-
- readSize = fread(buffer, 1, sizeof buffer, envFile);
-
- /*
- * Rather than consulting the user's USER environment variable, assume we
- * can instead trust procfs's file permissions to determine processes'
- * owners.
- */
- if ((envFd = fileno(envFile)) == -1) {
- Debug("GuestdRunVMwareUser: Unable to convert FILE * to descriptor\n");
- goto childerror;
- }
-
- if (fstat(envFd, &sb) == -1) {
- Debug("GuestdRunVMwareUser: Unable to lookup environment details\n");
- goto childerror;
- }
-
- /*
- * At this point, we're finished with these, so go ahead and release them before
- * executing vmware-user.
- */
- free(fileName);
- fileName = NULL;
-
- fclose(envFile);
- envFile = NULL;
-
- /* Switch from root to Xsession user. */
- pwd = getpwuid(sb.st_uid);
- if (pwd == NULL) {
- Debug("GuestdRunVMwareUser: Unable to lookup account for uid %u\n", sb.st_uid);
- goto childerror;
- }
-
- if (setgid(pwd->pw_gid) != 0) {
- Debug("GuestdRunVMwareUser: Unable to setgid for %s\n", pwd->pw_name);
- goto childerror;
- }
-
- if (setuid(pwd->pw_uid) != 0) {
- Debug("GuestdRunVMwareUser: Unable to setuid for %s\n", pwd->pw_name);
- goto childerror;
- }
-
- /* Set env. Separator in environ is '\0'. */
- index = 0;
- while (index < readSize) {
- if (putenv((char *)&buffer[index]) != 0) {
- Debug("GuestdRunVMwareUser: Unable to putenv: %s\n", &buffer[index]);
- goto childerror;
- }
- if (!strncmp(&buffer[index], "HOME=", 5)) {
- xauth = Str_Asprintf(NULL, "XAUTHORITY=%s/.Xauthority", &buffer[index + 5]);
- }
- if (!strncmp(&buffer[index], "XAUTHORITY=", 11)) {
- isXauthSet = TRUE;
- }
- index += strlen(&buffer[index]) + 1;
- }
-
- /* In KDE XAUTHORITY may not be set, so set it to default value. */
- if (!isXauthSet) {
- if (!xauth || (putenv(xauth) != 0)) {
- Debug("GuestdRunVMwareUser: Unable to putenv for xauth\n");
- goto childerror;
- }
- }
- free(xauth);
- xauth = NULL;
-
- /* Load vmware-user. */
- cmd = Str_Asprintf(NULL, "%s/vmware-user", gBinDir);
- if (cmd == NULL) {
- Debug("GuestdRunVMwareUser unable to allocate \"cmd\"\n");
- goto childerror;
- }
- Debug("GuestdRunVMwareUser: Run cmd \"%s\"\n", cmd);
-
- Str_Sprintf(buffer, sizeof buffer, "%d", blockFd);
- execl(cmd, cmd, ">/dev/null", "2>&1", "-blockFd", buffer, NULL);
- Debug("GuestdRunVMwareUser: Cannot run cmd \"%s\"\n", cmd);
-
- /* We should only get here from a goto. */
-childerror:
- free(xauth);
- free(fileName);
- if (envFile != NULL) {
- fclose(envFile);
- }
- if (blockFd >= 0 && !DnD_UninitializeBlocking(blockFd)) {
- Debug("GuestdRunVMwareUser unable to uninitialize blocking.\n");
- }
- exit(1);
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestdCheckVMwareUser --
- *
- * EventManager callback function that checks up on the vmware-user process.
- * If a user is logged in to the active X disaply, vmware-user should be
- * running. If no active one, vmware-user should NOT be running.
- *
- * Results:
- * TRUE. If we return FALSE, the event manager falls over.
- *
- * Side effects:
- * May start or kill vmware-user.
- *
- *-----------------------------------------------------------------------------
- */
-
-static Bool
-GuestdCheckVMwareUser(void *clientData) // IN/OUT: vmware-user's pid
-{
- pid_t *pid = (pid_t *)clientData;
- pid_t blessedPid = 0;
- char *blessedApp = NULL;
- char *blessedUser = NULL;
- char *userUser = NULL;
- char processName[256];
- int iProc = 0;
- int activeDisplay = -1;
- int userDisplay = -1;
- uint32 period = VMWAREUSER_CHECK_TIME;
- blessedAppNode *appList;
- blessedAppNode *cur;
- ProcMgr_ProcList *procList;
-
-
- /* Get active X Window $DISPLAY. */
- activeDisplay = GuestdGetActiveXDisplay();
- Debug("GuestdCheckVMwareUser: Get active x display %d\n", activeDisplay);
-
- /* Get process list. */
- procList = ProcMgr_ListProcesses();
- if (procList == NULL) {
- Debug("GuestdCheckVMwareUser: Could not get process listing\n");
- return FALSE;
- }
-
- /* Get vmware-user id. If not existing, set to 0. */
- *pid = 0;
- for (iProc = procList->procCount - 1; iProc >= 0; iProc--) {
- Util_GetProcessName(procList->procIdList[iProc],
- processName,
- sizeof processName);
- if (strcmp(processName, "vmware-user") == 0) {
- *pid = procList->procIdList[iProc];
- userDisplay = GuestdGetAppDisplay(*pid);
- break;
- }
- }
- Debug("GuestdCheckVMwareUser: vmware-user pid is %d\n", *pid);
- if (activeDisplay < 0) {
- goto stopVMwareUser;
- }
-
- if (activeDisplay == userDisplay) {
- goto exit;
- }
-
- if (*pid > 0) {
- userUser = GuestdGetAppEnv(*pid, "USER");
- }
-
- /*
- * Get blessed app list, then check if any app is up. App's $DISPLAY
- * should also be same as active X display.
- */
- appList = GuestdGetBlessedAppList();
- cur = appList;
- while (cur) {
- blessedApp = cur->name;
- Debug("GuestdCheckVMwareUser: Got blessed app %s\n", blessedApp);
- for (iProc = procList->procCount - 1; iProc >= 0; iProc--) {
- Util_GetProcessName(procList->procIdList[iProc],
- processName,
- sizeof processName);
- if ((strcmp(processName, blessedApp) == 0) &&
- (GuestdGetAppDisplay(procList->procIdList[iProc]) == activeDisplay)) {
- blessedPid = procList->procIdList[iProc];
- break;
- }
- }
- /* If any app started, start vmware-user. */
- if (blessedPid > 0) {
- break;
- }
- cur = cur->next;
- }
- GuestdFreeBlessedAppList(appList);
-
- Debug("GuestdCheckVMwareUser: got blessed pid %d\n", blessedPid);
- if (blessedPid == 0) {
- goto stopVMwareUser;
- }
-
- if (*pid == 0) {
- /*
- * There is a active X session and vmware-user isn't running,
- * we should start it with fork/exec.
- */
- *pid = fork();
- if (*pid == -1) {
- Debug("GuestdCheckVMwareUser: Unable to fork: %s.\n\n", strerror(errno));
- /*
- * Reset pid to 0, maybe we'll be able to fork next time around
- */
- *pid = 0;
- } else if (*pid == 0) {
- /* Child. This function will not return. */
- GuestdRunVMwareUser(blessedPid);
- } else {
- /*
- * This is the parent after the fork. The parent doesn't need to do
- * anything special since the child's pid is already recorded. I left this
- * comment here anyway as a placeholder.
- */
- }
- } else {
- blessedUser = GuestdGetAppEnv(blessedPid, "USER");
- if ((strcmp(userUser, blessedUser) != 0) ||
- (userDisplay != activeDisplay)) {
- /*
- * vmware-user's user name is not right one, or display does match active
- * X display so kill current vmware-user and start another one soon.
- */
- period /= 10;
- goto stopVMwareUser;
- }
- }
- goto exit;
-
-stopVMwareUser:
- if (*pid != 0) {
- Debug("GuestdCheckVMwareUser: Killing vmware-user.\n");
- kill(*pid, SIGTERM);
- *pid = 0;
- }
-
-exit:
- free(userUser);
- free(blessedUser);
- ProcMgr_FreeProcList(procList);
- EventManager_Add(ToolsDaemonEventQueue, period,
- GuestdCheckVMwareUser, clientData);
- return TRUE;
-}
-#endif
-
-
/*
*-----------------------------------------------------------------------------
*
int *gDaemonSignalPtr) // IN/OUT
{
Bool guestInfoEnabled = FALSE;
-#if !defined(__FreeBSD__) && !defined(sun)
- pid_t vmwareuserPid = 0;
-#endif
ToolsDaemon_Data *data = NULL;
VmBackupSyncProvider *syncProvider = NULL;
GuestApp_GetDictEntryBool(*pConfDict, CONFNAME_DISABLEQUERYDISKINFO));
}
-#if !defined(__FreeBSD__) && !defined(sun)
- gBinDir = GuestApp_GetDictEntry(*pConfDict, CONFNAME_BINDIR);
- if (gBinDir == NULL) {
- gBinDir = "/usr/bin";
- }
- /*
- * This function will add itself to the event manager
- */
- GuestdCheckVMwareUser(&vmwareuserPid);
-#endif
-
/*
* Start listening for VMX requests to create the upgrader.
*/
ToolsDaemon_Cleanup(data);
}
-#if !defined(__FreeBSD__) && !defined(sun)
- if (vmwareuserPid != 0) {
- kill(vmwareuserPid, SIGTERM);
- }
-#endif
-
if (syncProvider != NULL) {
VmBackup_Shutdown(data->in);
}
noinst_PROGRAMS = hgfsclient
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
hgfsclient_LDADD =
hgfsclient_LDADD += ../lib/conf/libConf.a
hgfsclient_LDADD += ../lib/guestApp/libGuestApp.a
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @COMMON_CFLAGS@
# In the absence of the linker options --start-group and --end-group (which can't
# be put in LDADD), we need to bring the following libraries out of the alphebetical
# order so their symbols are properly resolved.
noinst_PROGRAMS = hgfsmounter
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
hgfsmounter_LDADD =
hgfsmounter_LDADD += ../lib/string/libString.a
hgfsmounter_LDADD += ../lib/strUtil/libStrUtil.a
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @COMMON_CFLAGS@
hgfsmounter_LDADD = ../lib/string/libString.a \
../lib/strUtil/libStrUtil.a
hgfsmounter_SOURCES = hgfsmounter.c stub.c
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
libSLPv2Parser_a_SOURCES += SLPv2MsgParser.c
libSLPv2Parser_a_SOURCES += SLPv2Match.c
libSLPv2Parser_a_SOURCES += SLPv2MsgAssembler.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libSLPv2Parser.a
libSLPv2Parser_a_SOURCES = SLPv2MsgParser.c SLPv2Match.c \
SLPv2MsgAssembler.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libAuth_a_SOURCES =
libAuth_a_SOURCES += authPosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_AUTH_CFLAGS@
+AM_CFLAGS = @LIB_AUTH_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libAuth.a
libAuth_a_SOURCES = authPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_AUTH_CFLAGS@
+AM_CFLAGS = @LIB_AUTH_CPPFLAGS@
all: all-am
.SUFFIXES:
libBackdoor_a_SOURCES += backdoorGcc64.c
endif
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libBackdoor.a
libBackdoor_a_SOURCES = backdoor.c $(am__append_1) $(am__append_2)
-AM_CFLAGS = @COMMON_CFLAGS@
SUBDIRS = shared
all: all-recursive
else
libBackdoor_la_SOURCES += ../backdoorGcc64.c
endif
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libBackdoor.la
libBackdoor_la_SOURCES = ../backdoor.c $(am__append_1) $(am__append_2)
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libConf_a_SOURCES =
libConf_a_SOURCES += conf.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libConf.a
libConf_a_SOURCES = conf.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libDeployPkg_a_SOURCES += deployPkgLog.c
libDeployPkg_a_SOURCES += deployPkg.c
libDeployPkg_a_SOURCES += runDeployPkgPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libDeployPkg.a
libDeployPkg_a_SOURCES = deployPkgLog.c deployPkg.c \
runDeployPkgPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
int i = 0;
char *dir = NULL;
char *newDir = NULL;
- char *utf8Dir = NULL;
Bool found = FALSE;
/*
Warning("DeployPkgGetTempDir Could not create temp directory\n");
goto exit;
}
-
- /* Convert newDir to utf8. */
- if (!CodeSet_CurrentToUtf8(newDir,
- strlen(newDir),
- &utf8Dir,
- NULL)) {
- Warning("DeployPkgGetTempDir CodeSet_CurrentToUtf8 failed\n");
- goto exit;
- }
exit:
free(dir);
- free(newDir);
- return utf8Dir;
+ return newDir;
}
noinst_LIBRARIES = libDict.a
-libDict_a_SOURCES =
+libDict_a_SOURCES =
libDict_a_SOURCES += dictll.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libDict.a
libDict_a_SOURCES = dictll.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libDnd_a_SOURCES =
libDnd_a_SOURCES += dndCommon.c
libDnd_a_SOURCES += dndLinux.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libDnd.a
libDnd_a_SOURCES = dndCommon.c dndLinux.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
noinst_LIBRARIES = libErr.a
-libErr_a_SOURCES =
+libErr_a_SOURCES =
libErr_a_SOURCES += err.c
libErr_a_SOURCES += errPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libErr.a
libErr_a_SOURCES = err.c errPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libEventManager_a_SOURCES =
libEventManager_a_SOURCES += eventManager.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libEventManager.a
libEventManager_a_SOURCES = eventManager.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libFile_a_SOURCES += fileLockPrimitive.c
libFile_a_SOURCES += fileLockPosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libFile.a
libFile_a_SOURCES = file.c filePosix.c fileIO.c fileIOPosix.c \
fileLockPrimitive.c fileLockPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
all: all-am
.SUFFIXES:
{
#if defined(VMX86_SERVER)
char *canPath;
+ char *existPath;
- canPath = Posix_RealPath(path);
+ existPath = FilePosixNearestExistingAncestor(path);
+ canPath = Posix_RealPath(existPath);
+ free(existPath);
if (canPath == NULL) {
return NULL;
char canPath[FILE_MAXPATH];
char canPath2[FILE_MAXPATH];
unsigned int retries = 0;
+ char *realPath;
#endif
existPath = FilePosixNearestExistingAncestor(path);
- if (!existPath) {
- return NULL;
- }
#if defined(__APPLE__)
failed = statfs(existPath, &buf) == -1;
return Util_SafeStrdup(buf.f_mntfromname);
#else
- failed = !realpath(existPath, canPath);
+ realPath = Posix_RealPath(existPath);
free(existPath);
- if (failed) {
+
+ if (realPath == NULL) {
return NULL;
}
+ Str_Strcpy(canPath, realPath, sizeof canPath);
+ free(realPath);
retry:
Str_Strcpy(canPath2, canPath, sizeof canPath2);
if (*diff != '\0') {
Str_Sprintf(canPath, sizeof canPath, "%s%s",
- strlen(ptr) > 1 ? ptr : "",
- diff);
+ strlen(ptr) > 1 ? ptr : "", diff);
} else {
Str_Strcpy(canPath, ptr, sizeof canPath);
}
* have any number of non-existing components at its end.
*
* Results:
- * On success: The allocated, NUL-terminated, non-empty path of the
- * nearest existing ancestor.
- * On failure: NULL.
+ * The allocated, NUL-terminated, non-empty path of the
+ * nearest existing ancestor.
*
* Side effects:
* None
libFoundryMsg_a_SOURCES += foundryThreads.c
libFoundryMsg_a_SOURCES += foundryPropertyListCommon.c
libFoundryMsg_a_SOURCES += vixTranslateErrOpenSource.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libFoundryMsg.a
libFoundryMsg_a_SOURCES = foundryMsg.c foundryThreads.c \
foundryPropertyListCommon.c vixTranslateErrOpenSource.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libghIntegrationStub_a_SOURCES =
libghIntegrationStub_a_SOURCES += ghIntegrationStub.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libghIntegrationStub.a
libghIntegrationStub_a_SOURCES = ghIntegrationStub.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
all: all-am
.SUFFIXES:
libGuestApp_a_SOURCES =
libGuestApp_a_SOURCES += guestApp.c
libGuestApp_a_SOURCES += guestAppPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libGuestApp.a
libGuestApp_a_SOURCES = guestApp.c guestAppPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
}
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestApp_RpcSendOneUtf8 --
- *
- * Wrapper for RpcOut_SendOneRaw. Sends a single RPCI command with a single string
- * argument. The argument will be UTF-8 encoded and sent safely over the backdoor.
- * This used instead of RpcOut_SendOne because that function uses Str_Asprintf
- * which uses FormatMessage. FormatMessage would interpret the utf8 encoded arg
- * as being in the current locale and corrupts the string. This is used for
- * commands which pass file paths over the backdoor.
- *
- * Results:
- * TRUE on success.
- * FALSE on error.
- *
- * Side effects:
- * None.
- *
- *-----------------------------------------------------------------------------
- */
-
-Bool
-GuestApp_RpcSendOneUtf8(char const *cmd, // IN: RPCI command
- char const *arg, // IN: string arg to be Utf8 encoded
- size_t argSize) // IN: size of arg
-{
- char *utf8Name;
- size_t utf8NameSize;
- char *rpcMessage;
- size_t messageSize;
-
- ASSERT(cmd);
- ASSERT(arg);
-
- if (!CodeSet_CurrentToUtf8(arg, argSize,
- &utf8Name, &utf8NameSize)) {
- Debug("GuestApp_RpcSendOneUtf8: error failed to convert arg to utf8\n");
- return FALSE;
- }
-
- messageSize = strlen(cmd) + 1 + utf8NameSize + 1;
- rpcMessage = (char *)malloc(messageSize);
- if (!rpcMessage) {
- Debug("GuestApp_RpcSendOneUtf8: Error, out of memory\n");
- free(utf8Name);
- return FALSE;
- }
-
- Str_Strcpy(rpcMessage, cmd, messageSize);
- Str_Strcat(rpcMessage, " ", messageSize);
- Str_Strcat(rpcMessage, utf8Name, messageSize);
- free(utf8Name);
-
- Debug("GuestApp_RpcSendOneUtf8: about to send rpc message = *%s*, len = %"FMTSZ"d\n",
- rpcMessage, messageSize);
- if (!RpcOut_SendOneRaw(rpcMessage, messageSize, NULL, NULL)) {
- Debug("GuestApp_RpcSendOneUtf8: Failed to send message to host\n");
- free(rpcMessage);
- return FALSE;
- } else {
- Debug("GuestApp_RpcSendOneUtf8: sent rpc message");
- }
-
- free(rpcMessage);
- return TRUE;
-}
-
-
#if !defined(N_PLAT_NLM)
/*
*----------------------------------------------------------------------------
*
- * GuestApp_RpcSendOneUtf8CPName --
+ * GuestApp_RpcSendOneArgCPName --
*
- * Wrapper for GuestApp_RpcSendOneCPName to enable both UTF-8 and CPName
- * conversions. Sends a single RPCI command with arg UTF-8 encoded and
- * cpNameArg both UTF-8 and CPName encoded.
+ * Wrapper for GuestApp_RpcSendOneCPName with an extra argument. Sends a
+ * single RPCI command with arg and cpNameArg both in UTF-8 encodeding.
*
- * The UTF-8 encoded string is optional so that one can send a single UTF-8
+ * The UTF-8 encoded arg is optional so that one can send a single UTF-8
* and CPName encoded string using this function.
*
* Note that the UTF-8 string always preceeds the UTF-8 & CPName string in
*/
Bool
-GuestApp_RpcSendOneUtf8CPName(char const *cmd, // IN: RPCI command
- char const *arg, // IN: to UTF8 encode
- size_t argSize, // IN: size of arg
- char delimiter, // IN: arg/cpNameArg delim.
- char const *cpNameArg, // IN: to UTF8/CPName encode
- size_t cpNameArgSize) // IN: size of cpNameArg
+GuestApp_RpcSendOneArgCPName(char const *cmd, // IN: RPCI command
+ char const *arg, // IN: UTF-8 encoded string
+ size_t argSize, // IN: size of arg
+ char delimiter, // IN: arg/cpNameArg delim.
+ char const *cpNameArg, // IN: UTF-8 encoded CPName
+ size_t cpNameArgSize) // IN: size of cpNameArg
{
- size_t utf8cpNameArgSize;
- char *utf8cpNameArg;
Bool ret = FALSE;
ASSERT(cmd);
ASSERT(cpNameArg);
- /* UTF-8 encode cpNameArg */
Debug("GuestApp_RpcSendOneUtf8CPName: cpNameArg=\"%s\" (%"FMTSZ"u)\n",
CPName_Print(cpNameArg, cpNameArgSize), cpNameArgSize);
- if (!CodeSet_CurrentToUtf8(cpNameArg, cpNameArgSize,
- &utf8cpNameArg, &utf8cpNameArgSize)) {
- Debug("GuestApp_RpcSendOneUtf8CPName: error failed to convert arg to utf8\n");
- return FALSE;
- }
-
- Debug("GuestApp_RpcSendOneUtf8CPName: utf8cpNameArg=\"%s\", len=%"FMTSZ"d\n",
- CPName_Print(utf8cpNameArg, utf8cpNameArgSize), utf8cpNameArgSize);
-
- /* UTF-8 encode arg if provided */
if (arg) {
char *rpcMessage;
- size_t messageSize;
- char *utf8Arg;
- size_t utf8ArgSize = 0;
Debug("GuestApp_RpcSendOneUtf8CPName: arg=\"%s\"\n", arg);
- if (!CodeSet_CurrentToUtf8(arg, argSize, &utf8Arg, &utf8ArgSize)) {
- Debug("GuestApp_RpcSendOneUtf8CPName: error failed to convert arg to utf8\n");
- goto abort;
- }
-
- Debug("GuestApp_RpcSendOneUtf8CPName: utf8Arg=\"%s\", len=%"FMTSZ"d\n",
- utf8Arg, utf8ArgSize);
-
- /* Merge command and UTF-8 encoded string */
- messageSize = strlen(cmd) + 1 + utf8ArgSize + 1;
- rpcMessage = (char *)malloc(messageSize);
+ /* Merge command and argument */
+ rpcMessage = Str_Asprintf(NULL, "%s %s", cmd, arg);
if (!rpcMessage) {
Debug("GuestApp_RpcSendOneUtf8CPName: Error, out of memory\n");
- free(utf8Arg);
goto abort;
}
- Str_Strcpy(rpcMessage, cmd, messageSize);
- Str_Strcat(rpcMessage, " ", messageSize);
- Str_Strcat(rpcMessage, utf8Arg, messageSize);
- free(utf8Arg);
-
ret = GuestApp_RpcSendOneCPName(rpcMessage, delimiter,
- utf8cpNameArg, utf8cpNameArgSize);
+ cpNameArg, cpNameArgSize);
free(rpcMessage);
} else {
ret = GuestApp_RpcSendOneCPName(cmd, delimiter,
- utf8cpNameArg, utf8cpNameArgSize);
+ cpNameArg, cpNameArgSize);
}
abort:
- free(utf8cpNameArg);
return ret;
}
libGuestInfo_a_SOURCES += guestInfoPosix.c
libGuestInfo_a_SOURCES += guestInfoPerfMonLinux.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += $(DNET_CFLAGS)
-AM_CFLAGS += $(PROCPS_CFLAGS)
\ No newline at end of file
+AM_CFLAGS = $(DNET_CPPFLAGS)
+AM_CFLAGS += $(PROCPS_CPPFLAGS)
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libGuestInfo.a
libGuestInfo_a_SOURCES = guestInfoServer.c guestInfoPosix.c \
guestInfoPerfMonLinux.c
-AM_CFLAGS = @COMMON_CFLAGS@ $(DNET_CFLAGS) $(PROCPS_CFLAGS)
+AM_CFLAGS = $(DNET_CPPFLAGS) $(PROCPS_CPPFLAGS)
all: all-am
.SUFFIXES:
*********************************************************/
/*
- * This file gathers the virtual memory stats from Linux guest to be
+ * This file gathers the virtual memory stats from Linux guest to be
* passed on to the vmx.
*/
#include "debug.h"
#ifndef NO_PROCPS
-static void GuestInfoMonitorGetStat(MemInfo *vmStats);
-static Bool GuestInfoMonitorReadMeminfo(MemInfo *vmStats);
+static void GuestInfoMonitorGetStat(GuestMemInfo *vmStats);
+static Bool GuestInfoMonitorReadMeminfo(GuestMemInfo *vmStats);
#endif
#define LINUX_MEMINFO_FLAGS (MEMINFO_MEMTOTAL | MEMINFO_MEMFREE | MEMINFO_MEMBUFF |\
MEMINFO_MEMCACHE | MEMINFO_MEMACTIVE | MEMINFO_MEMINACTIVE |\
MEMINFO_SWAPINRATE | MEMINFO_SWAPOUTRATE |\
- MEMINFO_IOINRATE | MEMINFO_IOOUTRATE)
+ MEMINFO_IOINRATE | MEMINFO_IOOUTRATE)
/*
*----------------------------------------------------------------------
*/
Bool
-GuestInfo_PerfMon(MemInfo *vmStats) // OUT: filled vmstats
+GuestInfo_PerfMon(GuestMemInfo *vmStats) // OUT: filled vmstats
{
#ifndef NO_PROCPS
ASSERT(vmStats);
*/
static void
-GuestInfoMonitorGetStat(MemInfo *vmStats) // OUT: filled vmstats
+GuestInfoMonitorGetStat(GuestMemInfo *vmStats) // OUT: filled vmstats
{
uint32 hz = Hertz;
uint32 dummy;
vmStats->ioOutRate = (uint64)((*pageOut * hz + cpuHalf) / cpuTotal);
- Debug("GuestInfoMonitorGetStat: MemInfo: total: %"FMT64"u free: %"FMT64"u"\
+ Debug("GuestInfoMonitorGetStat: GuestMemInfo: total: %"FMT64"u free: %"FMT64"u"\
"buff: %"FMT64"u cache: %"FMT64"u swapin: %"FMT64"u swapout: %"FMT64"u ioin:"\
"%"FMT64"u ioout: %"FMT64"u inactive: %"FMT64"u active: %"FMT64"u"\
"hugetotal: %"FMT64"u hugefree: %"FMT64"u\n", vmStats->memTotal,
*/
static Bool
-GuestInfoMonitorReadMeminfo(MemInfo *vmStats) // OUT: filled vmstats
+GuestInfoMonitorReadMeminfo(GuestMemInfo *vmStats) // OUT: filled vmstats
{
char buf[512];
uint64 value;
}
}
fclose(fp);
-
- Debug("GuestInfoMonitorReadMeminfo: MemInfo: total: %"FMT64"u free: %"FMT64"u"\
+
+ Debug("GuestInfoMonitorReadMeminfo: GuestMemInfo: total: %"FMT64"u free: %"FMT64"u"\
"buff: %"FMT64"u cache: %"FMT64"u swapin: %"FMT64"u swapout: %"FMT64"u ioin:"\
"%"FMT64"u ioout: %"FMT64"u inactive: %"FMT64"u active: %"FMT64"u"\
"hugetotal: %"FMT64"u hugefree: %"FMT64"u\n", vmStats->memTotal,
* Adds the MAC addresses of all NICs and their corresponding IPs.
*
* Side effects:
- * Memory is allocated for each NIC, as well as IP addresses of all NICs
+ * Memory is allocated for each NIC, as well as IP addresses of all NICs
* on successful return.
*
*-----------------------------------------------------------------------------
int
ReadInterfaceDetails(const struct intf_entry *entry, // IN: current interface entry
- void *arg) // IN: Pointer to the NicInfo
+ void *arg) // IN: Pointer to the GuestNicInfo
{
int i;
- NicInfo *nicInfo = (NicInfo *)arg;
+ GuestNicInfo *nicInfo = (GuestNicInfo *)arg;
if ((entry->intf_type & INTF_TYPE_ETH) == INTF_TYPE_ETH) {
NicEntry *nicEntryCur;
* Return MAC addresses of all NICs and their corresponding IPs.
*
* Side effects:
- * Memory is allocated for each NIC, as well as IP addresses of all NICs
+ * Memory is allocated for each NIC, as well as IP addresses of all NICs
* on successful return.
*
*-----------------------------------------------------------------------------
*/
Bool
-GuestInfoGetNicInfo(NicInfo *nicInfo) // OUT
+GuestInfoGetNicInfo(GuestNicInfo *nicInfo) // OUT
{
#ifndef NO_DNET
intf_t *intf;
* Determines the operating system's bitness.
*
* Return value:
- * 32 or 64 on success, negative value on failure. Check errno for more
+ * 32 or 64 on success, negative value on failure. Check errno for more
* details of error.
*
* Side effects:
#include "buildNumber.h"
#include "system.h"
#include "wiper.h" // for WiperPartition functions
+#include "guest_msg_def.h" // For GUESTMSG_MAX_IN_SIZE
#define GUESTINFO_DEFAULT_DELIMITER ' '
-#define GUESTMSG_MAX_IN_SIZE (64 * 1024) /* vmx/main/guest_msg.c */
/*
* Stores information about all guest information sent to the vmx.
typedef struct _GuestInfoCache{
char value[INFO_MAX][MAX_VALUE_LEN]; /* Stores values of all key-value pairs. */
- NicInfo nicInfo;
- DiskInfo diskInfo;
+ GuestNicInfo nicInfo;
+ GuestDiskInfo diskInfo;
} GuestInfoCache;
/* Local cache of the guest information that was last sent to vmx. */
static GuestInfoCache gInfoCache;
-/*
+/*
* A boolean flag that specifies whether the state of the VM was
* changed since the last time guest info was sent to the VMX.
* Tools daemon sets it to TRUE after the VM was resumed.
static Bool vmResumed;
+/*
+ * The Windows Guest Info Server runs in a separate thread,
+ * so we have to synchronize access to 'vmResumed' variable.
+ * Non-windows guest info server does not run in a separate
+ * thread, so no locking is needed.
+ */
+
+#if defined(_WIN32)
+typedef CRITICAL_SECTION vmResumedLockType;
+#define GUESTINFO_DELETE_LOCK(lockPtr) DeleteCriticalSection(lockPtr)
+#define GUESTINFO_ENTER_LOCK(lockPtr) EnterCriticalSection(lockPtr)
+#define GUESTINFO_LEAVE_LOCK(lockPtr) LeaveCriticalSection(lockPtr)
+#define GUESTINFO_INIT_LOCK(lockPtr) InitializeCriticalSection(lockPtr)
+
+vmResumedLockType vmResumedLock;
+
+#else // #if LINUX
+
+typedef int vmResumedLockType;
+#define GUESTINFO_DELETE_LOCK(lockPtr)
+#define GUESTINFO_ENTER_LOCK(lockPtr)
+#define GUESTINFO_LEAVE_LOCK(lockPtr)
+#define GUESTINFO_INIT_LOCK(lockPtr)
+
+#endif // #if LINUX
+
static Bool GuestInfoGather(void * clientData);
static Bool GuestInfoUpdateVmdb(GuestInfoType infoType, void* info);
static Bool SetGuestInfo(GuestInfoType key, const char* value, char delimiter);
-static Bool NicInfoChanged(NicInfo *nicInfo);
-static Bool DiskInfoChanged(PDiskInfo diskInfo);
+static Bool NicInfoChanged(GuestNicInfo *nicInfo);
+static Bool DiskInfoChanged(PGuestDiskInfo diskInfo);
static void GuestInfoClearCache(void);
-static Bool GuestInfoSerializeNicInfo(NicInfo *nicInfo,
- char buffer[GUESTMSG_MAX_IN_SIZE],
+static Bool GuestInfoSerializeNicInfo(GuestNicInfo *nicInfo,
+ char buffer[GUESTMSG_MAX_IN_SIZE],
size_t *bufferLen);
-static int PrintNicInfo(NicInfo *nicInfo, int (*PrintFunc)(const char *, ...));
+static int PrintNicInfo(GuestNicInfo *nicInfo, int (*PrintFunc)(const char *, ...));
#ifdef _WIN32
-static Bool GuestInfoConvertNicInfoToNicInfoV1(NicInfo *info, NicInfoV1 *infoV1);
+static Bool GuestInfoConvertNicInfoToNicInfoV1(GuestNicInfo *info, GuestNicInfoV1 *infoV1);
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * GuestInfoServer_Main --
+ *
+ * The main event loop for the guest info server.
+ * GuestInfoServer_Init() much be called prior to calling this function.
+ *
+ * Result
+ * None
+ *
+ * Side-effects
+ * Events are processed, information gathered and updates sent.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+void
+GuestInfoServer_Main(void *data) // IN
+{
+ int retVal;
+ uint64 sleepUsecs;
+ HANDLE *events = (HANDLE *) data;
+ HANDLE quitEvent;
+ HANDLE finishedEvent;
+
+ ASSERT(data);
+ ASSERT(events[0]);
+ ASSERT(events[1]);
+
+ quitEvent = events[0];
+ finishedEvent = events[1];
+
+ Debug("Starting GuestInfoServer for Windows.\n");
+ for(;;) {
+ DWORD dwError;
+
+ retVal = EventManager_ProcessNext(gGuestInfoEventQueue, &sleepUsecs);
+ if (retVal != 1) {
+ Debug("Unexpected end of the guest info loop.\n");
+ break;
+ }
+
+ /*
+ * The number of micro seconds to sleep should not overflow a long. This
+ * corresponds to a maximum sleep time of around 4295 seconds (~ 71 minutes)
+ * which should be more than enough.
+ */
+
+ Debug("Sleeping for %"FMT64"u msecs...\n", sleepUsecs / 1000);
+ dwError = WaitForSingleObject(quitEvent, sleepUsecs / 1000);
+ if (dwError == WAIT_OBJECT_0) {
+ GuestApp_Log("GuestInfoServer received quit event.\n");
+ Debug("GuestInfoServer received quit event.\n");
+ break;
+ } else if (dwError == WAIT_TIMEOUT) {
+ Debug("GuestInfoServer woke up.\n");
+ } else if (dwError == WAIT_FAILED) {
+ Debug("GuestInfoServer error waiting on exit event: %d %d\n",
+ dwError, GetLastError());
+ break;
+ }
+ }
+ SetEvent(finishedEvent);
+ GuestApp_Log("GuestInfoServer exiting.\n");
+}
#endif
* GuestInfoServer_Init --
*
* Initialize some variables and add the first event to the queue.
- *
+ *
* Call GuestInfoServer_Cleanup() to do the necessary cleanup.
*
* Result
*
* Set whether to disable/enable querying disk information.
* This function is required to provide a work around for bug number 94434.
- * On Win 9x/ME querying for the disk information prevents the machine from
- * entering standby. So we added a configuration option diable-query-diskinfo
+ * On Win 9x/ME querying for the disk information prevents the machine from
+ * entering standby. So we added a configuration option diable-query-diskinfo
* for the tools.conf file. We use this function to let the guestd & tools service
* control the disabling/enabling of disk information querying.
- *
+ *
* Result
* None.
*
void
GuestInfoServer_DisableDiskInfoQuery(Bool disable)
{
- gDisableQueryDiskInfo = disable;
+ gDisableQueryDiskInfo = disable;
}
char name[255];
char osNameFull[MAX_VALUE_LEN];
char osName[MAX_VALUE_LEN];
- NicInfo nicInfo;
- DiskInfo diskInfo;
+ GuestNicInfo nicInfo;
+ GuestDiskInfo diskInfo;
#if defined(_WIN32) || defined(linux)
- MemInfo vmStats = {0};
-#endif
+ GuestMemInfo vmStats = {0};
+#endif
Debug("Entered guest info gather.\n");
memset(&nicInfo, 0, sizeof nicInfo);
-
+
/* Send tools version. */
if (!GuestInfoUpdateVmdb(INFO_TOOLS_VERSION, BUILD_NUMBER)) {
/*
Debug("Failed to update VMDB\n");
}
}
-
+
if (!gDisableQueryDiskInfo) {
if (!GuestInfoGetDiskInfo(&diskInfo)) {
Debug("Failed to get disk info.\n");
free(diskInfo.partitionList);
diskInfo.partitionList = NULL;
}
- }
-
+ }
+
if(!GuestInfoGetFqdn(sizeof name, name)) {
Debug("Failed to get netbios name.\n");
} else {
}
}
#endif
-
- /*
- * Even if one of the updates was unsuccessfull,
+
+ /*
+ * Even if one of the updates was unsuccessfull,
* we still add the next timer event. This way
* if one of the pieces failed, other information will
* still be passed to the host.
*
* GuestInfoConvertNicInfoToNicInfoV1 --
*
- * Convert the new dynamic nicInfoNew to fixed size struct NicInfoV1.
+ * Convert the new dynamic nicInfoNew to fixed size struct GuestNicInfoV1.
*
* Results:
* TRUE if successfully converted
* FALSE otherwise
*
* Side effects:
- * If number of NICs or number of IP addresses on any of the NICs
+ * If number of NICs or number of IP addresses on any of the NICs
* exceeding MAX_NICS and MAX_IPS respectively, the extra ones
* are truncated, on successful return.
- *
+ *
*----------------------------------------------------------------------
*/
Bool
-GuestInfoConvertNicInfoToNicInfoV1(NicInfo *info, // IN
- NicInfoV1 *infoV1) // OUT
+GuestInfoConvertNicInfoToNicInfoV1(GuestNicInfo *info, // IN
+ GuestNicInfoV1 *infoV1) // OUT
{
NicEntry *nicEntryCur;
uint32 maxNics;
return FALSE;
}
- maxNics = info->nicInfoProto.numNicEntries > MAX_NICS ?
+ maxNics = info->nicInfoProto.numNicEntries > MAX_NICS ?
MAX_NICS : info->nicInfoProto.numNicEntries;
infoV1->numNicEntries = maxNics;
if (maxNics < info->nicInfoProto.numNicEntries) {
}
nicEntryCur = DblLnkLst_Container(nicEntryLink,
- NicEntry,
+ NicEntry,
links);
if (NULL == nicEntryCur) {
return FALSE;
strcpy(infoV1->nicList[nicIndex].macAddress, nicEntryCur->nicEntryProto.macAddress);
- maxIPs = nicEntryCur->nicEntryProto.numIPs > MAX_IPS ?
+ maxIPs = nicEntryCur->nicEntryProto.numIPs > MAX_IPS ?
MAX_IPS : nicEntryCur->nicEntryProto.numIPs;
nicEntryCur -> nicEntryProto.numIPs = maxIPs;
if (maxIPs < nicEntryCur->nicEntryProto.numIPs) {
Debug("Truncating IP addresses for NIC %d.\n", nicIndex);
}
-
+
DblLnkLst_ForEach(ipAddrLink, &nicEntryCur->ipAddressList) {
if (ipIndex >= maxIPs) {
break;
}
- ipAddressCur = DblLnkLst_Container(ipAddrLink,
- VmIpAddressEntry,
+ ipAddressCur = DblLnkLst_Container(ipAddrLink,
+ VmIpAddressEntry,
links);
if (NULL == ipAddressCur) {
return FALSE;
}
- strcpy(infoV1->nicList[nicIndex].ipAddress[ipIndex],
+ strcpy(infoV1->nicList[nicIndex].ipAddress[ipIndex],
ipAddressCur->ipEntryProto.ipAddress);
ipIndex++;
}
nicIndex++;
- }
+ }
return TRUE;
}
break;
case INFO_IPADDRESS:
- if (NicInfoChanged((NicInfo *)info)) {
+ if (NicInfoChanged((GuestNicInfo *)info)) {
static Bool isCmdV1 = FALSE;
- char request[GUESTMSG_MAX_IN_SIZE];
+ char request[GUESTMSG_MAX_IN_SIZE];
size_t requestLength = 0;
char *reply = NULL;
size_t replyLen;
if (FALSE == isCmdV1) {
Debug("Creating nic info message.\n");
- Str_Sprintf(request,
- sizeof request,
- "%s %d ",
+ Str_Sprintf(request,
+ sizeof request,
+ "%s %d ",
GUEST_INFO_COMMAND_TWO,
INFO_IPADDRESS);
-
- if (GuestInfoSerializeNicInfo((NicInfo *)info,
- request + strlen(request),
+
+ if (GuestInfoSerializeNicInfo((GuestNicInfo *)info,
+ request + strlen(request),
&requestLength)) {
requestLength += strlen(request);
} else {
}
if (!status) {
/*
- * Could be that we are talking to the old protocol that NicInfo is
+ * Could be that we are talking to the old protocol that GuestNicInfo is
* still fixed size. Another try to send the fixed sized Nic info.
*/
- char request[sizeof (NicInfoV1) + sizeof GUEST_INFO_COMMAND +
+ char request[sizeof (GuestNicInfoV1) + sizeof GUEST_INFO_COMMAND +
2 + /* 2 bytes are for digits of infotype. */
3 * sizeof (char)]; /* 3 spaces */
- NicInfoV1 nicInfo;
-
+ GuestNicInfoV1 nicInfo;
+
free(reply);
reply = NULL;
- Str_Sprintf(request,
- sizeof request,
- "%s %d ",
+ Str_Sprintf(request,
+ sizeof request,
+ "%s %d ",
GUEST_INFO_COMMAND,
INFO_IPADDRESS);
if (GuestInfoConvertNicInfoToNicInfoV1(info, &nicInfo)) {
- memcpy(request + strlen(request),
- &nicInfo,
- sizeof(NicInfoV1));
+ memcpy(request + strlen(request),
+ &nicInfo,
+ sizeof(GuestNicInfoV1));
Debug("GuestInfo: Sending nic info message.\n");
/* Send all the information in the message. */
- status = RpcOut_SendOneRaw(request,
- sizeof request,
- &reply,
+ status = RpcOut_SendOneRaw(request,
+ sizeof request,
+ &reply,
&replyLen);
Debug("GuestInfo: Just sent fixed sized nic info message.\n");
}
if (RpcVMX_ConfigGetBool(FALSE, "printNicInfo")) {
- PrintNicInfo((NicInfo *) info, (int (*)(const char *fmt, ...)) RpcVMX_Log);
+ PrintNicInfo((GuestNicInfo *) info, (int (*)(const char *fmt, ...)) RpcVMX_Log);
}
Debug("GuestInfo: Updated new NIC information\n");
reply = NULL;
/*
- * Update the cache. Assign info to gInfoCache.nicInfo. First free dynamic
- * memory allocated in gInfoCache.nicInfo. Then unlink those in nicInfo and
- * link them back to gInfoCache.nicInfo this is sort of hacking. However, it
+ * Update the cache. Assign info to gInfoCache.nicInfo. First free dynamic
+ * memory allocated in gInfoCache.nicInfo. Then unlink those in nicInfo and
+ * link them back to gInfoCache.nicInfo this is sort of hacking. However, it
* works in this case, since nicInfo is not going to be used after this. NOTE,
* nicInfo CAN NOT BE USED AFTER THIS POINT.
*/
GuestInfo_FreeDynamicMemoryInNicInfo(&gInfoCache.nicInfo);
/* assign the fixed memory part */
- gInfoCache.nicInfo = *(NicInfo *)info;
+ gInfoCache.nicInfo = *(GuestNicInfo *)info;
/* assign the dynamic memory part */
DblLnkLst_Init(&gInfoCache.nicInfo.nicList);
- DblLnkLst_Link(&gInfoCache.nicInfo.nicList, ((NicInfo *)info)->nicList.next);
- DblLnkLst_Unlink1(&((NicInfo *)info)->nicList);
+ DblLnkLst_Link(&gInfoCache.nicInfo.nicList, ((GuestNicInfo *)info)->nicList.next);
+ DblLnkLst_Unlink1(&((GuestNicInfo *)info)->nicList);
} else {
Debug("GuestInfo: Nic info not changed.\n");
}
case INFO_MEMORY:
{
- char request[sizeof(MemInfo) + sizeof GUEST_INFO_COMMAND +
- 2 + /* 2 bytes are for digits of infotype. */
- 3 * sizeof (char)]; /* 3 spaces */
+ char request[sizeof(GuestMemInfo) + sizeof GUEST_INFO_COMMAND +
+ 2 + /* 2 bytes are for digits of infotype. */
+ 3 * sizeof (char)]; /* 3 spaces */
Bool status;
- Debug("GuestInfo: Sending MemInfo message.\n");
- Str_Sprintf(request,
- sizeof request,
- "%s %d ",
+ Debug("GuestInfo: Sending GuestMemInfo message.\n");
+ Str_Sprintf(request,
+ sizeof request,
+ "%s %d ",
GUEST_INFO_COMMAND,
INFO_MEMORY);
memcpy(request + strlen(request),
- info, sizeof(MemInfo));
-
+ info, sizeof(GuestMemInfo));
+
/* Send all the information in the message. */
status = RpcOut_SendOneRaw(request, sizeof(request),
NULL, NULL);
if (!status) {
- Debug("Error sending MemInfo.\n");
+ Debug("Error sending GuestMemInfo.\n");
return FALSE;
}
- Debug("MemInfo sent successfully.\n");
+ Debug("GuestMemInfo sent successfully.\n");
break;
}
char *reply;
size_t replyLen;
Bool status;
- PDiskInfo pdi = (PDiskInfo)info;
+ PGuestDiskInfo pdi = (PGuestDiskInfo)info;
int j = 0;
if (!DiskInfoChanged(pdi)) {
Debug("GuestInfo: Disk info not changed.\n");
break;
}
-
+
requestSize += sizeof pdi->numEntries +
sizeof *pdi->partitionList * pdi->numEntries;
request = (char *)calloc(requestSize, sizeof (char));
break;
}
- Str_Sprintf(request, requestSize, "%s %d ", GUEST_INFO_COMMAND,
+ Str_Sprintf(request, requestSize, "%s %d ", GUEST_INFO_COMMAND,
INFO_DISK_FREE_SPACE);
-
+
/* partitionCount is a uint8 and cannot be larger than UCHAR_MAX. */
if (pdi->numEntries > UCHAR_MAX) {
Debug("GuestInfo: Too many partitions.\n");
memcpy(request + offset, &partitionCount, sizeof partitionCount);
memcpy(request + offset + sizeof partitionCount, pdi->partitionList,
sizeof *pdi->partitionList * pdi->numEntries);
-
+
Debug("sizeof request is %d\n", requestSize);
status = RpcOut_SendOneRaw(request, requestSize, &reply, &replyLen);
gInfoCache.diskInfo.partitionList = NULL;
}
gInfoCache.diskInfo.numEntries = pdi->numEntries;
- gInfoCache.diskInfo.partitionList = calloc(pdi->numEntries,
+ gInfoCache.diskInfo.partitionList = calloc(pdi->numEntries,
sizeof(PartitionEntry));
if (gInfoCache.diskInfo.partitionList == NULL) {
Debug("GuestInfo: could not allocate memory for the disk info cache.\n");
- return FALSE;
+ return FALSE;
}
for (j = 0; j < pdi->numEntries; j++) {
delimiter, key, delimiter, value);
if (!status) {
- Debug("SetGuestInfo: Error sending rpc message: %s\n",
+ Debug("SetGuestInfo: Error sending rpc message: %s\n",
reply ? reply : "NULL");
free(reply);
return FALSE;
*/
NicEntry *
-GuestInfoFindMacAddress(NicInfo *nicInfo, const char *macAddress)
+GuestInfoFindMacAddress(GuestNicInfo *nicInfo, const char *macAddress)
{
NicEntry *nicEntry;
DblLnkLst_Links *sCurrent;
*/
Bool
-NicInfoChanged(NicInfo *nicInfo) // IN:
+NicInfoChanged(GuestNicInfo *nicInfo) // IN:
{
char *currentMac;
- NicInfo *cachedNicInfo;
+ GuestNicInfo *cachedNicInfo;
NicEntry *cachedNic;
DblLnkLst_Links *cachedNicLink;
cachedNicInfo = &gInfoCache.nicInfo;
- cachedNic = DblLnkLst_Container(cachedNicInfo->nicList.next,
- NicEntry,
+ cachedNic = DblLnkLst_Container(cachedNicInfo->nicList.next,
+ NicEntry,
links);
- if (cachedNicInfo->nicInfoProto.numNicEntries !=
+ if (cachedNicInfo->nicInfoProto.numNicEntries !=
nicInfo->nicInfoProto.numNicEntries) {
Debug("GuestInfo: number of nics has changed\n");
return TRUE;
}
if (matchedNIC->nicEntryProto.numIPs != cachedNic->nicEntryProto.numIPs) {
- Debug("GuestInfo: count of ip addresses for mac %d\n",
+ Debug("GuestInfo: count of ip addresses for mac %d\n",
matchedNIC->nicEntryProto.numIPs);
return TRUE;
}
return TRUE;
}
- }
+ }
}
*
* GuestInfoSerializeNicInfo --
*
- * Now that NicInfo is not fixed size, serialize nicInfo into a
- * buffer, in order to send it over wire.
- *
+ * Now that GuestNicInfo is not fixed size, serialize nicInfo into a
+ * buffer, in order to send it over wire.
+ *
* Results:
*
* TRUE if successful, FALSE otherwise.
*----------------------------------------------------------------------
*/
-Bool
-GuestInfoSerializeNicInfo(NicInfo *nicInfo, // IN
- char buffer[GUESTMSG_MAX_IN_SIZE], // OUT
- size_t *bufferLen) // OUT
+Bool
+GuestInfoSerializeNicInfo(GuestNicInfo *nicInfo, // IN
+ char buffer[GUESTMSG_MAX_IN_SIZE], // OUT
+ size_t *bufferLen) // OUT
{
char *buf;
char *info;
DblLnkLst_Links *nicEntryLink;
ASSERT_ON_COMPILE(sizeof nicInfo->nicInfoProto.version == 4);
- ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, nicEntrySizeOnWire) == 4);
+ ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, nicEntrySizeOnWire) == 4);
ASSERT_ON_COMPILE(sizeof nicInfo->nicInfoProto.nicEntrySizeOnWire == 4);
- ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, numNicEntries) == 8);
+ ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, numNicEntries) == 8);
ASSERT_ON_COMPILE(sizeof nicInfo->nicInfoProto.numNicEntries == 4);
- ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, totalInfoSizeOnWire) == 12);
+ ASSERT_ON_COMPILE(offsetof(NicInfoProtocol, totalInfoSizeOnWire) == 12);
ASSERT_ON_COMPILE(sizeof nicInfo->nicInfoProto.totalInfoSizeOnWire == 4);
- if ((NULL == nicInfo) ||
+ if ((NULL == nicInfo) ||
(NULL == buffer ) ||
(NULL == bufferLen)) {
return FALSE;
nicInfo->nicInfoProto.totalInfoSizeOnWire = 0;
nicInfo->nicInfoProto.nicEntrySizeOnWire = sizeof(NicEntryProtocol);
-
+
buf = buffer;
info = (char *)(&nicInfo->nicInfoProto);
- entrySize = sizeof nicInfo->nicInfoProto;
-
+ entrySize = sizeof nicInfo->nicInfoProto;
+
memcpy(buf, info, entrySize);
nicInfo->nicInfoProto.totalInfoSizeOnWire += entrySize;
buf += entrySize;
-
+
DblLnkLst_ForEach(nicEntryLink, &nicInfo->nicList) {
NicEntry *nicEntry;
DblLnkLst_Links *ipAddrLink;
nicEntry = DblLnkLst_Container(nicEntryLink, NicEntry, links);
nicEntry->nicEntryProto.totalNicEntrySizeOnWire = 0;
nicEntry->nicEntryProto.ipAddressSizeOnWire = sizeof(VmIpAddressEntryProtocol);
-
+
info = (char *)(&nicEntry->nicEntryProto);
entrySize = sizeof nicEntry->nicEntryProto;
entrySize = sizeof ipAddressCur->ipEntryProto;
DblLnkLst_ForEach(ipAddrLink, &nicEntry->ipAddressList) {
- ipAddressCur = DblLnkLst_Container(ipAddrLink, VmIpAddressEntry, links);
+ ipAddressCur = DblLnkLst_Container(ipAddrLink, VmIpAddressEntry, links);
ipAddressCur->ipEntryProto.totalIpEntrySizeOnWire = 0;
info = (char *)(&ipAddressCur->ipEntryProto);
-
+
if (info) {
/* to prevent buffer overflow */
if (buf + entrySize - buffer < GUESTMSG_MAX_IN_SIZE) {
return FALSE;
}
}
-
+
/*
* Update total size portion that was just calculated.
*/
- memcpy(buf + offsetof(VmIpAddressEntryProtocol,
+ memcpy(buf + offsetof(VmIpAddressEntryProtocol,
totalIpEntrySizeOnWire),
&ipAddressCur->ipEntryProto.totalIpEntrySizeOnWire,
- sizeof ipAddressCur->ipEntryProto.totalIpEntrySizeOnWire);
+ sizeof ipAddressCur->ipEntryProto.totalIpEntrySizeOnWire);
buf += entrySize;
}
/*
* Update total size portion that was just calculated.
*/
- memcpy(nicEntryBuf + offsetof(NicEntryProtocol ,
+ memcpy(nicEntryBuf + offsetof(NicEntryProtocol ,
totalNicEntrySizeOnWire),
&nicEntry->nicEntryProto.totalNicEntrySizeOnWire,
- sizeof nicEntry->nicEntryProto.totalNicEntrySizeOnWire);
+ sizeof nicEntry->nicEntryProto.totalNicEntrySizeOnWire);
}
*bufferLen = buf + entrySize - buffer;
/*
* Update total size portion that was just calculated.
*/
- memcpy(buffer + offsetof(NicInfoProtocol, totalInfoSizeOnWire),
+ memcpy(buffer + offsetof(NicInfoProtocol, totalInfoSizeOnWire),
&nicInfo->nicInfoProto.totalInfoSizeOnWire,
sizeof nicInfo->nicInfoProto.totalInfoSizeOnWire);
*/
int
-PrintNicInfo(NicInfo *nicInfo, // IN
- int (*PrintFunc)(const char *, ...)) // IN
+PrintNicInfo(GuestNicInfo *nicInfo, // IN
+ int (*PrintFunc)(const char *, ...)) // IN
{
int ret = 0;
uint32 i = 0;
DblLnkLst_Links *nicEntryLink;
-
- ret += PrintFunc("NicInfo: count: %d\n", nicInfo->nicInfoProto.numNicEntries);
+
+ ret += PrintFunc("GuestNicInfo: count: %d\n", nicInfo->nicInfoProto.numNicEntries);
DblLnkLst_ForEach(nicEntryLink, &nicInfo->nicList) {
uint32 j = 0;
DblLnkLst_Links *ipAddrLink;
NicEntry *nicEntry = DblLnkLst_Container(nicEntryLink,
- NicEntry,
+ NicEntry,
links);
- if (nicEntry) {
- ret += PrintFunc("NicInfo: nic [%d/%d] mac: %s",
- i+1,
- nicInfo->nicInfoProto.numNicEntries,
+ if (nicEntry) {
+ ret += PrintFunc("GuestNicInfo: nic [%d/%d] mac: %s",
+ i+1,
+ nicInfo->nicInfoProto.numNicEntries,
nicEntry->nicEntryProto.macAddress);
} else {
break;
links);
if (ipAddress) {
- ret += PrintFunc("NicInfo: nic [%d/%d] IP [%d/%d]: %s",
- i+1,
- nicInfo->nicInfoProto.numNicEntries,
+ ret += PrintFunc("GuestNicInfo: nic [%d/%d] IP [%d/%d]: %s",
+ i+1,
+ nicInfo->nicInfoProto.numNicEntries,
j+1,
nicEntry->nicEntryProto.numIPs,
ipAddress->ipEntryProto.ipAddress);
*/
Bool
-DiskInfoChanged(PDiskInfo diskInfo) // IN:
+DiskInfoChanged(PGuestDiskInfo diskInfo) // IN:
{
int index;
char *name;
int i;
int matchedPartition;
- PDiskInfo cachedDiskInfo;
+ PGuestDiskInfo cachedDiskInfo;
cachedDiskInfo = &gInfoCache.diskInfo;
return TRUE;
} else {
/* Compare the free space. */
- if (diskInfo->partitionList[matchedPartition].freeBytes !=
+ if (diskInfo->partitionList[matchedPartition].freeBytes !=
cachedDiskInfo->partitionList[index].freeBytes) {
Debug("GuestInfo: free space changed\n");
return TRUE;
}
- if (diskInfo->partitionList[matchedPartition].totalBytes !=
+ if (diskInfo->partitionList[matchedPartition].totalBytes !=
cachedDiskInfo->partitionList[index].totalBytes) {
Debug("GuestInfo: total space changed\n");
return TRUE;
*----------------------------------------------------------------------
*/
-Bool
-GuestInfoGetDiskInfo(PDiskInfo di) // IN/OUT
+Bool
+GuestInfoGetDiskInfo(PGuestDiskInfo di) // IN/OUT
{
- int i = 0;
+ int i = 0;
WiperPartition_List *pl = NULL;
- unsigned int partCount = 0;
+ unsigned int partCount = 0;
uint64 freeBytes = 0;
uint64 totalBytes = 0;
WiperPartition nextPartition;
unsigned int partNameSize = 0;
Bool success = FALSE;
-
+
ASSERT(di);
partNameSize = sizeof (di->partitionList)[0].name;
- di->numEntries = 0;
+ di->numEntries = 0;
di->partitionList = NULL;
-
+
/* Get partition list. */
if (!Wiper_Init(NULL)) {
Debug("GetDiskInfo: ERROR: could not initialize wiper library\n");
Debug("GetDiskInfo: ERROR: could not get partition list\n");
return FALSE;
}
-
+
for (i = 0; i < pl->size; i++) {
nextPartition = pl->partitions[i];
if (!strlen(nextPartition.comment)) {
PPartitionEntry newPartitionList;
- unsigned char *error;
+ unsigned char *error;
error = WiperSinglePartition_GetSpace(&nextPartition, &freeBytes, &totalBytes);
if (strlen(error)) {
- Debug("GetDiskInfo: ERROR: could not get space for partition %s: %s\n",
+ Debug("GetDiskInfo: ERROR: could not get space for partition %s: %s\n",
nextPartition.mountPoint, error);
goto out;
}
-
+
if (strlen(nextPartition.mountPoint) + 1 > partNameSize) {
Debug("GetDiskInfo: ERROR: Partition name buffer too small\n");
goto out;
}
-
- newPartitionList = realloc(di->partitionList,
+
+ newPartitionList = realloc(di->partitionList,
(partCount + 1) * sizeof *di->partitionList);
if (newPartitionList == NULL) {
Debug("GetDiskInfo: ERROR: could not allocate partition list.\n");
}
di->partitionList = newPartitionList;
- Str_Strcpy((di->partitionList)[partCount].name, nextPartition.mountPoint,
- partNameSize);
+ Str_Strcpy((di->partitionList)[partCount].name, nextPartition.mountPoint,
+ partNameSize);
(di->partitionList)[partCount].freeBytes = freeBytes;
(di->partitionList)[partCount].totalBytes = totalBytes;
partCount++;
* Clears the cached guest info data.
*
* Results:
- * None.
+ * None.
*
* Side effects:
* gInfoCache is cleared.
*/
static void
-GuestInfoClearCache(void)
+GuestInfoClearCache(void)
{
- int i;
+ int i;
for (i = 0; i < INFO_MAX; i++) {
gInfoCache.value[i][0] = 0;
}
-
+
GuestInfo_FreeDynamicMemoryInNicInfo(&gInfoCache.nicInfo);
gInfoCache.nicInfo.nicInfoProto.numNicEntries = 0;
uint64
GetAvailableDiskSpace(char *pathName)
{
- WiperPartition p;
+ WiperPartition p;
uint64 freeBytes = 0;
- uint64 totalBytes = 0;
+ uint64 totalBytes = 0;
char *wiperError;
-
+
Wiper_Init(NULL);
if (strlen(pathName) > sizeof p.mountPoint) {
return 0;
}
Str_Strcpy((char *)p.mountPoint, pathName, sizeof p.mountPoint);
- wiperError = (char *)WiperSinglePartition_GetSpace(&p, &freeBytes, &totalBytes);
+ wiperError = (char *)WiperSinglePartition_GetSpace(&p, &freeBytes, &totalBytes);
if (strlen(wiperError) > 0) {
Debug("GetAvailableDiskSpace: error using wiper lib: %s\n", wiperError);
- return 0;
+ return 0;
}
Debug("GetAvailableDiskSpace: free bytes is %"FMT64"u\n", freeBytes);
return freeBytes;
*
* GuestInfoAddNicEntry --
*
- * Add a Nic entry into NicInfo. macAddress of the NicEntry is
+ * Add a Nic entry into GuestNicInfo. macAddress of the NicEntry is
* initialized with the input parameter
*
* Results:
*/
NicEntry *
-GuestInfoAddNicEntry(NicInfo *nicInfo, // IN/OUT
- const char macAddress[MAC_ADDR_SIZE]) // IN
+GuestInfoAddNicEntry(GuestNicInfo *nicInfo, // IN/OUT
+ const char macAddress[MAC_ADDR_SIZE]) // IN
{
NicEntry *nicEntryCur = NULL;
* Newly allocated IP address Entry
*
* Side effects:
- * Linked list in the new IP address entry is initialized.Number
+ * Linked list in the new IP address entry is initialized.Number
* of IP addresses on the NIC is bumped up by 1
*
*----------------------------------------------------------------------
* Determines the operating system's bitness.
*
* Return value:
- * 32 or 64 on success, negative value on failure. Check errno for more
+ * 32 or 64 on success, negative value on failure. Check errno for more
* details of error.
*
* Side effects:
libHgfs_a_SOURCES += cpNameUtilLinux.c
libHgfs_a_SOURCES += hgfsUtil.c
libHgfs_a_SOURCES += staticEscape.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libHgfs.a
libHgfs_a_SOURCES = cpName.c cpNameLite.c cpNameLinux.c cpNameUtil.c \
cpNameUtilLinux.c hgfsUtil.c staticEscape.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libHgfsBd_a_SOURCES =
libHgfsBd_a_SOURCES += hgfsBd.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libHgfsBd.a
libHgfsBd_a_SOURCES = hgfsBd.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libHgfsServer_a_SOURCES += hgfsServer.c
libHgfsServer_a_SOURCES += hgfsServerLinux.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_HGFS_SERVER_CFLAGS@
+AM_CFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libHgfsServer.a
libHgfsServer_a_SOURCES = hgfsServer.c hgfsServerLinux.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_HGFS_SERVER_CFLAGS@
+AM_CFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
all: all-am
.SUFFIXES:
char const *inEnd;
char *next;
char *myBufOut;
- char *myBufOutCurrent;
char *out;
size_t outSize;
size_t sharePathLen; /* Length of share's path */
char tempBuf[HGFS_PATH_MAX];
size_t tempSize;
char *tempPtr;
- char *ansiName;
- size_t ansiLen;
Bool result;
char *savedPathSepPos;
HgfsSharedFolder *share;
return HGFS_NAME_STATUS_INCOMPLETE_BASE;
}
- /*
- * VMDB stores the ANSI name so convert from UTF8 before looking up a share.
- * XXX: Ideally, we should store share names in UTF16 so that these
- * conversions can be done away with.
- */
- if (!CodeSet_Utf8ToCurrent(cpName,
- len,
- &ansiName,
- &ansiLen)) {
- LOG(4, ("HgfsServerGetAccess: ANSI conversion failed\n"));
- return HGFS_NAME_STATUS_FAILURE;
- }
-
/* Check permission on the share and get the share path */
- nameStatus = HgfsServerPolicy_GetSharePath(ansiName,
- ansiLen,
+ nameStatus = HgfsServerPolicy_GetSharePath(cpName,
+ len,
mode,
&sharePathLen,
&sharePath,
&share);
if (nameStatus != HGFS_NAME_STATUS_COMPLETE) {
LOG(4, ("HgfsServerGetAccess: No such share (%s) or access denied\n",
- ansiName));
- free(ansiName);
+ cpName));
return nameStatus;
}
- free(ansiName);
-
/* Point to the next component, if any */
cpNameSize -= next - cpName;
cpName = next;
*out = 0;
outSize -= prefixLen;
} else {
- size_t utf8ShareLen;
- char *utf8SharePath;
-
/*
- * This is a regular share. Append the UTF8 path to the out buffer.
+ * This is a regular share. Append the path to the out buffer.
*/
- if (!CodeSet_CurrentToUtf8(sharePath,
- sharePathLen,
- &utf8SharePath,
- &utf8ShareLen)) {
- LOG(4, ("HgfsServerGetAccess: share name UTF8 conversion failed\n"));
- nameStatus = HGFS_NAME_STATUS_FAILURE;
- goto error;
- }
-
- if (outSize < utf8ShareLen + 1) {
+ if (outSize < sharePathLen + 1) {
LOG(4, ("HgfsServerGetAccess: share path too big\n"));
- free(utf8SharePath);
nameStatus = HGFS_NAME_STATUS_TOO_LONG;
goto error;
}
- memcpy(out, utf8SharePath, utf8ShareLen + 1);
- out += utf8ShareLen;
- outSize -= utf8ShareLen;
- free(utf8SharePath);
+ memcpy(out, sharePath, sharePathLen + 1);
+ out += sharePathLen;
+ outSize -= sharePathLen;
}
/* Convert the rest of the input name (if any) to a local name */
*savedPathSepPos = '\0';
}
- if (!CodeSet_Utf8ToCurrent(myBufOut,
- strlen(myBufOut),
- &myBufOutCurrent,
- NULL)) {
- LOG(4, ("HgfsServerGetAccess: share name UTF8 to current conversion failed\n"));
- nameStatus = HGFS_NAME_STATUS_FAILURE;
- goto error;
- }
-
- result = HgfsServerHasSymlink(myBufOutCurrent, sharePath);
+ result = HgfsServerHasSymlink(myBufOut, sharePath);
*savedPathSepPos = DIRSEPC;
- free(myBufOutCurrent);
if (result) {
LOG(4, ("HgfsServerGetAccess: parent path contains a symlink\n"));
nameStatus = HGFS_NAME_STATUS_FAILURE;
char const *name;
size_t len;
Bool done = FALSE;
- char *utf8Name;
- size_t utf8NameLen;
size_t newDirEntryLen;
size_t maxLen;
myDents = (DirectoryEntry **)p;
}
- /* This file/directory can be added to the list. Convert to UTF8 first. */
+ /* This file/directory can be added to the list. */
LOG(4, ("HgfsServerGetDents: Nextfilename = \"%s\"\n", name));
- if (!CodeSet_CurrentToUtf8((const char *)name,
- len,
- &utf8Name,
- &utf8NameLen)) {
- LOG(4, ("HgfsServerGetDents: Unable to convert \"%s\" to utf-8\n",
- name));
- goto error;
- }
/*
* Start with the size of the DirectoryEntry struct, subtract the static
* just enough space for the UTF-8 name and nul terminator.
*/
newDirEntryLen =
- sizeof *pDirEntry - sizeof pDirEntry->d_name + utf8NameLen + 1;
+ sizeof *pDirEntry - sizeof pDirEntry->d_name + len + 1;
pDirEntry = (DirectoryEntry *)malloc(newDirEntryLen);
if (!pDirEntry) {
LOG(4, ("HgfsServerGetDents: Couldn't allocate dentry memory\n"));
- free(utf8Name);
goto error;
}
pDirEntry->d_reclen = (unsigned short)newDirEntryLen;
- memcpy(pDirEntry->d_name, utf8Name, utf8NameLen);
- pDirEntry->d_name[utf8NameLen] = 0;
+ memcpy(pDirEntry->d_name, name, len);
+ pDirEntry->d_name[len] = 0;
myDents[numDents] = pDirEntry;
numDents++;
- free(utf8Name);
}
/* We are done; cleanup the state */
HgfsFileNode *node = NULL;
char const *inEnd;
char const *next;
- char *shareName = NULL;
- size_t shareLen = 0;
uint32 len;
Bool sharedFolderOpen = FALSE;
sharedFolderOpen = TRUE;
}
- /*
- * VMDB stores the ANSI name so convert from UTF8 before looking up a share.
- * XXX: Ideally, we should store share names in UTF16 so that these
- * conversions can be done away with.
- */
- if (!CodeSet_Utf8ToCurrent(openInfo->cpName,
- len,
- &shareName,
- &shareLen)) {
- LOG(4, ("HgfsServerGetAccess: ANSI conversion failed\n"));
- return FALSE;
- }
-
SyncMutex_Lock(&hgfsNodeArrayLock);
node = HgfsAddNewFileNode(openInfo,
localId,
fileDesc,
append,
- shareLen,
- shareName,
+ len,
+ openInfo->cpName,
sharedFolderOpen);
- free(shareName);
if (node == NULL) {
LOG(4, ("HgfsCreateAndCacheFileNode: Failed to add new node.\n"));
SyncMutex_Unlock(&hgfsNodeArrayLock);
switch (request->op) {
case HGFS_OP_GETATTR_V3: {
HgfsRequestGetattrV3 *requestV3;
-
+
requestV3 = (HgfsRequestGetattrV3 *)HGFS_REQ_GET_PAYLOAD_V3(packetIn);
LOG(4, ("HgfsUnpackGetattrRequest: HGFS_OP_GETATTR_V3\n"));
*packetSize = HGFS_REP_PAYLOAD_SIZE_V3(reply) + utf8TargetNameLen;
break;
}
-
+
case HGFS_OP_GETATTR_V2: {
HgfsReplyGetattrV2 *reply = (HgfsReplyGetattrV2 *)packetOut;
reply->attr.mask = attr->mask;
dirent->attr.hostFileId = attr->hostFileId;
break;
}
-
+
case HGFS_OP_SEARCH_READ_V2: {
HgfsReplySearchReadV2 *reply = (HgfsReplySearchReadV2 *)packetOut;
reply->attr.hostFileId = attr->hostFileId;
break;
}
-
+
case HGFS_OP_SEARCH_READ: {
HgfsReplySearchRead *reply = (HgfsReplySearchRead *)packetOut;
#include <CoreFoundation/CoreFoundation.h> // for CFString and CFURL
#endif
-/*
+/*
* ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the
* Solaris version of <sys/stat.h>.
*/
}
#endif
-/*
+/*
* On Linux, we must wrap getdents64, as glibc does not wrap it for us. We use getdents64
* (rather than getdents) because with the latter, we'll get 64-bit offsets and inode
* numbers. Note that getdents64 isn't supported everywhere, in particular, kernels older
})
#endif
-/*
+/*
* O_DIRECTORY is only relevant on Linux. For other platforms, we'll hope that
* the kernel is smart enough to deny getdents(2) (or getdirentries(2)) on
* files which aren't directories.
futimes(int fd, const struct timeval times[2])
{
#ifndef sun
- /*
- * Hack to allow the timevals in futimes() to be const even when utimes()
- * expects non-const timevals. This is the case on glibc up to 2.3 or
- * thereabouts.
+ /*
+ * Hack to allow the timevals in futimes() to be const even when utimes()
+ * expects non-const timevals. This is the case on glibc up to 2.3 or
+ * thereabouts.
*/
struct timeval mytimes[2];
HgfsFileAttrInfo *attr,
char **targetName);
-static HgfsInternalStatus HgfsGetattrFromFd(int fd,
+static HgfsInternalStatus HgfsGetattrFromFd(int fd,
HgfsFileAttrInfo *attr);
-static void HgfsStat(struct stat *stats,
+static void HgfsStat(struct stat *stats,
HgfsFileAttrInfo *attr);
static int HgfsStatFromName(char *fileName,
struct timeval *modTime,
Bool *timesChanged);
-static HgfsInternalStatus HgfsSetattrFromFd(HgfsHandle file,
+static HgfsInternalStatus HgfsSetattrFromFd(HgfsHandle file,
HgfsFileAttrInfo *attr,
HgfsAttrHint hints);
-static HgfsInternalStatus HgfsSetattrFromName(char *cpName,
+static HgfsInternalStatus HgfsSetattrFromName(char *cpName,
size_t cpNameSize,
- HgfsFileAttrInfo *attr,
+ HgfsFileAttrInfo *attr,
HgfsAttrHint hints,
uint32 caseFlags);
*-----------------------------------------------------------------------------
*/
-static void
+static void
HgfsServerSigOplockBreak(int sigNum, // IN: Signal number
siginfo_t *info, // IN: Additional info about signal
void *clientData) // IN: Ignored
ServerLockData *lockData;
int newLease, fd;
HgfsServerLock newServerLock;
-
+
ASSERT(sigNum == SIGIO);
ASSERT(info);
ASSERT(clientData == NULL);
-
+
fd = info->si_fd;
LOG(4, ("HgfsServerSigOplockBreak: Received SIGIO for fd %d\n", fd));
-
- /*
+
+ /*
* We've got all we need from the signal handler, let it continue handling
* signals of this type.
*/
Sig_Continue(sigNum);
-
- /*
+
+ /*
* According to locks.c in kernel source, doing F_GETLEASE when a lease
* break is pending will return the new lease we should use. It'll be
* F_RDLCK if we can downgrade, or F_UNLCK if we should break altogether.
goto error;
}
- /*
- * Setup a ServerLockData struct so that we can make use of
+ /*
+ * Setup a ServerLockData struct so that we can make use of
* HgfsServerOplockBreak which does the heavy lifting of discovering which
* HGFS handle we're interested in breaking, sending the break, receiving
* the acknowledgement, and firing the platform-specific acknowledgement
lockData->serverLock = newServerLock;
lockData->event = 0; // not needed
- /*
+ /*
* Relinquish control of this data. It'll get freed later, when the RPC
* command completes.
*/
} else {
Log("HgfsServerSigOplockBreak: Could not allocate memory for lease "
"break on behalf of fd %d\n", fd);
- }
-
+ }
+
error:
/* Clean up as best we can. */
fcntl(fd, F_SETLEASE, F_UNLCK);
* Closes the file descriptor.
*
* Results:
- * Zero on success.
+ * Zero on success.
* Non-zero on failure.
*
* Side effects:
goto exit;
}
- /*
- * Update the node in the cache with the new value of the append
- * flag.
+ /*
+ * Update the node in the cache with the new value of the append
+ * flag.
*/
if (!HgfsUpdateNodeAppendFlag(hgfsHandle, TRUE)) {
LOG(4, ("HgfsGetFd: Could not update the node in the cache\n"));
goto exit;
}
- /*
+ /*
* We're not interested in creating a new file. So let's just get the
* flags for a simple open request. This really should always work.
*/
HgfsServerGetOpenFlags(0, &openFlags);
- /*
+ /*
* We don't need to specify open permissions here because we're only
* reopening an existing file, not creating a new one.
*
goto exit;
}
- /*
+ /*
* Create mode_t for use in open(). If owner permissions are missing, use
* read/write for the owner permissions. If group or other permissions
* are missing, use the owner permissions.
*
* HgfsAcquireServerLock --
*
- * Acquire a lease for the open file. Typically we try and get the exact
+ * Acquire a lease for the open file. Typically we try and get the exact
* lease desired, but if the client asked for HGFS_LOCK_OPPORTUNISTIC, we'll
* take the "best" lease we can get.
*
return FALSE;
}
- /*
- * First tell the kernel which signal to send us. SIGIO is already the
+ /*
+ * First tell the kernel which signal to send us. SIGIO is already the
* default, but if we skip this step, we won't get the siginfo_t when
* a lease break occurs.
*
Log("HgfsAcquireServerLock: Could not set SIGIO as the desired lease "
"break signal for fd %d: %s\n", fileDesc, strerror(error));
return FALSE;
- }
-
+ }
+
/*
* If the client just wanted the best lock possible, start off with a write
* lease and move down to a read lease if that was unavailable.
} else {
LOG(4, ("HgfsAcquireServerLock: Unknown server lock\n"));
return FALSE;
- }
+ }
if (fcntl(fileDesc, F_SETLEASE, leaseType)) {
- /*
+ /*
* If our client was opportunistic and we failed to get his lease because
* someone else is already writing or reading to the file, try again with
* a read lease.
}
/* Got a lease of some kind. */
- LOG(4, ("HgfsAcquireServerLock: Got %s lease for fd %d\n",
+ LOG(4, ("HgfsAcquireServerLock: Got %s lease for fd %d\n",
leaseType == F_WRLCK ? "write" : "read", fileDesc));
*serverLock = leaseType == F_WRLCK ? HGFS_LOCK_EXCLUSIVE : HGFS_LOCK_SHARED;
return TRUE;
* otherwise. Unlike symlinks, aliases cannot be broken; if the target file
* is deleted, so is the alias.
*
- * If the given filename is (or contains) an alias, this function will
+ * If the given filename is (or contains) an alias, this function will
* resolve it completely and set targetName to something non-NULL.
*
* Results:
*-----------------------------------------------------------------------------
*/
-static HgfsInternalStatus
+static HgfsInternalStatus
HgfsGetattrResolveAlias(char const *fileName, // IN: Input filename
char **targetName) // OUT: Target filename
{
Boolean targetIsFolder;
Boolean wasAliased;
OSStatus osStatus;
-
- /*
+
+ /*
* Create and resolve an FSRef of the desired path. We pass FALSE to
* resolveAliasChains because aliases to aliases should behave as
* symlinks to symlinks. If the file is an alias, wasAliased will be set to
if (osStatus != noErr) {
LOG(4, ("HgfsGetattrResolveAlias: could not create file reference: "
"error %lu\n", osStatus));
- goto exit;
+ goto exit;
}
/*
* If alias points to an unmounted volume, the volume needs to be explicitly
"%lu\n", osStatus));
goto exit;
}
-
+
if (wasAliased) {
CFIndex maxPath;
- /*
+ /*
* This is somewhat convoluted. We create a CFURL from the FSRef because
* we want to call CFURLGetFileSystemRepresentation() to get a UTF-8
* string representing the target of the alias. But to call
"of memory for target name storage\n", maxPath));
goto exit;
}
- if (!CFURLGetFileSystemRepresentation(resolvedRef, FALSE, myTargetName,
+ if (!CFURLGetFileSystemRepresentation(resolvedRef, FALSE, myTargetName,
maxPath)) {
LOG(4, ("HgfsGetattrResolveAlias: could not convert and copy "
"resolved URL reference into allocated buffer\n"));
baseName = strrchr(fileName, DIRSEPC);
if ((baseName != NULL) &&
- (baseName[1] == '.') &&
- (strcmp(&baseName[1], ".") != 0) &&
+ (baseName[1] == '.') &&
+ (strcmp(&baseName[1], ".") != 0) &&
(strcmp(&baseName[1], "..") != 0)) {
attr->mask |= HGFS_ATTR_VALID_FLAGS;
attr->flags |= HGFS_ATTR_HIDDEN;
if (!share) {
return ENOENT;
}
-
+
/* If fileName is same as share path, access is denied. */
if (!Str_Strncmp(fileName, share->path, strlen(fileName))) {
return EACCES;
}
- /*
+ /*
* If share path is not a prefix in fileName, it is a wrong
* share for this fileName. Return ENOENT.
*/
if (error) {
return error;
}
-
+
LOG(4, ("%s: stating %s\n", __FUNCTION__, fileName));
error = Posix_Lstat(fileName, stats);
if (error < 0) {
error = HgfsStatFromName(fileName, share, caseFlags, &stats);
if (error) {
- LOG(4, ("HgfsGetattrFromName: error stating file: %s\n",
+ LOG(4, ("HgfsGetattrFromName: error stating file: %s\n",
strerror(error)));
status = error;
goto exit;
error = errno;
LOG(4, ("HgfsGetattrFromName: readlink returned wrong size\n"));
- /*
- * Because of an unavoidable race between the lstat(2) and the
+ /*
+ * Because of an unavoidable race between the lstat(2) and the
* readlink(2), the symlink target may have lengthened and we may
* not have read the entire link. If that happens, just return
* "out of memory".
}
}
} else {
- /*
+ /*
* Now is a good time to check if the file was an alias. If so, we'll
* treat it as a symlink.
*
LOG(4, ("HgfsGetattrFromName: could not resolve file aliases\n"));
}
if (myTargetName != NULL) {
- /*
+ /*
* Let's mangle the permissions and size of the file so that it more
* closely resembles a symlink. The size should be the length of the
* target name (not including the nul-terminator), and the permissions
HgfsStat(&stats, attr);
- /*
+ /*
* In the case we have a Windows client, force the hidden flag.
* This will be ignored by Linux, Solaris clients.
*/
attr->type = HGFS_FILE_TYPE_REGULAR;
LOG(4, ("HgfsGetattrFromFd: NOT a directory or symlink\n"));
}
-
+
HgfsStat(&stats, attr);
/*
goto exit;
}
- /*
+ /*
* In the case we have a Windows client, force the hidden flag.
* This will be ignored by Linux, Solaris clients.
*/
if (shareMode == HGFS_OPEN_MODE_READ_ONLY) {
- /*
+ /*
* Share does not allow write, so tell the client
* everything is read only.
*/
if (attr->mask & HGFS_ATTR_VALID_OTHER_PERMS) {
attr->otherPerms &= ~HGFS_PERM_WRITE;
}
- }
+ }
exit:
free(fileName);
*/
static void
-HgfsStat(struct stat *stats, // IN: stat information
+HgfsStat(struct stat *stats, // IN: stat information
HgfsFileAttrInfo *attr) // OUT: FileAttrInfo to copy into
{
attr->size = stats->st_size;
status = error;
goto exit;
}
-
+
/*
* Try to make each requested attribute change. In the event that
* one operation fails, we still attempt to perform any other
idChanged = HgfsSetattrOwnership(attr, &newUid, &newGid);
if (idChanged) {
- LOG(4, ("HgfsSetattrFromFd: set uid %"FMTUID" and gid %"FMTUID"\n",
+ LOG(4, ("HgfsSetattrFromFd: set uid %"FMTUID" and gid %"FMTUID"\n",
newUid, newGid));
if (fchown(fd, newUid, newGid) < 0) {
error = errno;
if (attr->mask & HGFS_ATTR_VALID_SIZE) {
- /*
+ /*
* XXX: Truncating the file will trigger an oplock break. The client
- * should have predicted this and removed the oplock prior to sending
- * the truncate request. At this point, the server must safeguard itself
+ * should have predicted this and removed the oplock prior to sending
+ * the truncate request. At this point, the server must safeguard itself
* against deadlock.
*/
if (!HgfsHandle2ServerLock(file, &serverLock)) {
}
}
- timesStatus = HgfsSetattrTimes(&statBuf, attr, hints,
+ timesStatus = HgfsSetattrTimes(&statBuf, attr, hints,
×[0], ×[1], ×Changed);
if (timesStatus == 0 && timesChanged) {
Bool superUser;
LOG(4, ("HgfsSetattrFromFd: setting new times\n"));
- /*
- * If the VMX is either the file owner or running as root, switch to
- * superuser briefly to set the files times using futimes. Otherwise
+ /*
+ * If the VMX is either the file owner or running as root, switch to
+ * superuser briefly to set the files times using futimes. Otherwise
* return an error.
*/
superUser = IsSuperUser();
}
if (attr->mask & HGFS_ATTR_VALID_SIZE) {
- /*
+ /*
* XXX: Truncating the file will trigger an oplock break. The client
- * should have predicted this and removed the oplock prior to sending
- * the truncate request. At this point, the server must safeguard itself
+ * should have predicted this and removed the oplock prior to sending
+ * the truncate request. At this point, the server must safeguard itself
* against deadlock.
*/
if (HgfsFileHasServerLock(localName, &serverLock, &fd)) {
int myNumDents = 0;
HgfsInternalStatus status = 0;
- /*
+ /*
* XXX: glibc uses 8192 (BUFSIZ) when it can't get st_blksize from a stat.
* Should we follow its lead and use stat to get st_blksize?
*/
}
fd = result;
- /*
+ /*
* Rather than read a single dent at a time, batch up multiple dents
* in each call by using a buffer substantially larger than one dent.
*/
- while ((result = getdents(fd, (void *)buffer,
+ while ((result = getdents(fd, (void *)buffer,
sizeof buffer)) > 0) {
size_t offset = 0;
while (offset < result) {
/* This dent had better fit in the actual space we've got left. */
ASSERT(newDent->d_reclen <= result - offset);
-
+
/* Add another dent pointer to the dents array. */
newDents = realloc(myDents, sizeof *myDents * (myNumDents + 1));
if (newDents == NULL) {
goto exit;
}
myDents = newDents;
-
- /*
- * Allocate the new dent and set it up. We do a straight memcpy of
+
+ /*
+ * Allocate the new dent and set it up. We do a straight memcpy of
* the entire record to avoid dealing with platform-specific fields.
*/
myDents[myNumDents] = malloc(newDent->d_reclen);
}
memcpy(myDents[myNumDents], newDent, newDent->d_reclen);
- /*
+ /*
* Dent is done. Bump the offset to the batched buffer to process the
* next dent within it.
*/
strerror(status)));
}
- /*
+ /*
* On error, free all allocated dents. On success, set the dents pointer
* given to us by the client.
*/
openInfo.caseFlags,
&localName,
NULL,
- NULL);
+ NULL);
if (nameStatus != HGFS_NAME_STATUS_COMPLETE) {
LOG(4, ("HgfsServerOpen: access check failed\n"));
status = HgfsConvertFromNameStatus(nameStatus);
ASSERT(localName);
openInfo.utf8Name = localName;
-
+
LOG(4, ("HgfsServerOpen: opening \"%s\", mode %u, flags %u, perms "
"%u%u%u%u\n", openInfo.utf8Name,
(openInfo.mask & HGFS_OPEN_VALID_MODE) ? openInfo.mode : 0,
(openInfo.mask & HGFS_OPEN_VALID_OTHER_PERMS) ?
openInfo.otherPerms : 0));
- /*
- * XXX: Before opening the file, see if we already have this file opened on
- * the server with an oplock on it. If we do, we must fail the new open
- * request, otherwise we will trigger an oplock break that the guest cannot
- * handle at this time (since the HGFS server is running in the context of
+ /*
+ * XXX: Before opening the file, see if we already have this file opened on
+ * the server with an oplock on it. If we do, we must fail the new open
+ * request, otherwise we will trigger an oplock break that the guest cannot
+ * handle at this time (since the HGFS server is running in the context of
* the vcpu thread), and we'll deadlock.
*
* Until we overcome this limitation via Crosstalk, we will be extra smart
* already have an oplock. And the server will protect itself like so.
*
* XXX: With some extra effort, we could allow a second open for read here,
- * since that won't break a shared oplock, but the clients should already
+ * since that won't break a shared oplock, but the clients should already
* realize that the second open can be avoided via sharing handles, too.
*/
if (HgfsFileHasServerLock(localName, &serverLock, &newFd)) {
if (status == 0) {
ASSERT(newFd >= 0);
- /*
+ /*
* Open succeeded, so make new node and return its handle. If we fail,
* it's almost certainly an internal server error.
*/
goto exit;
}
- status = HgfsPackOpenReply(&openInfo, packetOut, packetSize) ?
+ status = HgfsPackOpenReply(&openInfo, packetOut, packetSize) ?
0 :
EPROTO;
}
#endif
if (error < 0) {
status = errno;
- LOG(4, ("HgfsServerRead: error reading from file: %s\n",
+ LOG(4, ("HgfsServerRead: error reading from file: %s\n",
strerror(status)));
goto error;
}
ASSERT(packetIn);
ASSERT(packetOut);
ASSERT(packetSize);
-
+
if (header->op == HGFS_OP_WRITE_V3) {
HgfsRequestWriteV3 *request =
(HgfsRequestWriteV3 *)HGFS_REQ_GET_PAYLOAD_V3(packetIn);
file, offset, requiredSize, extra));
/* Get the file desriptor from the cache */
- status = HgfsGetFd(file, ((flags & HGFS_WRITE_APPEND) ?
- TRUE : FALSE),
+ status = HgfsGetFd(file, ((flags & HGFS_WRITE_APPEND) ?
+ TRUE : FALSE),
&fd);
if (status != 0) {
#endif
if (error < 0) {
status = errno;
- LOG(4, ("HgfsServerWrite: error writing to file: %s\n",
+ LOG(4, ("HgfsServerWrite: error writing to file: %s\n",
strerror(status)));
goto error;
}
ASSERT(packetOut);
ASSERT(packetSize);
header = (HgfsRequest *)packetIn;
-
+
if (header->op == HGFS_OP_SEARCH_OPEN_V3) {
HgfsRequestSearchOpenV3 *requestV3;
HgfsReplySearchOpenV3 *replyV3;
-
+
requestV3 = (HgfsRequestSearchOpenV3 *)HGFS_REQ_GET_PAYLOAD_V3(packetIn);
replyV3 = (HgfsReplySearchOpenV3 *)HGFS_REP_GET_PAYLOAD_V3(packetOut);
-
+
/* Enforced by the dispatch function */
ASSERT(*packetSize >= HGFS_REQ_PAYLOAD_SIZE_V3(requestV3));
extra = *packetSize - HGFS_REQ_PAYLOAD_SIZE_V3(requestV3);
LOG(4, ("HgfsServerSearchOpen: HGFS_OP_SEARCH_OPEN_V3\n"));
} else {
HgfsRequestSearchOpen *request;
-
+
request = (HgfsRequestSearchOpen *)packetIn;
/* Enforced by the dispatch function */
ASSERT(*packetSize >= sizeof *request);
extra = *packetSize - sizeof *request;
dirName = request->dirName.name;
- dirNameLength = request->dirName.length;
+ dirNameLength = request->dirName.length;
replySearch = &((HgfsReplySearchOpen *)packetOut)->search;
replySize = sizeof *request;
}
return EBADF;
}
- while ((dent = HgfsGetSearchResult(hgfsSearchHandle,
+ while ((dent = HgfsGetSearchResult(hgfsSearchHandle,
requestedOffset, FALSE)) != NULL) {
unsigned int length;
char *fullName;
switch (search.type) {
case DIRECTORY_SEARCH_TYPE_DIR:
- /*
+ /*
* Construct the UTF8 version of the full path to the file, and call
* HgfsGetattrFromName to get the attributes of the file.
*/
break;
case DIRECTORY_SEARCH_TYPE_BASE:
- /*
+ /*
* For a search enumerating all shares, give the default attributes
* for '.' and ".." (which aren't really shares anyway). Each real
* share gets resolved into its full path, and gets its attributes
* via HgfsGetattrFromName.
*/
- if (strcmp(dent->d_name, ".") == 0 ||
+ if (strcmp(dent->d_name, ".") == 0 ||
strcmp(dent->d_name, "..") == 0) {
LOG(4, ("HgfsServerSearchRead: assigning %s default "
"attributes\n", dent->d_name));
status = HgfsGetattrFromName(sharePath, share, HGFS_FILE_NAME_DEFAULT_CASE,
&attr, NULL);
if (status != 0) {
- /*
+ /*
* The dent no longer exists. Remove it from the search and get
- * the next dent instead.
+ * the next dent instead.
*/
LOG(4, ("HgfsServerSearchRead: stat FAILED, removing\n"));
- free(HgfsGetSearchResult(hgfsSearchHandle, requestedOffset,
+ free(HgfsGetSearchResult(hgfsSearchHandle, requestedOffset,
TRUE));
free(dent);
continue;
break;
case DIRECTORY_SEARCH_TYPE_OTHER:
- /*
- * The POSIX implementation of HgfsSearchOpen could not have created
+ /*
+ * The POSIX implementation of HgfsSearchOpen could not have created
* this kind of search.
*/
NOT_IMPLEMENTED();
#if defined(__APPLE__)
- /*
+ /*
* HGFS clients receive names in unicode normal form C,
* (precomposed) so Mac hosts must convert from normal form D
* (decomposed).
/* No entry at this offset */
free(search.utf8Dir);
LOG(4, ("HgfsServerSearchRead: no entry\n"));
- return HgfsPackSearchReadReply(NULL, 0, &attr, packetOut, packetSize) ?
- 0 :
+ return HgfsPackSearchReadReply(NULL, 0, &attr, packetOut, packetSize) ?
+ 0 :
EPROTO;
}
if (file != HGFS_INVALID_HANDLE) {
status = HgfsSetattrFromFd(file, &attr, hints);
} else {
- status = HgfsSetattrFromName(cpName,
- cpNameSize,
- &attr,
+ status = HgfsSetattrFromName(cpName,
+ cpNameSize,
+ &attr,
hints,
caseFlags);
}
ASSERT(localName);
- /*
+ /*
* Create mode_t for use in mkdir(). If owner permissions are missing, use
- * read/write/execute for the owner permissions. If group or other
+ * read/write/execute for the owner permissions. If group or other
* permissions are missing, use the owner permissions.
*
* This sort of makes sense. If the Windows driver wants to make a dir
ASSERT(localOldName);
/* Guest OS is not allowed to rename shared folder. */
- if (HgfsServerIsSharedFolderOnly(cpOldName,
+ if (HgfsServerIsSharedFolderOnly(cpOldName,
cpOldNameLen)){
LOG(4, ("HgfsServerRename: Cannot rename shared folder\n"));
status = EPERM;
goto exit;
}
}
-
+
ASSERT(localNewName);
if (hints & HGFS_RENAME_HINT_NO_REPLACE_EXISTING) {
goto exit;
}
- /*
+ /*
* Update all file nodes referring to this filename to the new name.
- *
+ *
* XXX: Note that this operation can fail (out of memory), but we'd like
* the client to see success anyway, because the rename succeeded.
*/
HgfsUpdateNodeNames(localOldName, localNewName);
- status = HgfsPackRenameReply(packetOut, packetSize) ?
+ status = HgfsPackRenameReply(packetOut, packetSize) ?
0 : EPROTO;
exit:
if (header->op == HGFS_OP_QUERY_VOLUME_INFO_V3) {
HgfsRequestQueryVolumeV3 *requestV3;
HgfsReplyQueryVolumeV3 *replyV3;
-
+
requestV3 = (HgfsRequestQueryVolumeV3 *)HGFS_REQ_GET_PAYLOAD_V3(packetIn);
replyV3 = (HgfsReplyQueryVolumeV3 *)HGFS_REP_GET_PAYLOAD_V3(packetOut);
freeBytes = &replyV3->freeBytes;
totalBytes = &replyV3->totalBytes;
-
+
/* Enforced by the dispatch function. */
ASSERT(*packetSize >= HGFS_REQ_PAYLOAD_SIZE_V3(requestV3));
extra = *packetSize - HGFS_REQ_PAYLOAD_SIZE_V3(requestV3);
} else {
HgfsRequestQueryVolume *request = (HgfsRequestQueryVolume *)packetIn;
HgfsReplyQueryVolume *reply = (HgfsReplyQueryVolume *)packetOut;
-
+
freeBytes = &reply->freeBytes;
totalBytes = &reply->totalBytes;
return status;
}
- /*
+ /*
* If we're outside the Tools, find out if we're to compute the minimum
* values across all shares, or the maximum values.
*/
infoType = VOLUME_INFO_TYPE_MIN;
#ifndef VMX86_TOOLS
{
- char *volumeInfoType = Config_GetString("min",
+ char *volumeInfoType = Config_GetString("min",
"tools.hgfs.volumeInfoType");
if (!Str_Strcasecmp(volumeInfoType, "max")) {
infoType = VOLUME_INFO_TYPE_MAX;
free(volumeInfoType);
}
#endif
-
+
/*
* Now go through all shares and get share paths on the server.
* Then retrieve space info for each share's volume.
uint64 freeBytes = 0;
uint64 totalBytes = 0;
unsigned int length;
-
+
length = strlen(dent->d_name);
-
+
/*
- * Now that the server is passing '.' and ".." around as dents, we
- * need to make sure to handle them properly. In particular, they
+ * Now that the server is passing '.' and ".." around as dents, we
+ * need to make sure to handle them properly. In particular, they
* should be ignored within QueryVolume, as they're not real shares.
*/
if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..")) {
- LOG(4, ("HgfsServerQueryVolume: Skipping fake share %s\n",
+ LOG(4, ("HgfsServerQueryVolume: Skipping fake share %s\n",
dent->d_name));
free(dent);
continue;
* the share count here.
*/
shares++;
-
+
/*
* Check permission on the share and get the share path. It is not
* fatal if these do not succeed. Instead we ignore the failures
failed++;
continue;
}
-
+
if (!HgfsServerStatFs(sharePath, sharePathLen,
&freeBytes, &totalBytes)) {
LOG(4, ("HgfsServerQueryVolume: error getting volume "
failed++;
continue;
}
-
+
/*
* Pick the drive with amount of space available and return that
* according to different volume info type.
symlinkName = requestV3->symlinkName.name;
symlinkNameLength = requestV3->symlinkName.length;
- /*
+ /*
* targetName starts after symlinkName + the variable length array
* in symlinkName.
*/
symlinkName = request->symlinkName.name;
symlinkNameLength = request->symlinkName.length;
- /*
+ /*
* targetName starts after symlinkName + the variable length array
* in symlinkName.
*/
fileDesc = lockData->fileDesc;
LOG(4, ("HgfsAckOplockBreak: Acknowledging break on fd %d\n", fileDesc));
- /*
+ /*
* The Linux server supports lock downgrading. We only downgrade to a shared
* lock if our previous call to fcntl() said we could, and if the client
* wants to downgrade to a shared lock. Otherwise, we break altogether.
*/
- if (lockData->serverLock == HGFS_LOCK_SHARED &&
+ if (lockData->serverLock == HGFS_LOCK_SHARED &&
replyLock == HGFS_LOCK_SHARED) {
newLock = F_RDLCK;
actualLock = replyLock;
libHgfsServerManagerGuest_a_SOURCES =
libHgfsServerManagerGuest_a_SOURCES += hgfsServerManagerGuest.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libHgfsServerManagerGuest.a
libHgfsServerManagerGuest_a_SOURCES = hgfsServerManagerGuest.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libHgfsServerPolicyGuest_a_SOURCES =
libHgfsServerPolicyGuest_a_SOURCES += hgfsServerPolicyGuest.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libHgfsServerPolicyGuest.a
libHgfsServerPolicyGuest_a_SOURCES = hgfsServerPolicyGuest.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libImpersonate_a_SOURCES += impersonate.c
libImpersonate_a_SOURCES += impersonatePosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_IMPERSONATE_CFLAGS@
+AM_CFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libImpersonate.a
libImpersonate_a_SOURCES = impersonate.c impersonatePosix.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_IMPERSONATE_CFLAGS@
+AM_CFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
all: all-am
.SUFFIXES:
#define BUILD_NUMBER \
- "build-90473"
+ "build-93084"
#define BUILD_NUMBER_NUMERIC \
- 90473
+ 93084
#define BUILD_NUMBER_NUMERIC_STRING \
- "90473"
+ "93084"
#define PRODUCT_BUILD_NUMBER \
- "product-build-182"
+ "product-build-196"
#define PRODUCT_BUILD_NUMBER_NUMERIC \
- 182
+ 196
#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
- "182"
+ "196"
#include "vm_assert.h"
#include "dynbuf.h"
-# if defined(__FreeBSD__) || defined(VMX86_SERVER) || defined(__APPLE__) \
- || (defined(__linux__) && !defined(GLIBC_VERSION_21) \
- && !defined(GLIBC_VERSION_22) && !defined(GLIBC_VERSION_23))
+/*
+ * These platforms use UTF-8 (or pretend to):
+ * FreeBSD: really UTF-8
+ * ESX: UTF-8 by policy decree
+ * Mac: really UTF-8
+ * Netware: don't know (either no iconv, or really UTF-8)
+ */
+
+#if defined(__FreeBSD__) || \
+ defined(VMX86_SERVER) || \
+ defined(__APPLE__) || \
+ defined(N_PLAT_NLM)
#define CURRENT_IS_UTF8
#endif
EXTERN HGLOBAL DnD_CreateHDrop(ConstUnicode path, ConstUnicode fileList);
EXTERN HGLOBAL DnD_CreateHDropForGuest(ConstUnicode path,
ConstUnicode fileList);
+EXTERN size_t DnD_CPStringToLocalString(ConstUnicode bufIn,
+ utf16_t **bufOut);
+EXTERN size_t DnD_LocalStringToCPString(utf16_t *bufIn,
+ char **bufOut);
EXTERN Bool DnD_FakeMouseEvent(DWORD flag);
EXTERN Bool DnD_FakeMouseState(DWORD key, Bool isDown);
EXTERN Bool DnD_FakeEscapeKey(void);
#ifndef _FILE_H_
#define _FILE_H_
+#ifdef __cplusplus
+extern "C"{
+#endif
+
#include <stdio.h>
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
EXTERN void FileMacos_MountDevAsyncNoResult(char const *bsdSliceDev,
Bool su);
-EXTERN Bool FileMacos_IsOnExternalDevice(char const *path);
-EXTERN Bool FileMacos_IsOnSparseDmg(char const *path);
+EXTERN Bool FileMacos_IsOnExternalDevice(int fd);
+EXTERN Bool FileMacos_IsOnSparseDmg(int fd);
EXTERN char *FileMacos_DiskDevToDiskName(char const *bsdDiskDev);
EXTERN char *File_ExpandAndCheckDir(const char *dirName);
+#ifdef __cplusplus
+} // extern "C" {
+#endif
+
#endif // ifndef _FILE_H_
#define SYMANTEC_LIVESTATE_EXTENSION "sv2i"
#define STORAGECRAFT_SHADOWSTOR_EXTENSION "spf"
#define ACRONIS_EXTENSION "tib"
+#define OPEN_VM_FORMAT_EXTENSION "ovf"
+#define ARCHIVED_OPEN_VM_FORMAT_EXTENSION "ova"
// "xvm" // VMware console configuration file
/*
GuestApp_HostCopyStep(uint8 c); // IN
Bool
-GuestApp_RpcSendOneUtf8(char const *cmd, // IN: RPCI command
- char const *arg, // IN: string arg to be Utf8 encoded
- size_t argSize); // IN: size of arg
-
-Bool
-GuestApp_RpcSendOneUtf8CPName(char const *cmd, // IN: RPCI command
- char const *arg, // IN: to UTF8 encode
- size_t argSize, // IN: size of arg
- char delimiter, // IN: delimiter
- char const *cpNameArg, // IN: to UTF8/CPName encode
- size_t cpNameArgSize); // IN: size of cpNameArg
+GuestApp_RpcSendOneArgCPName(char const *cmd, // IN: RPCI command
+ char const *arg, // IN: UTF-8 encoded string
+ size_t argSize, // IN: size of arg
+ char delimiter, // IN: delimiter
+ char const *cpNameArg, // IN: UTF-8 encoded CPName
+ size_t cpNameArgSize); // IN: size of cpNameArg
Bool
GuestApp_RpcSendOneCPName(char const *cmd, // IN: RPCI command
char delimiter, // IN: delimiter
#include "vm_basic_types.h"
#include "dbllnklst.h"
+#include "guestStats.h"
+#include <stdlib.h> // For inline malloc()/free()
#define GUEST_INFO_COMMAND_TWO "SetGuestInfo2"
#define GUEST_INFO_COMMAND "SetGuestInfo"
} GuestInfoIPAddressFamilyType;
/*
- * For backward compatibility's sake over wire (from Tools to VMX), new fields
+ * For backward compatibility's sake over wire (from Tools to VMX), new fields
* in this struct must be added at the end. THis is the part that goes over wire.
*/
typedef struct VmIpAddressEntryProtocol {
} NicEntryV1;
/*
- * For backward compatibility's sake over wire (from Tools to VMX), new fields
+ * For backward compatibility's sake over wire (from Tools to VMX), new fields
* in this struct must be added at the end. THis is the part that goes over wire.
*/
-typedef struct NicEntryProtocol {
+typedef struct NicEntryProtocol {
char macAddress[MAC_ADDR_SIZE]; /* In the format "12-23-34-45-56-67" */
char pad[1]; /* MAC_ADDR_SIZE happens to be 19. */
/* Pad it to be multiple of 4 bytes */
} NicEntryProtocol;
typedef struct NicEntry {
- DblLnkLst_Links links;
+ DblLnkLst_Links links;
NicEntryProtocol nicEntryProto;
DblLnkLst_Links ipAddressList;
/* DblLnkLst_Links gatewayList; */
} NicEntry;
-typedef struct NicInfoV1 {
+typedef struct GuestNicInfoV1 {
unsigned int numNicEntries;
NicEntryV1 nicList[MAX_NICS];
-} NicInfoV1;
+} GuestNicInfoV1;
+
/*
- * For backward compatibility's sake over wire (from Tools to VMX), new fields
+ * For backward compatibility's sake over wire (from Tools to VMX), new fields
* in this struct must be added at the end. This is the part that goes over wire.
*/
-typedef struct NicInfoProtocol {
+typedef struct NicInfoProtocol {
uint32 version;
uint32 nicEntrySizeOnWire; /* length of NicEntry over wire. Lengths differ */
/* with different versions. */
uint32 numNicEntries;
- uint32 totalInfoSizeOnWire;
+ uint32 totalInfoSizeOnWire;
} NicInfoProtocol;
-typedef struct NicInfo {
+typedef struct GuestNicInfo {
NicInfoProtocol nicInfoProto;
DblLnkLst_Links nicList; /* Pointers in it must be initialized to NULL */
-} NicInfo;
+} GuestNicInfo;
typedef
#include "vmware_pack_begin.h"
struct _PartitionEntry {
uint64 freeBytes;
uint64 totalBytes;
- char name[PARTITION_NAME_SIZE];
+ char name[PARTITION_NAME_SIZE];
}
#include "vmware_pack_end.h"
PartitionEntry, *PPartitionEntry;
typedef struct _DiskInfo {
unsigned int numEntries;
PPartitionEntry partitionList;
-} DiskInfo, *PDiskInfo;
+} GuestDiskInfo, *PGuestDiskInfo;
+
+
+
+/*
+ * Global functions
+ */
+
+extern Bool GuestInfo_GetFqdn(int outBufLen, char fqdn[]);
+extern Bool GuestInfo_GetNicInfo(GuestNicInfo *nicInfo);
+extern Bool GuestInfo_GetDiskInfo(PGuestDiskInfo di);
+extern Bool GuestInfo_GetOSName(unsigned int outBufFullLen,
+ unsigned int outBufLen, char *osNameFull,
+ char *osName);
-typedef
-#include "vmware_pack_begin.h"
-struct MemInfo {
- uint32 version; /* MemInfo structure version. */
- uint32 flags; /* Indicates which stats are valid. */
- uint64 memTotal; /* Total physical memory in Kb. */
- uint64 memFree; /* Physical memory available in Kb. */
- uint64 memBuff; /* Physical memory used as buffer cache in Kb. */
- uint64 memCache; /* Physical memory used as cache in Kb. */
- uint64 memActive; /* Physical memory actively in use in Kb (working set) */
- uint64 memInactive; /* Physical memory inactive in Kb (cold pages) */
- uint64 swapInRate; /* Memory swapped out in Kb / sec. */
- uint64 swapOutRate; /* Memory swapped out in Kb / sec. */
- uint64 ioInRate; /* Amount of I/O in in blocks / sec. */
- uint64 ioOutRate; /* Amount of I/O out in blocks / sec. */
- uint64 hugePagesTotal; /* Total number of huge pages. */
- uint64 hugePagesFree; /* Available number of huge pages. */
- uint64 memPinned; /* Unreclaimable physical memory in 4K page size. */
-}
-#include "vmware_pack_end.h"
-MemInfo;
-
-/* Flags for MemInfo. */
-#define MEMINFO_MEMTOTAL (1 << 0)
-#define MEMINFO_MEMFREE (1 << 1)
-#define MEMINFO_MEMBUFF (1 << 2)
-#define MEMINFO_MEMCACHE (1 << 3)
-#define MEMINFO_MEMACTIVE (1 << 4)
-#define MEMINFO_MEMINACTIVE (1 << 5)
-#define MEMINFO_SWAPINRATE (1 << 6)
-#define MEMINFO_SWAPOUTRATE (1 << 7)
-#define MEMINFO_IOINRATE (1 << 8)
-#define MEMINFO_IOOUTRATE (1 << 9)
-#define MEMINFO_HUGEPAGESTOTAL (1 << 10)
-#define MEMINFO_HUGEPAGESFREE (1 << 11)
-#define MEMINFO_MEMPINNED (1 << 12)
/*
*----------------------------------------------------------------------
*----------------------------------------------------------------------
*/
-static INLINE void
+static INLINE void
GuestInfo_FreeDynamicMemoryInNic(NicEntry *nicEntry) // IN
{
VmIpAddressEntry *ipAddressCur;
DblLnkLst_ForEachSafe(sCurrent, sNext, &nicEntry->ipAddressList) {
ipAddressCur = DblLnkLst_Container(sCurrent,
- VmIpAddressEntry,
+ VmIpAddressEntry,
links);
DblLnkLst_Unlink1(&ipAddressCur->links);
*
* GuestInfo_FreeDynamicMemoryInNicInfo --
*
- * Free all dynamically allocated memory in the struct pointed to
+ * Free all dynamically allocated memory in the struct pointed to
* by nicInfo.
*
* Results:
*----------------------------------------------------------------------
*/
-static INLINE void
-GuestInfo_FreeDynamicMemoryInNicInfo(NicInfo *nicInfo) // IN
+static INLINE void
+GuestInfo_FreeDynamicMemoryInNicInfo(GuestNicInfo *nicInfo) // IN
{
NicEntry *nicEntryCur = NULL;
DblLnkLst_Links *sCurrent;
DblLnkLst_ForEachSafe(sCurrent, sNext, &nicInfo->nicList) {
nicEntryCur = DblLnkLst_Container(sCurrent,
- NicEntry,
+ NicEntry,
links);
GuestInfo_FreeDynamicMemoryInNic(nicEntryCur);
DblLnkLst_Unlink1(&nicEntryCur->links);
free (nicEntryCur);
- }
+ }
DblLnkLst_Init(&nicInfo->nicList);
}
#include "guestInfo.h"
Bool GuestInfoGetFqdn(int outBufLen, char fqdn[]);
-Bool GuestInfoGetNicInfo(NicInfo *nicInfo);
+Bool GuestInfoGetNicInfo(GuestNicInfo *nicInfo);
void GuestInfoMemset(void * mem, int value, unsigned int size);
-Bool GuestInfoGetDiskInfo(PDiskInfo di);
-Bool GuestInfoGetOSName(unsigned int outBufFullLen, unsigned int outBufLen,
+Bool GuestInfoGetDiskInfo(PGuestDiskInfo di);
+Bool GuestInfoGetOSName(unsigned int outBufFullLen, unsigned int outBufLen,
char *osNameFull, char *osName);
int GuestInfo_GetSystemBitness(void);
-Bool GuestInfo_PerfMon(struct MemInfo *vmStats);
+Bool GuestInfo_PerfMon(struct GuestMemInfo *vmStats);
-NicEntry *GuestInfoAddNicEntry(NicInfo *nicInfo, const char macAddress[MAC_ADDR_SIZE]);
+NicEntry *GuestInfoAddNicEntry(GuestNicInfo *nicInfo,
+ const char macAddress[MAC_ADDR_SIZE]);
VmIpAddressEntry *GuestInfoAddIpAddress(NicEntry *nicEntry,
const char *ipAddr,
const uint32 af_type);
void GuestInfoAddSubnetMask(VmIpAddressEntry *ipAddressEntry,
const uint32 subnetMaskBits);
-NicEntry *GuestInfoFindMacAddress(NicInfo *nicInfo, const char *macAddress);
+NicEntry *GuestInfoFindMacAddress(GuestNicInfo *nicInfo, const char *macAddress);
#endif
#define GUESTMSG_FLAG_COOKIE 0x80000000
#define GUESTMSG_FLAG_ALL GUESTMSG_FLAG_COOKIE
+/*
+ * Maximum size of incoming message. This is to prevent denial of host service
+ * attacks from guest applications.
+ */
+#define GUESTMSG_MAX_IN_SIZE (64 * 1024)
#endif /* _GUEST_MSG_DEF_H_ */
#ifndef _GUEST_OS_H_
#define _GUEST_OS_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
#ifndef _HASH_TABLE_H_
#define _HASH_TABLE_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
#define HGFS_VERSION_OLD (1 << 0)
#define HGFS_VERSION_3 (1 << 1)
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
+#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
+
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
+#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
+
+
/*
* File types, used in HgfsAttr. We support regular files,
* directories, and symlinks.
#include "vm_basic_types.h"
-/*
+/*
* Definitions of wrapped internal primitives.
*
* We wrap open file handles and directory entries so that cross-platform HGFS
* server code can use them without platform-specific pre-processing.
*
- * On Linux, we use dirent64 from the kernel headers so as to alleviate any
- * confusion between what the kernel will give us from the getdents64()
+ * On Linux, we use dirent64 from the kernel headers so as to alleviate any
+ * confusion between what the kernel will give us from the getdents64()
* syscall and what userspace will expect. Note that to avoid depending on
* kernel headers directly, I've copied the dirent struct, replacing certain
* kernel basic types with our own.
*
- * On Windows, we define our own DirectoryEntry struct with d_reclen and
- * d_name, as those are the only two fields we're interested in. It's not
- * essential that it match the dirents from another platform, because we
+ * On Windows, we define our own DirectoryEntry struct with d_reclen and
+ * d_name, as those are the only two fields we're interested in. It's not
+ * essential that it match the dirents from another platform, because we
* control how they get created and populated, and they never pass down a wire.
*
- * Otherwise, we use the native dirent struct provided by the platform's libc,
- * as nobody else seems to suffer from the 32-bit vs. 64-bit ino_t and off_t
+ * Otherwise, we use the native dirent struct provided by the platform's libc,
+ * as nobody else seems to suffer from the 32-bit vs. 64-bit ino_t and off_t
* insanity that plagues Linux.
*/
#ifndef _WIN32
#include "hgfsUtil.h" // for HgfsInternalStatus
#include "syncMutex.h"
-/*
- * Does this platform have oplock support? We define it here to avoid long
+/*
+ * Does this platform have oplock support? We define it here to avoid long
* ifdefs all over the code. For now, Linux and Windows hosts only.
*
* XXX: Just kidding, no oplock support yet.
typedef enum {
DIRECTORY_SEARCH_TYPE_DIR, /* Objects are files and subdirectories */
DIRECTORY_SEARCH_TYPE_BASE, /* Objects are shares */
- DIRECTORY_SEARCH_TYPE_OTHER, /* Objects are the contents of
+ DIRECTORY_SEARCH_TYPE_OTHER, /* Objects are the contents of
"root/drive" or contents of "root" */
} DirectorySearchType;
VOLUME_INFO_TYPE_MAX,
} VolumeInfoType;
-/*
- * The "default" share access is used in cross-platform code, so it's helpful
- * to have a single macro for accessing it.
+/*
+ * The "default" share access is used in cross-platform code, so it's helpful
+ * to have a single macro for accessing it.
*/
#ifdef _WIN32
# define HGFS_DEFAULT_SHARE_ACCESS (FILE_SHARE_READ | FILE_SHARE_WRITE | \
/* Number of dents */
uint32 numDents;
- /*
- * What type of search is this (what objects does it track)? This is
- * important to know so we can do the right kind of stat operation later
+ /*
+ * What type of search is this (what objects does it track)? This is
+ * important to know so we can do the right kind of stat operation later
* when we want to retrieve the attributes for each dent.
*/
DirectorySearchType type;
* The main reason for these structs is data abstraction -- we pass
* a struct around instead of the individual parameters. This way
* as more parameters are implemented, we don't have to add more
- * parameters to the functions, instead just extend the structs.
+ * parameters to the functions, instead just extend the structs.
*/
-
+
typedef struct HgfsFileOpenInfo {
HgfsOp requestType;
HgfsHandle file; /* Opaque file ID used by the server */
HgfsOpenValid mask; /* Bitmask that specified which fields are valid. */
- HgfsOpenMode mode; /* Which type of access requested. See desiredAccess */
- HgfsOpenFlags flags; /* Which flags to open the file with */
- HgfsPermissions specialPerms; /* Desired 'special' permissions for file creation */
- HgfsPermissions ownerPerms; /* Desired 'owner' permissions for file creation */
- HgfsPermissions groupPerms; /* Desired 'group' permissions for file creation */
- HgfsPermissions otherPerms; /* Desired 'other' permissions for file creation */
- HgfsAttrFlags attr; /* Attributes, if any, for file creation */
- uint64 allocationSize; /* How much space to pre-allocate during creation */
- uint32 desiredAccess; /* Extended support for windows access modes */
+ HgfsOpenMode mode; /* Which type of access requested. See desiredAccess */
+ HgfsOpenFlags flags; /* Which flags to open the file with */
+ HgfsPermissions specialPerms; /* Desired 'special' permissions for file creation */
+ HgfsPermissions ownerPerms; /* Desired 'owner' permissions for file creation */
+ HgfsPermissions groupPerms; /* Desired 'group' permissions for file creation */
+ HgfsPermissions otherPerms; /* Desired 'other' permissions for file creation */
+ HgfsAttrFlags attr; /* Attributes, if any, for file creation */
+ uint64 allocationSize; /* How much space to pre-allocate during creation */
+ uint32 desiredAccess; /* Extended support for windows access modes */
uint32 shareAccess; /* Windows only, share access modes */
HgfsServerLock desiredLock; /* The type of lock desired by the client */
HgfsServerLock acquiredLock; /* The type of lock acquired by the server */
Bool
HgfsUnpackGetattrRequest(char const *packetIn, // IN: request packet
size_t packetSize, // IN: request packet size
- HgfsFileAttrInfo *attrInfo, // IN/OUT: unpacked attr struct
+ HgfsFileAttrInfo *attrInfo, // IN/OUT: unpacked attr struct
HgfsAttrHint *hints, // OUT: getattr hints
char **cpName, // OUT: cpName
size_t *cpNameSize, // OUT: cpName size
HgfsHandle *file, // OUT: file handle
uint32 *caseFlags); // OUT: case-sensitivity flags
-
+
Bool
HgfsUnpackDeleteRequest(char const *packetIn, // IN: request packet
size_t packetSize, // IN: request packet size
size_t *cpNameSize, // OUT: cpName size
HgfsDeleteHint *hints, // OUT: delete hints
HgfsHandle *file, // OUT: file handle
- uint32 *caseFlags); // OUT: case-sensitivity flags
+ uint32 *caseFlags); // OUT: case-sensitivity flags
Bool
HgfsPackDeleteReply(char *packetOut, // IN/OUT: outgoing packet
char *packetOut, // IN/OUT: outgoing packet
size_t *packetSize); // IN/OUT: size of packet
-Bool
-HgfsUnpackSearchReadRequest(const char *packetIn, // IN: request packet
+Bool
+HgfsUnpackSearchReadRequest(const char *packetIn, // IN: request packet
size_t packetSize, // IN: packet size
HgfsFileAttrInfo *attr, // OUT: unpacked attr struct
HgfsHandle *hgfsSearchHandle, // OUT: hgfs search handle
char *packetOut, // IN/OUT: outgoing packet
size_t *packetSize); // IN/OUT: size of packet
-Bool
+Bool
HgfsUnpackSetattrRequest(char const *packetIn, // IN: request packet
size_t packetSize, // IN: request packet size
- HgfsFileAttrInfo *attr, // IN/OUT: getattr info
+ HgfsFileAttrInfo *attr, // IN/OUT: getattr info
HgfsAttrHint *hints, // OUT: setattr hints
char **cpName, // OUT: cpName
size_t *cpNameSize, // OUT: cpName size
HgfsHandle *file, // OUT: server file ID
- uint32 *caseFlags); // OUT: case-sensitivity flags
+ uint32 *caseFlags); // OUT: case-sensitivity flags
Bool
HgfsPackSetattrReply(char *packetOut, // IN/OUT: outgoing packet
Bool
HgfsHandle2FileDesc(HgfsHandle handle, // IN: Hgfs file handle
- fileDesc *fd); // OUT: OS handle (file descriptor)
+ fileDesc *fd); // OUT: OS handle (file descriptor)
Bool
HgfsFileDesc2Handle(fileDesc fd, // IN: OS handle (file descriptor)
/* All oplock-specific functionality is defined here. */
#ifdef HGFS_OPLOCKS
-void
+void
HgfsServerOplockBreak(ServerLockData *data); // IN: server lock info
void
* Path of share in server's filesystem. Should
* not include final path separator.
*/
- size_t nameLen; /* Length of name string */
- size_t pathLen; /* Length of path string */
- Bool readAccess; /* Read permission for this share */
- Bool writeAccess; /* Write permission for this share */
+ char *shareTags; /* Tags associated with this share (comma delimited). */
+ size_t shareTagsLen; /* Length of shareTag string */
+ size_t nameLen; /* Length of name string */
+ size_t pathLen; /* Length of path string */
+ Bool readAccess; /* Read permission for this share */
+ Bool writeAccess; /* Write permission for this share */
} HgfsSharedFolder;
+typedef struct HgfsServerPolicy_ShareList {
+ size_t count;
+ char **shareNames;
+} HgfsServerPolicy_ShareList;
+
/* Defined in hgfsServerInt.h */
HgfsGetNameFunc HgfsServerPolicy_GetShares;
HgfsInitFunc HgfsServerPolicy_GetSharesInit;
HgfsCleanupFunc HgfsServerPolicy_GetSharesCleanup;
HgfsNameStatus
-HgfsServerPolicy_GetSharePath(char const *nameIn, // IN:
- size_t nameInLen, // IN:
- HgfsOpenMode mode, // IN:
- size_t *sharePathLen, // OUT:
- char const **sharePath, // OUT:
+HgfsServerPolicy_GetSharePath(char const *nameIn, // IN:
+ size_t nameInLen, // IN:
+ HgfsOpenMode mode, // IN:
+ size_t *sharePathLen, // OUT:
+ char const **sharePath, // OUT:
HgfsSharedFolder **share); // OUT:
HgfsNameStatus
HgfsServerPolicy_GetShareMode(char const *nameIn, // IN: Share name to retrieve
size_t nameInLen, // IN: Length of Share name
HgfsOpenMode *mode); // OUT: Share's access mode
+void
+HgfsServerPolicy_FreeShareList(HgfsServerPolicy_ShareList *shareList); // IN: list to free
+
+HgfsServerPolicy_ShareList *
+HgfsServerPolicy_GetSharesWithTag(const char *tag); // IN: tag to search for
+
#endif // _HGFS_SERVER_POLICY_H_
#define HGFS_NAME_BUFFER_SIZE(request) (HGFS_PACKET_MAX - (sizeof *request - 1))
#define HGFS_NAME_BUFFER_SIZET(sizet) (HGFS_PACKET_MAX - (sizet) - 1)
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
-#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
-
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
-#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
-
#ifndef _WIN32
/*
* Routines for converting between Win NT and unix time formats. The
#ifndef _LOGLEVEL_DEFS_H_
#define _LOGLEVEL_DEFS_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMMEXT
#define INCLUDE_ALLOW_VMCORE
#ifndef _LOGLEVEL_USER_H_
#define _LOGLEVEL_USER_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#include "includeCheck.h"
LOGLEVEL_VAR(pci_hyper), \
LOGLEVEL_VAR(pcibridge), \
LOGLEVEL_VAR(vide), \
+ LOGLEVEL_VAR(ideCdrom), \
LOGLEVEL_VAR(hostonly), \
LOGLEVEL_VAR(backdoorAbsMouse), \
LOGLEVEL_VAR(oprom), \
LOGLEVEL_VAR(macfilter), \
LOGLEVEL_VAR(macbw), \
LOGLEVEL_VAR(macfi), \
+ LOGLEVEL_VAR(vmkcfg), \
LOGLEVEL_VAR(vmxfer), \
LOGLEVEL_VAR(poll), \
LOGLEVEL_VAR(barrier), \
PRINTF_DECL(1, 2);
EXTERN void Msg_Post(MsgSeverity severity, const char *idFmt, ...)
PRINTF_DECL(2, 3);
+EXTERN void Msg_PostMsgList(MsgSeverity severity, Msg_List *msg);
+
EXTERN char *Msg_Format(const char *idFmt, ...)
PRINTF_DECL(1, 2);
EXTERN char *Msg_VFormat(const char *idFmt, va_list arguments);
char* fmt,
MsgFmt_Arg *args,
int numArgs);
+EXTERN Msg_List *Msg_VCreateMsgList(const char *idFmt, va_list args);
/*
* Unfortunately, gcc warns about both NULL and "" being passed as format
EXTERN HintResult Msg_Hint(Bool defaultShow, HintOptions options,
const char *idFmt, ...)
PRINTF_DECL(3, 4);
+EXTERN HintResult Msg_HintMsgList(Bool defaultShow, HintOptions options, Msg_List *msg);
EXTERN int Msg_CompareAnswer(Msg_String const *buttons, unsigned answer,
const char *string);
EXTERN char *Msg_GetString(const char *idString);
#ifndef STATS_USER_DEFS_H
#define STATS_USER_DEFS_H
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
*
*********************************************************/
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
#ifndef _STR_H_
#define _STR_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
OS_DETAIL_WIN2K3_BUS = 16,
OS_DETAIL_VISTA = 17,
OS_DETAIL_UNKNOWN = 18} OS_DETAIL_TYPE;
+typedef void (*DesktopSwitchNotifyCB)(void *);
+typedef struct {
+ DesktopSwitchNotifyCB cb; // callback to invoke.
+ void *cbdata; // data to pass to callback
+} DesktopSwitchThreadArgs;
BOOL System_SetProcessPrivilege(char *lpszPrivilege, Bool bEnablePrivilege);
OS_TYPE System_GetOSType(void);
OS_DETAIL_TYPE System_GetOSDetailType(void);
int32 System_GetSPVersion(void);
+Bool System_IsLoginScreenActive(void);
+Bool System_StartDesktopSwitchThread(DesktopSwitchThreadArgs *args);
+void System_KillDesktopSwitchThread(void);
#endif
#define INCLUDE_ALLOW_VMNIXMOD
#include "includeCheck.h"
+#include <string.h>
+
#include "unicodeBase.h"
#include "vm_assert.h"
* Pass -1 for any length parameter to indicate "from start until end
* of string".
*/
+
int Unicode_CompareRange(ConstUnicode str1,
UnicodeIndex str1Start,
UnicodeIndex str1Length,
Unicode Unicode_Format(const char *fmt, ...);
+/*
+ * Simple in-line functions that may be used below.
+ */
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * Unicode_IsIndexAtCodePointBoundary --
+ *
+ * Check a string index for code point boundary.
+ *
+ * The index must be valid (>= 0 and <= string length).
+ * The end of the string is considered a valid boundary.
+ *
+ * Results:
+ * TRUE if index is at a code point boundary.
+ *
+ * Side effects:
+ * Panic if index is not valid.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+static INLINE Bool
+Unicode_IsIndexAtCodePointBoundary(ConstUnicode str, // IN
+ UnicodeIndex index) // IN
+{
+ ASSERT(index >= 0 && index <= Unicode_LengthInCodeUnits(str));
+
+#ifdef SUPPORT_UNICODE_OPAQUE
+ NOT_IMPLEMENTED();
+#else
+ return (str[index] & 0xc0) != 0x80;
+#endif
+}
+
+
/*
* Other operations, each based upon calls to primitives.
*/
Unicode_EndsWith(ConstUnicode str, // IN
ConstUnicode suffix) // IN
{
+#ifdef SUPPORT_UNICODE_OPAQUE
UnicodeIndex strLength = Unicode_LengthInCodeUnits(str);
UnicodeIndex suffixLength = Unicode_LengthInCodeUnits(suffix);
+ UnicodeIndex offset = strLength - suffixLength;
if (suffixLength > strLength) {
return FALSE;
}
+ if (!Unicode_IsIndexAtCodePointBoundary(str, offset)) {
+ return FALSE;
+ }
return Unicode_CompareRange(str,
- strLength - suffixLength,
+ offset,
suffixLength,
suffix,
0,
suffixLength,
FALSE) == 0;
+#else
+ size_t strLength = strlen(str);
+ size_t suffixLength = strlen(suffix);
+
+ if (suffixLength > strLength) {
+ return FALSE;
+ }
+ return strcmp(str + strLength - suffixLength, suffix) == 0;
+#endif
}
Unicode_StartsWith(ConstUnicode str, // IN
ConstUnicode prefix) // IN
{
+#ifdef SUPPORT_UNICODE_OPAQUE
+ UnicodeIndex strLength = Unicode_LengthInCodeUnits(str);
UnicodeIndex prefixLength = Unicode_LengthInCodeUnits(prefix);
+ if (prefixLength > strLength) {
+ return FALSE;
+ }
+ if (!Unicode_IsIndexAtCodePointBoundary(str, prefixLength)) {
+ return FALSE;
+ }
+
return Unicode_CompareRange(str,
0,
prefixLength,
0,
prefixLength,
FALSE) == 0;
+#else
+ return strncmp(str, prefix, strlen(prefix)) == 0;
+#endif
}
#ifndef _UNICODE_TYPES_H_
#define _UNICODE_TYPES_H_
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#define INCLUDE_ALLOW_VMKERNEL
#ifndef UTIL_H
#define UTIL_H
+#define INCLUDE_ALLOW_MODULE
#define INCLUDE_ALLOW_USERLEVEL
#define INCLUDE_ALLOW_VMCORE
#include "includeCheck.h"
size_t dataSize);
EXTERN char *Util_GetCanonicalPath(const char *path);
#ifdef _WIN32
-EXTERN char *Util_GetLowerCaseCanonicalPath(const char *path);
+EXTERN char *Util_CompatGetCanonicalPath(const char *path);
+EXTERN char *Util_GetCanonicalPathForHash(const char *path);
+EXTERN char *Util_CompatGetLowerCaseCanonicalPath(const char* path);
#endif
EXTERN int Util_BumpNoFds(uint32 *cur, uint32 *wanted);
EXTERN Bool Util_CanonicalPathsIdentical(const char *path1, const char *path2);
#include "vmware_pack_end.h"
VixMsgSnapshotUpdateEvent;
+typedef
+#include "vmware_pack_begin.h"
+struct VixMsgSnapshotMRURequest {
+ VixCommandRequestHeader header;
+
+ int32 snapshotId;
+ int32 maxMRU;
+}
+#include "vmware_pack_end.h"
+VixMsgSnapshotMRURequest;
/*
* Fork a running VM.
#include "vmware_pack_end.h"
VixMsgRecordReplayEvent;
+typedef
+#include "vmware_pack_begin.h"
+struct VixMsgTimeMarkerEncounteredEvent {
+ VixMsgEventHeader eventHeader;
+ uint32 propertyListSize;
+}
+#include "vmware_pack_end.h"
+VixMsgTimeMarkerEncounteredEvent;
+
typedef
#include "vmware_pack_begin.h"
struct VixMsgDebuggerEvent {
#include "vmware_pack_end.h"
VixMsgVMSnapshotSetReplaySpeedRequest;
-typedef uint32 VixReplayStopAtType;
-enum {
- VIX_REPLAY_STOPAT_EIPECXBRCNT = 1,
-};
-
typedef
#include "vmware_pack_begin.h"
-struct VixMsgVMSetReplayStopAtRequest {
+struct VixMsgVMAddTimeMarkerRequest {
VixCommandRequestHeader header;
-
- int32 options;
- VixReplayStopAtType stopAtType;
+ uint32 options;
+ uint32 action;
+ uint32 propertyListSize;
}
#include "vmware_pack_end.h"
-VixMsgVMSetReplayStopAtRequest;
+VixMsgVMAddTimeMarkerRequest;
typedef
#include "vmware_pack_begin.h"
-struct VixMsgVMSetReplayStopAtEipEcxBrCntRequest {
- VixMsgVMSetReplayStopAtRequest stopAtCommonRequest;
- uint32 mask;
- uint64 eip;
- uint64 ecx;
- int64 brCnt;
+struct VixMsgVMGetTimeMarkerRequest {
+ VixCommandRequestHeader header;
+ uint32 options;
+ uint32 whence;
+ uint32 index;
+ uint32 propertyListSize;
}
#include "vmware_pack_end.h"
-VixMsgVMSetReplayStopAtEipEcxBrCntRequest;
+VixMsgVMGetTimeMarkerRequest;
+
/*
* Fault Tolerance Automation
#include "vmware_pack_end.h"
VixMsgDetachDebuggerResponse;
+/*
+ * **********************************************************
+ * VM Pause state change event format
+ */
+typedef
+#include "vmware_pack_begin.h"
+struct VixMsgPauseStateChangedEvent {
+ VixMsgEventHeader eventHeader;
+ Bool paused;
+}
+#include "vmware_pack_end.h"
+VixMsgPauseStateChangedEvent;
/*
VIX_COMMAND_REFRESH_RUNTIME_PROPERTIES = 129,
VIX_COMMAND_GET_SNAPSHOT_SCREENSHOT = 130,
- VIX_COMMAND_SET_REPLAY_STOP_POINT = 131,
+ VIX_COMMAND_ADD_TIMEMARKER = 131,
VIX_COMMAND_WAIT_FOR_USER_ACTION_IN_GUEST = 132,
VIX_COMMAND_VMDB_END_TRANSACTION = 133,
VIX_COMMAND_GET_VMX_DEVICE_STATE = 151,
- VIX_COMMAND_LAST_NORMAL_COMMAND = 152,
+ VIX_COMMAND_GET_NUM_TIMEMARKERS = 152,
+ VIX_COMMAND_GET_TIMEMARKER = 153,
+ VIX_COMMAND_REMOVE_TIMEMARKER = 154,
+
+ VIX_COMMAND_SNAPSHOT_SET_MRU = 156,
+
+ VIX_COMMAND_LAST_NORMAL_COMMAND = 157,
VIX_TEST_UNSUPPORTED_TOOLS_OPCODE_COMMAND = 998,
VIX_TEST_UNSUPPORTED_VMX_OPCODE_COMMAND = 999,
};
*-----------------------------------------------------------------------------
*/
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(_MSC_VER)
static INLINE void
Div643232(uint64 dividend, // IN
uint32 *quotient, // OUT
uint32 *remainder) // OUT
{
- *quotient = dividend / divisor;
- *remainder = dividend % divisor;
+ *quotient = (uint32)(dividend / divisor);
+ *remainder = (uint32)(dividend % divisor);
}
#endif
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
*
* XXX: The extract-macro script should be updated to handle this special case.
*/
-#define TOOLS_VERSION "2008.05.02"
+#define TOOLS_VERSION "2008.05.15"
#ifdef VMX86_VPX
#define VIM_API_TYPE "VirtualCenter"
#define VMBACKUP_EVENT_WRITER_ERROR "req.writerError"
#define VMBACKUP_EVENT_KEEP_ALIVE "req.keepAlive"
+/* These are the event codes sent with the events */
+typedef enum {
+ VMBACKUP_SUCCESS = 0,
+ VMBACKUP_INVALID_STATE,
+ VMBACKUP_SCRIPT_ERROR,
+ VMBACKUP_SYNC_ERROR,
+ VMBACKUP_REMOTE_ABORT,
+ VMBACKUP_UNEXPECTED_ERROR
+} VmBackupStatus;
+
/* Event name used for communnication between the VSS components. */
#ifdef _WIN32
#define VMVSS_RESUME_MSG TEXT("VmVss_ResumeSnapshotProvider")
# define VMBLOCK_CONTROL_DIRNAME VMBLOCK_FS_NAME
# define VMBLOCK_CONTROL_DEVNAME "dev"
# define VMBLOCK_CONTROL_MOUNTPOINT "mountPoint"
+# define VMBLOCK_CONTROL_PROC_DIRNAME "fs/" VMBLOCK_CONTROL_DIRNAME
-# define VMBLOCK_MOUNT_POINT "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_MOUNT_POINT "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_MOUNTPOINT
-# define VMBLOCK_DEVICE "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_DEVICE "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_DEVNAME
# define VMBLOCK_DEVICE_MODE O_WRONLY
# define VMBLOCK_CONTROL(fd, op, path) write(fd, path, op)
/* LEVEL, REG, VENDOR, POS, SIZE, NAME, MASK TYPE, SET TO, CPL3, [FUNC] */
#define CPUID_FIELD_DATA_LEVEL_8x \
-FIELDDEF( 86, ECX, AMD, 0, 8, CACHE_LINE, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 8, 4, CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 12, 4, CACHE_WAYS, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 16, 16, CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 0, 8, L2CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 8, 4, L2CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 12, 4, L2CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 16, 16, L2CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 0, 8, L3CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 8, 4, L3CACHE_LINE_PER_TAG,IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 12, 4, L3CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 18, 14, L3CACHE_SIZE, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 0, 1, TS, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 1, 1, FID, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 2, 1, VID, IGNORE, 0, FALSE) \
#define CPUID_MODEL_CORE 14
#define CPUID_MODEL_CORE2 15
#define CPUID_MODEL_PENRYN 0x17 // Effective model
+#define CPUID_MODEL_NEHALEM 0x1a // Effective model
static INLINE uint32
CPUID_EFFECTIVE_FAMILY(uint32 v) /* %eax from CPUID with %eax=1. */
libMessage_a_SOURCES += messageBackdoor.c
libMessage_a_SOURCES += messageStub.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libMessage.a
libMessage_a_SOURCES = message.c messageBackdoor.c messageStub.c
-AM_CFLAGS = @COMMON_CFLAGS@
SUBDIRS = shared
all: all-recursive
libMessage_la_SOURCES += ../message.c
libMessage_la_SOURCES += ../messageBackdoor.c
libMessage_la_SOURCES += ../messageStub.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LTLIBRARIES = libMessage.la
libMessage_la_SOURCES = ../message.c ../messageBackdoor.c \
../messageStub.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libMisc_a_SOURCES += codeset.c
endif
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_MISC_CFLAGS@
+AM_CFLAGS = @LIB_MISC_CPPFLAGS@
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
hostname.c idLinux.c iovector.c machineID.c miscSolaris.c \
random.c timeutil.c util_misc.c vmstdio.c posixPosix.c \
posixDlopen.c $(am__append_1)
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_MISC_CFLAGS@
+AM_CFLAGS = @LIB_MISC_CPPFLAGS@
SUBDIRS = shared
all: all-recursive
*/
-/*
- * Windows have their own logic for conversion. On Posix systems with iconv
- * available we use iconv. On systems without iconv use simple 1:1 translation
- * for UTF8 <-> Current. We also use 1:1 translation also for MacOS's conversion
- * between 'current' and 'UTF-8', as MacOS is UTF-8 only.
- */
-
#if defined(_WIN32)
# include <windows.h>
# include <malloc.h>
# include <str.h>
#else
-# define _GNU_SOURCE
+# if defined(__linux__)
+# define _GNU_SOURCE // see nl_langinfo_l explanation below
+# endif
# include <string.h>
# include <stdlib.h>
# include <errno.h>
-# if !defined(CURRENT_IS_UTF8)
-# include <locale.h>
-# ifndef LC_CTYPE_MASK // Prior to glibc 2.3
-# define LC_CTYPE_MASK (1 << LC_CTYPE)
-# define locale_t __locale_t
-# define newlocale __newlocale
-# define freelocale __freelocale
-# define nl_langinfo_l __nl_langinfo_l
-# endif
-# if !defined(N_PLAT_NLM) && !defined(__FreeBSD__)
-# define USE_ICONV
-# include <dlfcn.h>
-# include <iconv.h>
-# include <langinfo.h>
-# endif
-# endif
#endif
#if defined(__APPLE__)
# include <CoreFoundation/CoreFoundation.h> /* for CFString */
#endif
-#include "vm_assert.h"
+#include "vmware.h"
#include "codeset.h"
#include "codesetOld.h"
#include "unicodeTypes.h"
#include "util.h"
#include "str.h"
-#define CSGTG_NORMAL 0x0000 /* Without any information loss. */
-#define CSGTG_TRANSLIT 0x0001 /* Transliterate unknown characters. */
-#define CSGTG_IGNORE 0x0002 /* Skip over untranslatable characters. */
+/*
+ * These systems use iconv and nl_langinfo.
+ * See the definition of CURRENT_IS_UTF8.
+ *
+ * In addition, Linux has nl_langinfo_l. To get the nl_langinfo_l
+ * related definitions in local.h, we need to define _GNU_SOURCE,
+ * which has to be done above because one of the other standard include
+ * files sucks it in.
+ */
+
+#if !defined(CURRENT_IS_UTF8) && !defined(_WIN32)
+ #include <locale.h>
+ #if defined(__linux__) && !defined(LC_CTYPE_MASK) // Prior to glibc 2.3
+ #define LC_CTYPE_MASK (1 << LC_CTYPE)
+ #define locale_t __locale_t
+ #define newlocale __newlocale
+ #define freelocale __freelocale
+ #define nl_langinfo_l __nl_langinfo_l
+ #endif
+ #define USE_ICONV
+ #include <dlfcn.h>
+ #include <iconv.h>
+ #include <langinfo.h>
+#endif
+
-#if defined(__FreeBSD__) || defined(sun) || defined(VMX86_SERVER)
+#if defined(__FreeBSD__) || defined(sun)
static const char nul[] = {'\0', '\0'};
#else
static const wchar_t nul = L'\0';
}
-#if defined(_WIN32)
+#if defined(_WIN32) // {
-static Bool IsWin95(void);
static DWORD GetInvalidCharsFlag(void);
/*
static Bool
CodeSetOldUtf16leToGeneric(char const *bufIn, // IN
- size_t sizeIn, // IN
+ size_t sizeIn, // IN
UINT codeOut, // IN
DynBuf *db) // IN
{
*/
if (sizeIn) {
size_t initialSize;
+ Bool canHaveSubstitution = codeOut != CP_UTF8 && codeOut != CP_UTF7;
initialSize = DynBuf_GetSize(db);
for (;;) {
int result;
DWORD error;
+ BOOL usedSubstitution = FALSE;
if (DynBuf_Enlarge(db, 1) == FALSE) {
return FALSE;
}
result = WideCharToMultiByte(codeOut,
- 0,
+ canHaveSubstitution ? WC_NO_BEST_FIT_CHARS : 0,
(wchar_t const *)bufIn,
sizeIn / sizeof(wchar_t),
(char *)DynBuf_Get(db) + initialSize,
DynBuf_GetAllocatedSize(db) - initialSize,
NULL,
- /*
- * XXX We may need to pass that argument
- * to know when the conversion was
- * not possible --hpreg
- */
- NULL);
+ canHaveSubstitution ? &usedSubstitution : NULL);
+
+ if (usedSubstitution) {
+ return FALSE;
+ }
+
if (result > 0) {
DynBuf_SetSize(db, initialSize + result);
break;
ok = CodeSetOldUtf16leToGeneric(bufIn, sizeIn, CP_ACP, &db);
return CodeSetOldDynBufFinalize(ok, &db, bufOut, sizeOut);
}
-#endif
+
+#endif // }
#if defined(__APPLE__)
*
* Convert the content of a buffer (that uses the UTF-8 encoding) into
* another buffer (that uses the UTF-8 encoding) that is in precomposed
- (Normalization Form C) or decomposed (Normalization Form D).
+ * (Normalization Form C) or decomposed (Normalization Form D).
*
* Results:
* TRUE on success: '*bufOut' contains a NUL terminated buffer.
* --hpreg
*/
+
+#if defined(USE_ICONV) // {
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * CodeSetOldGetCodeSetFromLocale --
+ *
+ * Extract the native code set from LC_CTYPE.
+ *
+ * Results:
+ *
+ * The name of the current code set on success. The return value depends
+ * on how LC_CTYPE is set in the locale, even if setlocale has not been
+ * previously called.
+ *
+ * Side effects:
+ *
+ * May briefly set and restore locale on some systems, which is not
+ * thread-safe.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+static char *
+CodeSetOldGetCodeSetFromLocale(void)
+{
+ char *codeset;
+
+#if defined(__linux__)
+
+ locale_t new = newlocale(LC_CTYPE_MASK, "", NULL);
+ if (!new) {
+ /*
+ * If the machine is configured incorrectly (no current locale),
+ * newlocale() could return NULL. Try to fall back on the "C"
+ * locale.
+ */
+
+ new = newlocale(LC_CTYPE_MASK, "C", NULL);
+ ASSERT(new);
+ }
+ codeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new));
+ freelocale(new);
+
+#elif defined(sun)
+
+ char *locale = setlocale(LC_CTYPE, NULL);
+ if (!setlocale(LC_CTYPE, "")) {
+ /*
+ * If the machine is configured incorrectly (no current locale),
+ * setlocale() can fail. Try to fall back on the "C" locale.
+ */
+
+ setlocale(LC_CTYPE, "C");
+ }
+ codeset = Util_SafeStrdup(nl_langinfo(CODESET));
+ setlocale(LC_CTYPE, locale);
+
+#else
+#error
+#endif
+
+ return codeset;
+}
+#endif // } USE_ICONV
+
+
/*
*-----------------------------------------------------------------------------
*
}
return ret;
-#elif defined(__linux__) && (defined(GLIBC_VERSION_21) || \
- defined(GLIBC_VERSION_22) || defined(GLIBC_VERSION_23))
+#elif defined(USE_ICONV)
static char *cachedCodeset;
- if (!cachedCodeset) {
- locale_t new = newlocale(LC_CTYPE_MASK, "", NULL);
- cachedCodeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new));
- freelocale(new);
- }
-
- return cachedCodeset;
-#else // Solaris, Netware
- static char *cachedCodeset;
+ /*
+ * Mirror GLib behavior:
+ *
+ * $G_FILENAME_ENCODING can have one or more encoding names
+ * in a comma separated list.
+ *
+ * If the first entry in $G_FILENAME_ENCODING is set to
+ * "@locale", get the code set from the environment.
+ *
+ * If the first entry in $G_FILENAME_ENCODING is not set to
+ * "@locale", then it is the encoding name.
+ *
+ * If $G_FILENAME_ENCODING is not set and $G_BROKEN_FILENAMES
+ * is set, the get the code set from the environment.
+ *
+ * If none of the above are met, the code set is UTF-8.
+ *
+ * XXX - TODO - Support multiple encodings in the list.
+ * While G_FILENAME_ENCODING is documented to be a list,
+ * the current implementation (GLib 2.16) ignores all but
+ * the first entry when converting to/from UTF-8.
+ */
if (!cachedCodeset) {
- char *locale;
+ char *gFilenameEncoding = getenv("G_FILENAME_ENCODING");
+ char *p;
+
+ if (gFilenameEncoding && *gFilenameEncoding) {
+ gFilenameEncoding = Util_SafeStrdup(gFilenameEncoding);
+ p = strchr(gFilenameEncoding, ',');
+ if (p) {
+ *p = '\0';
+ }
+ if (!strcmp(gFilenameEncoding, "@locale")) {
+ free(gFilenameEncoding);
+ cachedCodeset = CodeSetOldGetCodeSetFromLocale();
+ return cachedCodeset;
+ }
+ cachedCodeset = gFilenameEncoding;
+ return cachedCodeset;
+ }
- locale = setlocale(LC_CTYPE, NULL);
- setlocale(LC_CTYPE, "");
- cachedCodeset = Util_SafeStrdup(nl_langinfo(CODESET));
- setlocale(LC_CTYPE, locale);
+ if (getenv("G_BROKEN_FILENAMES")) {
+ cachedCodeset = CodeSetOldGetCodeSetFromLocale();
+ return cachedCodeset;
+ }
+
+ cachedCodeset = "UTF-8";
}
return cachedCodeset;
-
+#else
+#error
#endif
}
-#if defined(USE_ICONV)
+#if defined(USE_ICONV) // {
/*
*-----------------------------------------------------------------------------
return FALSE;
}
-#else // USE_ICONV
+#else // USE_ICONV } {
/*
*-----------------------------------------------------------------------------
return ret;
}
-#endif // USE_ICONV
+#endif // USE_ICONV }
/*
*-----------------------------------------------------------------------------
Bool status;
if (CodeSetOld_Utf8ToUtf16le(bufIn, sizeIn, &buf, &size) == FALSE) {
- if (IsWin95()) {
- /*
- * Win95 doesnt support UTF-8 by default. If we are here,
- * it means that the application was not linked with unicows.lib.
- * So simply copy the buffer as is.
- */
- return CodeSetOldDuplicateStr(bufIn, sizeIn, bufOut, sizeOut);
- }
return FALSE;
}
return status;
#else
- return FALSE;
+#error
#endif
}
Bool status;
if (CodeSetOld_Utf8ToUtf16le(bufIn, sizeIn, &buf, &size) == FALSE) {
- if (IsWin95()) {
- /*
- * Win95 doesnt support UTF-8 by default. If we are here,
- * it means that the application was not linked with unicows.lib.
- * So simply copy the buffer as is.
- */
- return CodeSetOldDuplicateStr(bufIn, sizeIn, bufOut, sizeOut);
- }
return FALSE;
}
return status;
#else
- return FALSE;
+#error
#endif
}
status = CodeSetOld_Utf16leToUtf8(buf, size, bufOut, sizeOut);
free(buf);
- if (!status && IsWin95()) {
- /*
- * Win95 doesnt support UTF-8 by default. If we are here,
- * it means that the application was not linked with unicows.lib.
- * So simply copy the buffer as is.
- */
- return CodeSetOldDuplicateStr(bufIn, sizeIn, bufOut, sizeOut);
- }
- return status;
+ return status;
#else
- return FALSE;
+#error
#endif
}
/* XXX We should probably use CP_THREAD_ACP on Windows 2000/XP. */
ok = CodeSetOldGenericToUtf16le(CP_ACP, bufIn, sizeIn, &db);
#else
- ok = FALSE;
+#error
#endif
return CodeSetOldDynBufFinalize(ok, &db, bufOut, sizeOut);
}
char **bufOut, // OUT
size_t *sizeOut) // OUT
{
-#if defined(USE_ICONV)
+#if defined(CURRENT_IS_UTF8)
+ NOT_IMPLEMENTED();
+#elif defined(USE_ICONV)
DynBuf db;
Bool ok;
return CodeSetOldDynBufFinalize(ok, &db, bufOut, sizeOut);
#elif defined(_WIN32)
return CodeSetOldUtf16leToCurrent(bufIn, sizeIn, bufOut, sizeOut);
-#else // Not Windows or Linux or Solaris
- return FALSE;
+#else
+#error
#endif
}
char **bufOut, // OUT
size_t *sizeOut) // OUT
{
-#if defined(USE_ICONV)
+#if defined(CURRENT_IS_UTF8)
+ NOT_IMPLEMENTED();
+#elif defined(USE_ICONV)
DynBuf db;
Bool ok;
error:
free(bufIn_dup);
return status;
-#else // Not Windows or Linux or Solaris
- return FALSE;
+#else
+#error
#endif
}
#if defined(_WIN32)
-/*
- *-----------------------------------------------------------------------------
- *
- * IsWin95 --
- *
- * Is the current OS Windows 95?
- *
- * Results:
- * TRUE if this is Win95
- * FALSE if this is not Win95.
- *
- * Side effects:
- * none
- *
- *-----------------------------------------------------------------------------
- */
-
-static Bool
-IsWin95(void)
-{
- OSVERSIONINFOEX osvi;
- BOOL bOsVersionInfoEx;
-
- /*
- * Try calling GetVersionEx using the OSVERSIONINFOEX structure.
- * If that fails, try using the OSVERSIONINFO structure.
- */
-
- ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
- if(!(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi))) {
- /* If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO. */
- osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
- if (!GetVersionEx((OSVERSIONINFO *) &osvi)) {
- return FALSE;
- }
- }
-
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
- if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) {
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-
/*
*-----------------------------------------------------------------------------
*
libMisc_la_SOURCES += ../codeset.c
endif
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_MISC_CFLAGS@
+AM_CFLAGS = @LIB_MISC_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
../hashTable.c ../hostinfo_misc.c ../hostname.c ../idLinux.c \
../iovector.c ../machineID.c ../miscSolaris.c ../random.c \
../timeutil.c ../util_misc.c ../vmstdio.c $(am__append_1)
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_MISC_CFLAGS@
+AM_CFLAGS = @LIB_MISC_CPPFLAGS@
all: all-am
.SUFFIXES:
/*
*-----------------------------------------------------------------------------
*
- * Util_GetLowerCaseCanonicalPath --
+ * Util_GetCanonicalPathForHash --
*
* Utility function to both get the canonical version of the input path
- * and lower case it at the same time.
+ * and produce a unique case-insensitive version of the path suitable
+ * for use as a seed to hash functions.
*
* Results:
- * A lower case freshly allocated canonicalized path name.
+ * Canonicalized UTF-8 pathname suitable for use in hashing.
+ *
+ * Side effects:
+ * None.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+char *
+Util_GetCanonicalPathForHash(const char *path) // IN: UTF-8
+{
+ char *ret = NULL;
+ char *cpath = Util_GetCanonicalPath(path);
+
+ if (cpath != NULL) {
+ ret = Unicode_FoldCase(cpath);
+ free(cpath);
+ }
+
+ return ret;
+}
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * UtilGetLegacyEncodedString --
+ *
+ * Takes a UTF-8 string, and allocates a new string in legacy encoding.
+ * This is necessary to maintain compatibility with older versions of
+ * the product, which may have stored strings (paths) in legacy
+ * encoding. Hence, the use of WideCharToMultiByte().
+ *
+ * Results:
+ * An allocated string in legacy encoding (MBCS when applicable).
+ * NULL on failure.
+ *
+ * Side effects:
+ * None.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+static char*
+UtilGetLegacyEncodedString(const char *path) // IN: UTF-8
+{
+ char *ret = NULL;
+ char *cpath = Util_GetCanonicalPath(path);
+
+ if (cpath != NULL) {
+ char *apath = NULL;
+ int retlen;
+ WCHAR *wcpath = Unicode_GetAllocUTF16(cpath);
+
+ /* First get the length of multibyte string */
+ int alen = WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, wcpath, -1,
+ NULL, 0, NULL, NULL);
+ if (alen > 0) {
+ /* Now get the converted string */
+ ret = Util_SafeMalloc(alen);
+ retlen = WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, wcpath, -1,
+ ret, alen, NULL, NULL);
+ if (retlen != alen) {
+ free(ret);
+ ret = NULL;
+ }
+ }
+ free(cpath);
+ free(wcpath);
+ }
+
+ return ret;
+}
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * Util_CompatGetCanonicalPath --
+ *
+ * Canonicalizes a path name (compatibility version).
+ *
+ * Results:
+ * A freshly allocated canonicalized path name in legacy encoding
+ * (MBCS when applicable).
*
* Side effects:
* None.
*/
char*
-Util_GetLowerCaseCanonicalPath(const char* path) // IN
+Util_CompatGetCanonicalPath(const char *path) // IN: UTF-8
{
- char *ret = Util_GetCanonicalPath(path);
- if (ret != NULL) {
- ret = _strlwr(ret);
+ char *cpath = Util_GetCanonicalPath(path);
+ char *ret = NULL;
+
+ if (cpath != NULL) {
+ ret = UtilGetLegacyEncodedString(cpath);
+ free(cpath);
}
+
return ret;
}
#endif
libNetUtil_a_SOURCES =
libNetUtil_a_SOURCES += netUtilLinux.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libNetUtil.a
libNetUtil_a_SOURCES = netUtilLinux.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libPanic_a_SOURCES =
libPanic_a_SOURCES += panic.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libPanic.a
libPanic_a_SOURCES = panic.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libPanicDefault_a_SOURCES =
libPanicDefault_a_SOURCES += panic.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libPanicDefault.a
libPanicDefault_a_SOURCES = panic.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libPrinter_a_SOURCES =
libPrinter_a_SOURCES += printer.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libPrinter.a
libPrinter_a_SOURCES = printer.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libProcMgr_a_SOURCES =
libProcMgr_a_SOURCES += procMgrPosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_PROC_MGR_CFLAGS@
+AM_CFLAGS = @LIB_PROC_MGR_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libProcMgr.a
libProcMgr_a_SOURCES = procMgrPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_PROC_MGR_CFLAGS@
+AM_CFLAGS = @LIB_PROC_MGR_CPPFLAGS@
all: all-am
.SUFFIXES:
libRpcIn_a_SOURCES =
libRpcIn_a_SOURCES += rpcin.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libRpcIn.a
libRpcIn_a_SOURCES = rpcin.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libRpcOut_a_SOURCES =
libRpcOut_a_SOURCES += rpcout.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libRpcOut.a
libRpcOut_a_SOURCES = rpcout.c
-AM_CFLAGS = @COMMON_CFLAGS@
SUBDIRS = shared
all: all-recursive
libRpcOut_la_SOURCES =
libRpcOut_la_SOURCES += ../rpcout.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libRpcOut.la
libRpcOut_la_SOURCES = ../rpcout.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libRpcVmx_a_SOURCES =
libRpcVmx_a_SOURCES += rpcvmx.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libRpcVmx.a
libRpcVmx_a_SOURCES = rpcvmx.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libSocketMgr_a_SOURCES =
libSocketMgr_a_SOURCES += socketMgr.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libSocketMgr.a
libSocketMgr_a_SOURCES = socketMgr.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libStrUtil_a_SOURCES =
libStrUtil_a_SOURCES += strutil.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libStrUtil.a
libStrUtil_a_SOURCES = strutil.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libString_a_SOURCES += convertutf.c
libString_a_SOURCES += str.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_STRING_CFLAGS@
+AM_CFLAGS = @LIB_STRING_CPPFLAGS@
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LIBRARIES = libString.a
libString_a_SOURCES = bsd_output_shared.c bsd_vsnprintf.c \
bsd_vsnwprintf.c convertutf.c str.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_STRING_CFLAGS@
+AM_CFLAGS = @LIB_STRING_CPPFLAGS@
SUBDIRS = shared
all: all-recursive
libString_la_SOURCES += ../convertutf.c
libString_la_SOURCES += ../str.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_STRING_CFLAGS@
+AM_CFLAGS = @LIB_STRING_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
noinst_LTLIBRARIES = libString.la
libString_la_SOURCES = ../bsd_output_shared.c ../bsd_vsnprintf.c \
../bsd_vsnwprintf.c ../convertutf.c ../str.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_STRING_CFLAGS@
+AM_CFLAGS = @LIB_STRING_CPPFLAGS@
all: all-am
.SUFFIXES:
libSync_a_SOURCES += syncMutex.c
libSync_a_SOURCES += syncWaitQPosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
SUBDIRS =
SUBDIRS += shared
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libSync.a
libSync_a_SOURCES = syncMutex.c syncWaitQPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
SUBDIRS = shared
all: all-recursive
libSync_la_SOURCES =
libSync_la_SOURCES += ../syncMutex.c
libSync_la_SOURCES += ../syncWaitQPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libSync.la
libSync_la_SOURCES = ../syncMutex.c ../syncWaitQPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libSyncDriver_a_SOURCES =
libSyncDriver_a_SOURCES += syncDriverPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libSyncDriver.a
libSyncDriver_a_SOURCES = syncDriverPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
noinst_LIBRARIES = libSystem.a
libSystem_a_SOURCES = systemLinux.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libSystem.a
libSystem_a_SOURCES = systemLinux.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
#include "vm_assert.h"
#include "system.h"
#include "debug.h"
+#include "posix.h"
#include "unicode.h"
#define MAX_IFACES 4
*----------------------------------------------------------------------
*
* System_GetEnv --
- *
+ * Read environment variables.
*
* Results:
- * A copy of the string
+ * A copy of the environment variable encoded in UTF-8.
*
* Side effects:
* None.
char *
System_GetEnv(Bool global, // IN
- char *valueName) // IN
+ char *valueName) // IN: UTF-8
{
char *result;
#if defined(sun)
result = NULL;
#else
- result = getenv(valueName);
+ result = Posix_Getenv(valueName);
#endif
if (NULL != result) {
int
System_SetEnv(Bool global, // IN
- char *valueName, // IN
- char *value) // IN
+ char *valueName, // IN: UTF-8
+ char *value) // IN: UTF-8
{
#if defined(sun)
return(-1);
#else
- return(setenv(valueName, value, 1));
+ return Posix_Setenv(valueName, value, 1);
#endif
} // System_SetEnv
libToolsLogger_a_SOURCES =
libToolsLogger_a_SOURCES += logger.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libToolsLogger.a
libToolsLogger_a_SOURCES = logger.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
noinst_LIBRARIES = libUnicode.a
-libUnicode_a_SOURCES =
+libUnicode_a_SOURCES =
libUnicode_a_SOURCES += unicodeCommon.c
libUnicode_a_SOURCES += unicodeSimpleBase.c
libUnicode_a_SOURCES += unicodeSimpleCaseFolding.c
if NO_ICU
libUnicode_a_SOURCES += unicodeICU.c
endif
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
unicodeSimpleCaseFolding.c unicodeSimpleTypes.c \
unicodeSimpleOperations.c unicodeSimpleTransforms.c \
unicodeStatic.c $(am__append_1)
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libunityStub_a_SOURCES =
libunityStub_a_SOURCES += unityStub.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libunityStub.a
libunityStub_a_SOURCES = unityStub.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_FILE_CFLAGS@
+AM_CFLAGS = @LIB_FILE_CPPFLAGS@
all: all-am
.SUFFIXES:
libUser_a_SOURCES += util.c
libUser_a_SOURCES += utilPosix.c
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @LIB_USER_CFLAGS@
+AM_CFLAGS = @LIB_USER_CPPFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libUser.a
libUser_a_SOURCES = hostinfo.c hostinfoPosix.c util.c utilPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@ @LIB_USER_CFLAGS@
+AM_CFLAGS = @LIB_USER_CPPFLAGS@
all: all-am
.SUFFIXES:
libVixTools_a_SOURCES =
libVixTools_a_SOURCES += vixTools.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libVixTools.a
libVixTools_a_SOURCES = vixTools.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
VixError
VixToolsCreateTempFile(VixCommandRequestHeader *requestMsg, // IN
- char **result) // OUT
+ char **result) // OUT: UTF-8
{
VixError err = VIX_OK;
char *filePathName = NULL;
- static char resultBuffer[FILE_MAXPATH];
int fd = -1;
Bool impersonatingVMWareUser = FALSE;
void *userToken = NULL;
Debug("Unable to close a file, errno is %d.\n", errno);
}
- Str_Sprintf(resultBuffer, sizeof(resultBuffer), "%s", filePathName);
- *result = resultBuffer;
+ *result = filePathName;
abort:
if (impersonatingVMWareUser) {
}
VixToolsLogoutUser(userToken);
- free(filePathName);
-
return err;
} // VixToolsCreateTempFile
*
* VixToolsReadVariable --
*
- * Write an environment variable in the guest.
+ * Read an environment variable in the guest. The name of the environment
+ * variable is expected to be in UTF-8.
*
* Return value:
* VixError
VixError
VixToolsReadVariable(VixCommandRequestHeader *requestMsg, // IN
- char **result) // OUT
+ char **result) // OUT: UTF-8
{
VixError err = VIX_OK;
char *value = "";
- static char resultBuffer[FILE_MAXPATH];
Bool impersonatingVMWareUser = FALSE;
void *userToken = NULL;
VixMsgReadVariableRequest *readRequest;
break;
} // switch (readRequest->variableType)
- Str_Sprintf(resultBuffer, sizeof(resultBuffer), "%s", value);
- *result = resultBuffer;
+ *result = value;
abort:
if (impersonatingVMWareUser) {
VixToolsUnimpersonateUser(userToken);
}
VixToolsLogoutUser(userToken);
- free(value);
return err;
} // VixToolsReadVariable
*
* VixToolsWriteVariable --
*
- * Write an environment variable in the guest.
+ * Write an environment variable in the guest. The name of the environment
+ * variable and its value are expected to be in UTF-8.
*
* Return value:
* VixError
* Calculate the size of the result buffer and keep track of the
* max number of entries we can store.
*/
- resultBufferSize = 2; // truncation bool + space
+ resultBufferSize = 3; // truncation bool + space + '\0'
formatStringLength = strlen(fileInfoFormatString);
for (fileNum = offset; fileNum < numFiles; fileNum++) {
break;
}
}
- numFiles = lastGoodNumFiles;
resultBufferSize = lastGoodResultBufferSize;
/*
}
}
- /* File_ListDirectory never returns "." or ".." */
- for (fileNum = offset; fileNum < numFiles; fileNum++) {
+ for (fileNum = offset; fileNum < lastGoodNumFiles; fileNum++) {
+ /* File_ListDirectory never returns "." or ".." */
char *pathName;
currentFileName = fileNameList[fileNum];
VixToolsPrintFileInfo(pathName, currentFileName, &destPtr, endDestPtr);
free(pathName);
- } // for (fileNum = 0; fileNum < numFiles; fileNum++)
+ } // for (fileNum = 0; fileNum < lastGoodNumFiles; fileNum++)
*destPtr = '\0';
abort:
////////////////////////////////////
case VIX_COMMAND_CREATE_TEMPORARY_FILE:
err = VixToolsCreateTempFile(requestMsg, &resultValue);
- // resultValue is static. Do not free it.
+ deleteResultValue = TRUE;
break;
///////////////////////////////////
case VIX_COMMAND_READ_VARIABLE:
err = VixToolsReadVariable(requestMsg, &resultValue);
- // resultValue is static. Do not free it.
+ deleteResultValue = TRUE;
break;
///////////////////////////////////
libVmBackupLib_a_SOURCES += scriptOps.c
libVmBackupLib_a_SOURCES += stateMachine.c
libVmBackupLib_a_SOURCES += syncDriverOps.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libVmBackupLib.a
libVmBackupLib_a_SOURCES = scriptOps.c stateMachine.c syncDriverOps.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
VmBackupScript *scripts = op->state->scripts;
VmBackupScript *currScript = NULL;
- if (scripts != NULL) {
+ if (scripts != NULL && op->state->currentScript >= 0) {
currScript = &scripts[op->state->currentScript];
}
if (op->canceled) {
ret = VMBACKUP_STATUS_CANCELED;
goto exit;
- } else if (scripts == NULL || currScript->proc == NULL) {
+ } else if (scripts == NULL || currScript == NULL || currScript->proc == NULL) {
ret = VMBACKUP_STATUS_FINISHED;
goto exit;
}
if (!ProcMgr_IsAsyncProcRunning(currScript->proc)) {
int exitCode;
+ Bool succeeded;
+
+ succeeded = (ProcMgr_GetExitCode(currScript->proc, &exitCode) == 0 &&
+ exitCode == 0);
+ ProcMgr_Free(currScript->proc);
+ currScript->proc = NULL;
/*
* If thaw scripts fail, keep running and only notify the failure after
* all others have run.
*/
- if (ProcMgr_GetExitCode(currScript->proc, &exitCode) != 0 ||
- exitCode != 0) {
+ if (!succeeded) {
if (op->type == VMBACKUP_SCRIPT_FREEZE) {
ret = VMBACKUP_STATUS_ERROR;
goto exit;
}
}
- ProcMgr_Free(currScript->proc);
- currScript->proc = NULL;
-
switch (VmBackupRunNextScript(op)) {
case -1:
ret = VMBACKUP_STATUS_ERROR;
}
exit:
+ if (ret == VMBACKUP_STATUS_ERROR) {
+ /* Report the script error to the host */
+ op->state->SendEvent(VMBACKUP_EVENT_REQUESTOR_ERROR,
+ VMBACKUP_SCRIPT_ERROR,
+ "Custom script failed.");
+ }
return ret;
}
#include "util.h"
#include "vmstdio.h"
-typedef enum {
- VMBACKUP_SUCCESS = 0,
- VMBACKUP_INVALID_STATE,
- VMBACKUP_SCRIPT_ERROR,
- VMBACKUP_SYNC_ERROR,
- VMBACKUP_REMOTE_ABORT,
- VMBACKUP_UNEXPECTED_ERROR
-} VmBackupStatus;
-
-
#define VMBACKUP_ENQUEUE_EVENT() { \
gBackupState->timerEvent = EventManager_Add(gEventQueue, \
gBackupState->pollPeriod,\
libVmCheck_a_SOURCES =
libVmCheck_a_SOURCES += vmcheck.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libVmCheck.a
libVmCheck_a_SOURCES = vmcheck.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libVmSignal_a_SOURCES =
libVmSignal_a_SOURCES += vmsignal.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libVmSignal.a
libVmSignal_a_SOURCES = vmsignal.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
libWiper_a_SOURCES =
libWiper_a_SOURCES += wiperPosix.c
-
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libWiper.a
libWiper_a_SOURCES = wiperPosix.c
-AM_CFLAGS = @COMMON_CFLAGS@
all: all-am
.SUFFIXES:
lib_LTLIBRARIES = libguestlib.la
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
libguestlib_la_LIBADD =
libguestlib_la_LIBADD += ../lib/rpcOut/shared/libRpcOut.la
libguestlib_la_LIBADD += ../lib/string/shared/libString.la
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libguestlib.la
-AM_CFLAGS = @COMMON_CFLAGS@
# In the absence of the linker options --start-group and --end-group (which can't
# be put in LDADD), we need to bring the following libraries out of the alphebetical
# order so their symbols are properly resolved.
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
# define VMBLOCK_CONTROL_DIRNAME VMBLOCK_FS_NAME
# define VMBLOCK_CONTROL_DEVNAME "dev"
# define VMBLOCK_CONTROL_MOUNTPOINT "mountPoint"
+# define VMBLOCK_CONTROL_PROC_DIRNAME "fs/" VMBLOCK_CONTROL_DIRNAME
-# define VMBLOCK_MOUNT_POINT "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_MOUNT_POINT "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_MOUNTPOINT
-# define VMBLOCK_DEVICE "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_DEVICE "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_DEVNAME
# define VMBLOCK_DEVICE_MODE O_WRONLY
# define VMBLOCK_CONTROL(fd, op, path) write(fd, path, op)
#define GUESTMSG_FLAG_COOKIE 0x80000000
#define GUESTMSG_FLAG_ALL GUESTMSG_FLAG_COOKIE
+/*
+ * Maximum size of incoming message. This is to prevent denial of host service
+ * attacks from guest applications.
+ */
+#define GUESTMSG_MAX_IN_SIZE (64 * 1024)
#endif /* _GUEST_MSG_DEF_H_ */
#define HGFS_VERSION_OLD (1 << 0)
#define HGFS_VERSION_3 (1 << 1)
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
+#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
+
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
+#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
+
+
/*
* File types, used in HgfsAttr. We support regular files,
* directories, and symlinks.
#define HGFS_NAME_BUFFER_SIZE(request) (HGFS_PACKET_MAX - (sizeof *request - 1))
#define HGFS_NAME_BUFFER_SIZET(sizet) (HGFS_PACKET_MAX - (sizet) - 1)
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
-#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
-
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
-#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
-
#ifndef _WIN32
/*
* Routines for converting between Win NT and unix time formats. The
*/
#include "dbllnklst.h"
-#include "hgfs.h"
-#include "hgfsProto.h"
#include "request.h"
#include "state.h"
+#include "hgfs.h"
+#include "hgfsProto.h"
#include "vm_basic_types.h"
#include "vm_assert.h"
*-----------------------------------------------------------------------------
*/
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(_MSC_VER)
static INLINE void
Div643232(uint64 dividend, // IN
uint32 *quotient, // OUT
uint32 *remainder) // OUT
{
- *quotient = dividend / divisor;
- *remainder = dividend % divisor;
+ *quotient = (uint32)(dividend / divisor);
+ *remainder = (uint32)(dividend % divisor);
}
#endif
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
/* LEVEL, REG, VENDOR, POS, SIZE, NAME, MASK TYPE, SET TO, CPL3, [FUNC] */
#define CPUID_FIELD_DATA_LEVEL_8x \
-FIELDDEF( 86, ECX, AMD, 0, 8, CACHE_LINE, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 8, 4, CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 12, 4, CACHE_WAYS, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 16, 16, CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 0, 8, L2CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 8, 4, L2CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 12, 4, L2CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 16, 16, L2CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 0, 8, L3CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 8, 4, L3CACHE_LINE_PER_TAG,IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 12, 4, L3CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 18, 14, L3CACHE_SIZE, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 0, 1, TS, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 1, 1, FID, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 2, 1, VID, IGNORE, 0, FALSE) \
#define CPUID_MODEL_CORE 14
#define CPUID_MODEL_CORE2 15
#define CPUID_MODEL_PENRYN 0x17 // Effective model
+#define CPUID_MODEL_NEHALEM 0x1a // Effective model
static INLINE uint32
CPUID_EFFECTIVE_FAMILY(uint32 v) /* %eax from CPUID with %eax=1. */
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
#define SCSI_MAX_CONTROLLERS 4 // Need more than 1 for MSCS clustering
#define SCSI_MAX_DEVICES 16 // BT-958 emulates only 16
#define SCSI_IDE_CHANNEL SCSI_MAX_CONTROLLERS
-#define SCSI_MAX_CHANNELS (SCSI_MAX_CONTROLLERS + 1)
+#define SCSI_IDE_HOSTED_CHANNEL (SCSI_MAX_CONTROLLERS + 1)
+#define SCSI_MAX_CHANNELS (SCSI_MAX_CONTROLLERS + 2)
/************* Strings for the VESA BIOS Identity Fields *****************/
#define VBE_OEM_STRING COMPANY_NAME " SVGA"
#define VMNET_CAP_LPD 0x10000 /* large pkt delivery */
#define VMNET_CAP_BPF 0x20000 /* BPF Support in VMXNET Virtual Hardware */
#define VMNET_CAP_SG_SPAN_PAGES 0x40000 /* Can do scatter-gather span multiple pages transmits. */
+#define VMNET_CAP_IP6_CSUM 0x80000 /* Can do IPv6 csum offload. */
+#define VMNET_CAP_TSO6 0x100000 /* Can do TSO segmentation offload for IPv6 pkts. */
+#define VMNET_CAP_TSO256k 0x200000 /* Can do TSO segmentation offload for pkts up to 256kB. */
#endif // _VMNET_DEF_H_
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
# define VMBLOCK_CONTROL_DIRNAME VMBLOCK_FS_NAME
# define VMBLOCK_CONTROL_DEVNAME "dev"
# define VMBLOCK_CONTROL_MOUNTPOINT "mountPoint"
+# define VMBLOCK_CONTROL_PROC_DIRNAME "fs/" VMBLOCK_CONTROL_DIRNAME
-# define VMBLOCK_MOUNT_POINT "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_MOUNT_POINT "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_MOUNTPOINT
-# define VMBLOCK_DEVICE "/proc/fs/" VMBLOCK_CONTROL_DIRNAME \
+# define VMBLOCK_DEVICE "/proc/" VMBLOCK_CONTROL_PROC_DIRNAME \
"/" VMBLOCK_CONTROL_DEVNAME
# define VMBLOCK_DEVICE_MODE O_WRONLY
# define VMBLOCK_CONTROL(fd, op, path) write(fd, path, op)
struct proc_dir_entry *controlProcMountpoint;
/* Create /proc/fs/vmblock */
- controlProcDirEntry = proc_mkdir(VMBLOCK_CONTROL_DIRNAME,
- VMBLOCK_CONTROL_PARENT);
+ controlProcDirEntry = proc_mkdir(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
if (!controlProcDirEntry) {
- Warning("SetupProcDevice: could not create /proc/fs/"
- VMBLOCK_CONTROL_DIRNAME "\n");
+ Warning("SetupProcDevice: could not create /proc/"
+ VMBLOCK_CONTROL_PROC_DIRNAME "\n");
return -EINVAL;
}
controlProcMountpoint = proc_mkdir(VMBLOCK_CONTROL_MOUNTPOINT,
controlProcDirEntry);
if (!controlProcMountpoint) {
- Warning("SetupProcDevice: could not create /proc/fs/"
- VMBLOCK_CONTROL_MOUNTPOINT "\n");
- remove_proc_entry(VMBLOCK_CONTROL_DIRNAME, VMBLOCK_CONTROL_PARENT);
+ Warning("SetupProcDevice: could not create "
+ VMBLOCK_MOUNT_POINT "\n");
+ remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
return -EINVAL;
}
VMBLOCK_CONTROL_MODE,
controlProcDirEntry);
if (!controlProcEntry) {
- Warning("SetupProcDevice: could not create /proc/fs/"
- VMBLOCK_CONTROL_DIRNAME "/" VMBLOCK_CONTROL_DEVNAME "\n");
+ Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
- remove_proc_entry(VMBLOCK_CONTROL_DIRNAME, VMBLOCK_CONTROL_PARENT);
+ remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
return -EINVAL;
}
if (controlProcDirEntry) {
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
remove_proc_entry(VMBLOCK_CONTROL_DEVNAME, controlProcDirEntry);
- remove_proc_entry(VMBLOCK_CONTROL_DIRNAME, VMBLOCK_CONTROL_PARENT);
+ remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
}
return 0;
}
#endif /* __KERNEL__ */
#define VMBLOCK_CONTROL_MODE S_IRUSR | S_IFREG
-#define VMBLOCK_CONTROL_PARENT proc_root_fs
/*
* Our modules may be compatible with kernels built for different processors.
*----------------------------------------------------------------------
*/
-static inline void
+static inline void
HgfsCompleteReq(HgfsReq *req, // IN: Request
char const *reply, // IN: Reply packet
size_t replySize) // IN: Size of reply packet
req->payloadSize = replySize;
req->state = HGFS_REQ_STATE_COMPLETED;
list_del_init(&req->list);
- HgfsWakeWaitingClient(req);
+ HgfsWakeWaitingClient(req);
}
list_for_each_safe(cur, tmp, &hgfsReqsUnsent) {
req = list_entry(cur, HgfsReq, list);
- /*
+ /*
* A big "wtf" from the driver is in order. Perhaps by "wtf" I really
* mean BUG_ON().
*/
LOG(8, (KERN_DEBUG "VMware hgfs: HgfsSendUnsentReqs: Sending packet "
"over backdoor\n"));
- /*
- * We should attempt to reopen the backdoor channel with every request,
- * because the HGFS server in the host can be enabled or disabled at any
+ /*
+ * We should attempt to reopen the backdoor channel with every request,
+ * because the HGFS server in the host can be enabled or disabled at any
* time.
*/
if (!HgfsBd_OpenBackdoor(&hgfsRpcOut)) {
LOG(8, (KERN_DEBUG "VMware hgfs: HgfsSendUnsentReqs: Backdoor "
"reply received\n"));
} else {
-
+
/* Pass the error into the request. */
req->state = HGFS_REQ_STATE_ERROR;
list_del_init(&req->list);
*----------------------------------------------------------------------
*/
-int
+int
HgfsBdHandler(void *data) // Ignored
{
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsBdHandler: Thread starting\n"));
/* Sleep, waiting for a request or exit. */
wait_event_interruptible(hgfsReqThreadWait,
- test_bit(HGFS_REQ_THREAD_SEND,
+ test_bit(HGFS_REQ_THREAD_SEND,
&hgfsReqThreadFlags) ||
compat_kthread_should_stop());
-
- /*
+
+ /*
* First, check for suspend. I'm not convinced that this actually
* has to come first, but whatever.
*/
if (compat_try_to_freeze()) {
- LOG(6, (KERN_DEBUG
+ LOG(6, (KERN_DEBUG
"VMware hgfs: HgfsBdHandler: Closing backdoor after resume\n"));
HgfsBd_CloseBackdoor(&hgfsRpcOut);
}
}
/* Kill yourself. */
- if (compat_kthread_should_stop()) {
+ if (compat_kthread_should_stop()) {
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsBdHandler: Told to exit\n"));
break;
}
case HGFS_OP_SEARCH_READ_V3: {
HgfsReplySearchReadV3 *replyV3;
HgfsDirEntry *dirent;
-
+
/* Currently V3 returns only 1 entry. */
replyV3 = (HgfsReplySearchReadV3 *)(HGFS_REP_PAYLOAD_V3(req));
replyV3->count = 1;
}
case HGFS_OP_SEARCH_READ_V2: {
HgfsReplySearchReadV2 *replyV2;
-
+
replyV2 = (HgfsReplySearchReadV2 *)(HGFS_REQ_PAYLOAD(req));
replySize = sizeof *replyV2;
fileName = replyV2->fileName.name;
}
case HGFS_OP_SEARCH_READ: {
HgfsReplySearchRead *replyV1;
-
+
replyV1 = (HgfsReplySearchRead *)(HGFS_REQ_PAYLOAD(req));
replySize = sizeof *replyV1;
fileName = replyV1->fileName.name;
fileNameLength > HGFS_PACKET_MAX - replySize) {
return -ENAMETOOLONG;
}
-
+
/*
- * If the size of the name is valid (meaning the end of the directory has
+ * If the size of the name is valid (meaning the end of the directory has
* not yet been reached), copy the name to the AttrInfo struct.
*
* XXX: This operation happens often and the length of the filename is
/* Sanity check on name length. */
if (fileNameLength != strlen(fileName)) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsUnpackSearchReadReply: name "
- "length mismatch %u/%Zu, name \"%s\"\n",
+ "length mismatch %u/%Zu, name \"%s\"\n",
fileNameLength, strlen(fileName), fileName));
return -EPROTO;
}
HgfsRequestSearchReadV3 *request;
header = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
- header->op = attr->requestType = opUsed;
+ header->op = attr->requestType = opUsed;
header->id = req->id;
-
+
request = (HgfsRequestSearchReadV3 *)(HGFS_REQ_PAYLOAD_V3(req));
request->search = searchHandle;
request->offset = offset;
req->payloadSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestSearchRead *request;
-
+
request = (HgfsRequestSearchRead *)(HGFS_REQ_PAYLOAD(req));
request->header.op = attr->requestType = opUsed;
request->header.id = req->id;
* Setup the directory open request, depending on the op version.
*
* Results:
- * Returns zero on success, or negative error on failure.
+ * Returns zero on success, or negative error on failure.
*
* Side effects:
* None
*----------------------------------------------------------------------
*/
-static int
+static int
HgfsPackDirOpenRequest(struct inode *inode, // IN: Inode of the file to open
struct file *file, // IN: File pointer for this open
HgfsOp opUsed, // IN: Op to be used
uint32 *nameLength;
size_t requestSize;
int result;
-
+
ASSERT(inode);
ASSERT(file);
ASSERT(req);
case HGFS_OP_SEARCH_OPEN_V3: {
HgfsRequest *requestHeader;
HgfsRequestSearchOpenV3 *requestV3;
-
+
requestHeader = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
requestHeader->op = opUsed;
requestHeader->id = req->id;
- requestV3 = (HgfsRequestSearchOpenV3 *)HGFS_REQ_PAYLOAD_V3(req);
+ requestV3 = (HgfsRequestSearchOpenV3 *)HGFS_REQ_PAYLOAD_V3(req);
/* We'll use these later. */
name = requestV3->dirName.name;
case HGFS_OP_SEARCH_OPEN: {
HgfsRequestSearchOpen *request;
-
+
request = (HgfsRequestSearchOpen *)(HGFS_REQ_PAYLOAD(req));
request->header.op = opUsed;
request->header.id = req->id;
}
/* Build full name to send to server. */
- if (HgfsBuildPath(name, HGFS_PACKET_MAX - (requestSize - 1),
+ if (HgfsBuildPath(name, HGFS_PACKET_MAX - (requestSize - 1),
file->f_dentry) < 0) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsPackDirOpenRequest: build path failed\n"));
return -EINVAL;
name));
/* Convert to CP name. */
- result = CPName_ConvertTo(name,
+ result = CPName_ConvertTo(name,
HGFS_PACKET_MAX - (requestSize - 1),
name);
if (result < 0) {
opUsed = HGFS_OP_SEARCH_OPEN_V3;
replySearch = &((HgfsReplySearchOpenV3 *)HGFS_REP_PAYLOAD_V3(req))->search;
}
-
+
result = HgfsPackDirOpenRequest(inode, file, opUsed, req);
if (result != 0) {
- LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDirOpen: error packing request\n"));
+ LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDirOpen: error packing request\n"));
goto out;
}
goto retry;
}
break;
-
+
default:
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDirOpen: server "
"returned error: %d\n", result));
&attr,
&done);
if (result == -ENAMETOOLONG) {
- /*
+ /*
* Skip dentry if its name is too long (see below).
- *
+ *
* XXX: If a bad server sends us bad packets, we can loop here
* forever, as I did while testing *grumble*. Maybe we should error
* in that case.
* just check its return value.
*/
if (result < 0) {
- /*
+ /*
* XXX: Another area where a bad server could cause us to loop
- * forever.
+ * forever.
*/
file->f_pos++;
continue;
if (attr.mask & HGFS_ATTR_VALID_FILEID) {
ino = attr.hostFileId;
} else {
- ino = iunique(file->f_dentry->d_inode->i_sb,
+ ino = iunique(file->f_dentry->d_inode->i_sb,
HGFS_RESERVED_INO);
}
}
-
+
/*
* Call filldir for this dentry.
*/
req->payloadSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestSearchClose *request;
-
+
request = (HgfsRequestSearchClose *)(HGFS_REQ_PAYLOAD(req));
request->header.id = req->id;
request->header.op = opUsed = HGFS_OP_SEARCH_CLOSE;
/* Get the reply. */
replyStatus = HgfsReplyStatus(req);
result = HgfsStatusConvertToLinux(replyStatus);
-
+
switch (result) {
case 0:
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDirRelease: release handle %u\n",
HgfsRequestOpenV3 *requestV3;
requestHeader = (HgfsRequest *)HGFS_REQ_PAYLOAD(req);
- requestHeader->op = opUsed;
+ requestHeader->op = opUsed;
requestHeader->id = req->id;
-
+
requestV3 = (HgfsRequestOpenV3 *)HGFS_REQ_PAYLOAD_V3(req);
requestSize = HGFS_REQ_PAYLOAD_SIZE_V3(requestV3);
case HGFS_OP_OPEN_V2: {
HgfsRequestOpenV2 *requestV2;
-
+
requestV2 = (HgfsRequestOpenV2 *)(HGFS_REQ_PAYLOAD(req));
- requestV2->header.op = opUsed;
+ requestV2->header.op = opUsed;
requestV2->header.id = req->id;
-
+
/* We'll use these later. */
name = requestV2->fileName.name;
nameLength = &requestV2->fileName.length;
}
case HGFS_OP_OPEN: {
HgfsRequestOpen *request;
-
+
request = (HgfsRequestOpen *)(HGFS_REQ_PAYLOAD(req));
- request->header.op = opUsed;
+ request->header.op = opUsed;
request->header.id = req->id;
/* We'll use these later. */
atomic_set(&hgfsVersionOpen, HGFS_OP_OPEN_V2);
goto retry;
}
-
+
/* Retry with Version 1 of Open. Set globally. */
if (opUsed == HGFS_OP_OPEN_V2) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsOpen: Version 2 not "
/*
* filesystem.h --
*
- * High-level filesystem operations for the filesystem portion of
+ * High-level filesystem operations for the filesystem portion of
* the vmhgfs driver.
*/
#include "vm_basic_types.h"
#include "hgfsProto.h"
-/*
+/*
* Struct used to pass around attributes that Linux cares about.
* These aren't just the attributes seen in HgfsAttr[V2]; we add a filename
* pointer for convenience (used by SearchRead and Getattr).
#define GUESTMSG_FLAG_COOKIE 0x80000000
#define GUESTMSG_FLAG_ALL GUESTMSG_FLAG_COOKIE
+/*
+ * Maximum size of incoming message. This is to prevent denial of host service
+ * attacks from guest applications.
+ */
+#define GUESTMSG_MAX_IN_SIZE (64 * 1024)
#endif /* _GUEST_MSG_DEF_H_ */
#define HGFS_VERSION_OLD (1 << 0)
#define HGFS_VERSION_3 (1 << 1)
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
+#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
+
+/* XXX: Needs change when VMCI is supported. */
+#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
+#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
+
+
/*
* File types, used in HgfsAttr. We support regular files,
* directories, and symlinks.
#define HGFS_NAME_BUFFER_SIZE(request) (HGFS_PACKET_MAX - (sizeof *request - 1))
#define HGFS_NAME_BUFFER_SIZET(sizet) (HGFS_PACKET_MAX - (sizet) - 1)
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_PAYLOAD_SIZE_V3(hgfsReq) (sizeof *hgfsReq + sizeof(HgfsRequest))
-#define HGFS_REP_PAYLOAD_SIZE_V3(hgfsRep) (sizeof *hgfsRep + sizeof(HgfsReply))
-
-/* XXX: Needs change when VMCI is supported. */
-#define HGFS_REQ_GET_PAYLOAD_V3(hgfsReq) ((char *)(hgfsReq) + sizeof(HgfsRequest))
-#define HGFS_REP_GET_PAYLOAD_V3(hgfsRep) ((char *)(hgfsRep) + sizeof(HgfsReply))
-
#ifndef _WIN32
/*
* Routines for converting between Win NT and unix time formats. The
reqSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestDelete *request;
-
+
request = (HgfsRequestDelete *)(HGFS_REQ_PAYLOAD(req));
/* Fill out the request packet. */
request->header.id = req->id;
case HGFS_OP_SETATTR_V3: {
HgfsRequest *requestHeader;
HgfsRequestSetattrV3 *requestV3;
-
+
requestHeader = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
requestHeader->op = opUsed;
requestHeader->id = req->id;
-
+
requestV3 = (HgfsRequestSetattrV3 *)HGFS_REQ_PAYLOAD_V3(req);
attrV2 = &requestV3->attr;
hints = &requestV3->hints;
memset(attrV2, 0, sizeof *attrV2);
memset(hints, 0, sizeof *hints);
- /*
- * When possible, issue a setattr using an existing handle. This will
- * give us slightly better performance on a Windows server, and is more
+ /*
+ * When possible, issue a setattr using an existing handle. This will
+ * give us slightly better performance on a Windows server, and is more
* correct regardless. If we don't find a handle, fall back on setattr
* by name.
*
* the times also requires write permissions on Windows, so we require it
* here too. Otherwise, any handle will do.
*/
- if (allowHandleReuse && HgfsGetHandle(dentry->d_inode,
- (valid & ATTR_SIZE) ||
- (valid & ATTR_ATIME) ||
- (valid & ATTR_MTIME) ?
- HGFS_OPEN_MODE_WRITE_ONLY + 1 : 0,
+ if (allowHandleReuse && HgfsGetHandle(dentry->d_inode,
+ (valid & ATTR_SIZE) ||
+ (valid & ATTR_ATIME) ||
+ (valid & ATTR_MTIME) ?
+ HGFS_OPEN_MODE_WRITE_ONLY + 1 : 0,
&handle) == 0) {
*hints = HGFS_ATTR_HINT_USE_FILE_DESC;
requestV3->file = handle;
*/
if (valid & ATTR_MODE) {
- attrV2->mask |= HGFS_ATTR_VALID_SPECIAL_PERMS |
- HGFS_ATTR_VALID_OWNER_PERMS | HGFS_ATTR_VALID_GROUP_PERMS |
+ attrV2->mask |= HGFS_ATTR_VALID_SPECIAL_PERMS |
+ HGFS_ATTR_VALID_OWNER_PERMS | HGFS_ATTR_VALID_GROUP_PERMS |
HGFS_ATTR_VALID_OTHER_PERMS;
- attrV2->specialPerms = ((iattr->ia_mode &
+ attrV2->specialPerms = ((iattr->ia_mode &
(S_ISUID | S_ISGID | S_ISVTX)) >> 9);
attrV2->ownerPerms = ((iattr->ia_mode & S_IRWXU) >> 6);
attrV2->groupPerms = ((iattr->ia_mode & S_IRWXG) >> 3);
attrV2->otherPerms = (iattr->ia_mode & S_IRWXO);
*changed = TRUE;
}
-
+
if (valid & ATTR_UID) {
attrV2->mask |= HGFS_ATTR_VALID_USERID;
attrV2->userId = iattr->ia_uid;
attrV2->size = iattr->ia_size;
*changed = TRUE;
}
-
+
if (valid & ATTR_ATIME) {
attrV2->mask |= HGFS_ATTR_VALID_ACCESS_TIME;
attrV2->accessTime = HGFS_GET_TIME(iattr->ia_atime);
}
*changed = TRUE;
}
-
+
if (valid & ATTR_MTIME) {
attrV2->mask |= HGFS_ATTR_VALID_WRITE_TIME;
attrV2->writeTime = HGFS_GET_TIME(iattr->ia_mtime);
case HGFS_OP_SETATTR_V2: {
HgfsRequestSetattrV2 *requestV2;
-
+
requestV2 = (HgfsRequestSetattrV2 *)(HGFS_REQ_PAYLOAD(req));
requestV2->header.op = opUsed;
requestV2->header.id = req->id;
-
+
attrV2 = &requestV2->attr;
hints = &requestV2->hints;
case HGFS_OP_SETATTR: {
HgfsRequestSetattr *request;
-
+
request = (HgfsRequestSetattr *)(HGFS_REQ_PAYLOAD(req));
request->header.op = opUsed;
request->header.id = req->id;
-
+
attr = &request->attr;
update = &request->update;
case HGFS_OP_CREATE_DIR_V3: {
HgfsRequest *requestHeader;
HgfsRequestCreateDirV3 *requestV3;
-
+
requestHeader = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
requestHeader->op = opUsed;
requestHeader->id = req->id;
-
+
requestV3 = (HgfsRequestCreateDirV3 *)(HGFS_REQ_PAYLOAD_V3(req));
/* We'll use these later. */
}
case HGFS_OP_CREATE_DIR_V2: {
HgfsRequestCreateDirV2 *requestV2;
-
+
requestV2 = (HgfsRequestCreateDirV2 *)(HGFS_REQ_PAYLOAD(req));
requestV2->header.op = opUsed;
requestV2->header.id = req->id;
}
case HGFS_OP_CREATE_DIR: {
HgfsRequestCreateDir *request;
-
+
request = (HgfsRequestCreateDir *)(HGFS_REQ_PAYLOAD(req));
/* We'll use these later. */
header->op = opUsed = HGFS_OP_RENAME_V3;
header->id = req->id;
-
+
oldName = request->oldName.name;
oldNameLength = &request->oldName.length;
request->oldName.flags = 0;
reqSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestRename *request = (HgfsRequestRename *)HGFS_REQ_PAYLOAD(req);
-
+
request->header.op = opUsed = HGFS_OP_RENAME;
oldName = request->oldName.name;
oldNameLength = &request->oldName.length;
* Setup the create symlink request, depending on the op version.
*
* Results:
- * Returns zero on success, or negative error on failure.
+ * Returns zero on success, or negative error on failure.
*
* Side effects:
* None
switch (opUsed) {
case HGFS_OP_CREATE_SYMLINK_V3: {
HgfsRequest *requestHeader;
-
+
requestHeader = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
requestHeader->op = opUsed;
requestHeader->id = req->id;
-
+
requestV3 = (HgfsRequestSymlinkCreateV3 *)HGFS_REQ_PAYLOAD_V3(req);
/* We'll use these later. */
break;
}
case HGFS_OP_CREATE_SYMLINK: {
-
+
request = (HgfsRequestSymlinkCreate *)(HGFS_REQ_PAYLOAD(req));
request->header.op = opUsed;
request->header.id = req->id;
if (atomic_read(&hgfsProtocolVersion) == HGFS_VERSION_3) {
opUsed = HGFS_OP_SETATTR_V3;
}
-
+
result = HgfsPackSetattrRequest(iattr, dentry, allowHandleReuse,
opUsed, req, &changed);
if (result != 0 || !changed) {
/*
* link.c --
*
- * Symlink-specific inode operations for the filesystem portion of the
+ * Symlink-specific inode operations for the filesystem portion of the
* vmhgfs driver.
*/
/* HGFS symlink operations. */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
-static void *HgfsFollowlink(struct dentry *dentry,
+static void *HgfsFollowlink(struct dentry *dentry,
struct nameidata *nd);
#else
-static int HgfsFollowlink(struct dentry *dentry,
+static int HgfsFollowlink(struct dentry *dentry,
struct nameidata *nd);
#endif
static int HgfsReadlink(struct dentry *dentry,
.readlink = HgfsReadlink,
};
-/*
- * HGFS symlink operations.
+/*
+ * HGFS symlink operations.
*/
/*
attr.fileName = NULL;
error = HgfsPrivateGetattr(dentry, &attr);
if (!error) {
-
+
/* Let's make sure we got called on a symlink. */
if (attr.type != HGFS_FILE_TYPE_SYMLINK ||
attr.fileName == NULL) {
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsFollowlink: got called "
"on something that wasn't a symlink\n"));
error = -EINVAL;
- } else {
+ } else {
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsFollowlink: calling "
"vfs_follow_link\n"));
error = vfs_follow_link(nd, attr.fileName);
*----------------------------------------------------------------------
*/
-static int
+static int
HgfsReadlink(struct dentry *dentry, // IN: Dentry containing link
char __user *buffer, // OUT: User buffer to copy link into
int buflen) // IN: Length of user buffer
attr.fileName = NULL;
error = HgfsPrivateGetattr(dentry, &attr);
if (!error) {
-
+
/* Let's make sure we got called on a symlink. */
if (attr.type != HGFS_FILE_TYPE_SYMLINK ||
attr.fileName == NULL) {
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsReadlink: got called "
"on something that wasn't a symlink\n"));
error = -EINVAL;
- } else {
+ } else {
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsReadlink: calling "
"vfs_readlink\n"));
error = vfs_readlink(dentry, buffer, buflen, attr.fileName);
/* The amount of time we'll wait for the backdoor to process our request. */
#define HGFS_REQUEST_TIMEOUT (30 * HZ)
-/*
+/*
* Inode number of the root inode. We set this to be non-zero because,
* according to glibc source, when the returned inode number in a dirent
* is zero, that entry has been deleted. This is presumably when you've done
/*
* The writeback support we're using (set_page_dirty()) was added in
- * 2.5.12, so we only support writeback from then on.
+ * 2.5.12, so we only support writeback from then on.
*/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 12)
#define HGFS_ENABLE_WRITEBACK
size_t shareNameLen; /* To avoid repeated strlen() calls. */
} HgfsSuperInfo;
-/*
- * HGFS specific per-inode data.
+/*
+ * HGFS specific per-inode data.
*/
typedef struct HgfsInodeInfo {
#ifdef VMW_EMBED_INODE
/* Handle to be sent to the server. Needed for writepage(). */
HgfsHandle handle;
- /*
- * Mode with which handle was opened. When we reuse a handle, we need to
- * choose one with appropriate permissions.
+ /*
+ * Mode with which handle was opened. When we reuse a handle, we need to
+ * choose one with appropriate permissions.
*/
HgfsOpenMode mode;
} HgfsFileInfo;
*/
/*
- * We use hgfsBigLock to protect certain global structures that are locked for
+ * We use hgfsBigLock to protect certain global structures that are locked for
* a very short amount of time.
*/
extern spinlock_t hgfsBigLock;
-/*
+/*
* The request handler thread uses hgfsReqThreadWait to wake up and handle
* IO. Possible operations include:
* -Sending outgoing HGFS requests.
* -Shutting down the request handler thread.
*
- * Finally, we use hgfsReqThread to synchronize the stopping of the
+ * Finally, we use hgfsReqThread to synchronize the stopping of the
* backdoor handler thread.
*/
extern long hgfsReqThreadFlags;
#include "vm_basic_types.h"
/*
- * Max amount of read/write data per server request. Must be smaller than
- * HGFS_PACKET_MAX by a large enough margin to allow for headers and
+ * Max amount of read/write data per server request. Must be smaller than
+ * HGFS_PACKET_MAX by a large enough margin to allow for headers and
* other request fields.
*/
-#define HGFS_IO_MAX 4096
+#define HGFS_IO_MAX 4096
/* Private functions. */
static int HgfsDoWrite(HgfsHandle handle,
unsigned pageTo);
/* HGFS address space operations. */
-static int HgfsReadpage(struct file *file,
+static int HgfsReadpage(struct file *file,
struct page *page);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 52)
-static int HgfsWritepage(struct page *page,
+static int HgfsWritepage(struct page *page,
struct writeback_control *wbc);
#else
static int HgfsWritepage(struct page *page);
#endif
-static int HgfsPrepareWrite(struct file *file,
+static int HgfsPrepareWrite(struct file *file,
struct page *page,
- unsigned pageFrom,
+ unsigned pageFrom,
unsigned pageTo);
-static int HgfsCommitWrite(struct file *file,
+static int HgfsCommitWrite(struct file *file,
struct page *page,
- unsigned pageFrom,
+ unsigned pageFrom,
unsigned pageTo);
/* HGFS address space operations structure. */
};
-/*
- * Private functions.
+/*
+ * Private functions.
*/
/*
*
* We send a "Read" request to the server with the given handle.
*
- * It is assumed that this function is never called with a larger read than
+ * It is assumed that this function is never called with a larger read than
* what can be sent in one request.
*
* Results:
if (atomic_read(&hgfsProtocolVersion) == HGFS_VERSION_3) {
HgfsRequest *header;
HgfsRequestReadV3 *request;
-
+
header = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
header->id = req->id;
header->op = opUsed = HGFS_OP_READ_V3;
-
+
request = (HgfsRequestReadV3 *)(HGFS_REQ_PAYLOAD_V3(req));
request->file = handle;
request->offset = offset;
req->payloadSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestRead *request;
-
+
request = (HgfsRequestRead *)(HGFS_REQ_PAYLOAD(req));
request->header.id = req->id;
request->header.op = opUsed = HGFS_OP_READ;
/* Get the reply. */
replyStatus = HgfsReplyStatus(req);
result = HgfsStatusConvertToLinux(replyStatus);
-
+
switch (result) {
case 0:
if (opUsed == HGFS_OP_READ_V3) {
result = -EPROTO;
goto out;
}
-
+
if (!actualSize) {
/* We got no bytes, so don't need to copy to user. */
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsDoRead: server returned "
memcpy(buf, payload, actualSize);
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsDoRead: copied %u\n",
actualSize));
- result = actualSize;
+ result = actualSize;
break;
case -EPROTO:
*
* HgfsDoWrite --
*
- * Do one write request. Called by HgfsDoWritepage, possibly multiple
- * times if the size of the write is too big to be handled by one server
+ * Do one write request. Called by HgfsDoWritepage, possibly multiple
+ * times if the size of the write is too big to be handled by one server
* request.
*
* We send a "Write" request to the server with the given handle.
*
- * It is assumed that this function is never called with a larger write
+ * It is assumed that this function is never called with a larger write
* than what can be sent in one request.
*
* Results:
if (atomic_read(&hgfsProtocolVersion) == HGFS_VERSION_3) {
HgfsRequest *header;
HgfsRequestWriteV3 *request;
-
+
header = (HgfsRequest *)(HGFS_REQ_PAYLOAD(req));
header->id = req->id;
header->op = opUsed = HGFS_OP_WRITE_V3;
reqSize = HGFS_REQ_PAYLOAD_SIZE_V3(request);
} else {
HgfsRequestWrite *request;
-
+
request = (HgfsRequestWrite *)(HGFS_REQ_PAYLOAD(req));
request->header.id = req->id;
request->header.op = opUsed = HGFS_OP_WRITE;
} else {
actualSize = ((HgfsReplyWrite *)HGFS_REQ_PAYLOAD(req))->actualSize;
}
-
+
/* Return result. */
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsDoWrite: wrote %u bytes\n",
actualSize));
*-----------------------------------------------------------------------------
*/
-static int
+static int
HgfsDoReadpage(HgfsHandle handle, // IN: Handle to use for reading
struct page *page, // IN/OUT: Page to read into
unsigned pageFrom, // IN: Where to start reading to
buffer += result;
} while ((result > 0) && (remainingCount > 0));
- /*
+ /*
* It's possible that despite being asked to read a full page, there is less
- * than a page in the file from this offset, so we should zero the rest of
+ * than a page in the file from this offset, so we should zero the rest of
* the page's memory.
*/
memset(buffer, 0, remainingCount);
- /*
- * We read a full page (or all of the page that actually belongs to the
+ /*
+ * We read a full page (or all of the page that actually belongs to the
* file), so mark it up to date. Also, flush the old page data from the data
* cache.
*/
*-----------------------------------------------------------------------------
*/
-static int
+static int
HgfsDoWritepage(HgfsHandle handle, // IN: Handle to use for writing
struct page *page, // IN: Page containing data to write
unsigned pageFrom, // IN: Beginning page offset
HGFS_IO_MAX : remainingCount;
result = HgfsDoWrite(handle, buffer, nextCount, curOffset);
if (result < 0) {
- LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDoWritepage: write error %d\n",
+ LOG(4, (KERN_DEBUG "VMware hgfs: HgfsDoWritepage: write error %d\n",
result));
goto out;
}
*-----------------------------------------------------------------------------
*/
-static int
-HgfsReadpage(struct file *file, // IN: File to read from
+static int
+HgfsReadpage(struct file *file, // IN: File to read from
struct page *page) // IN/OUT: Page to write to
{
int result = 0;
handle = FILE_GET_FI_P(file)->handle;
LOG(6, (KERN_DEBUG "VMware hgfs: HgfsReadPage: reading from handle %u\n",
- handle));
+ handle));
page_cache_get(page);
result = HgfsDoReadpage(handle, page, 0, PAGE_CACHE_SIZE);
* HgfsWritepage --
*
* The "spontaneous" way to write a page, called when the kernel is under
- * memory pressure or is asked to sync a memory mapped file. Because
- * writepage() can be called from so many different places, we don't get a
- * filp with which to write, and we have to be very careful about races and
+ * memory pressure or is asked to sync a memory mapped file. Because
+ * writepage() can be called from so many different places, we don't get a
+ * filp with which to write, and we have to be very careful about races and
* locking.
*
* Results:
*/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 52)
-static int
+static int
HgfsWritepage(struct page *page, // IN: Page to write from
struct writeback_control *wbc) // IN: Ignored
#else
-static int
+static int
HgfsWritepage(struct page *page) // IN: Page to write from
#endif
{
inode = page->mapping->host;
/* We need a writable file handle. */
- result = HgfsGetHandle(inode,
- HGFS_OPEN_MODE_WRITE_ONLY + 1,
+ result = HgfsGetHandle(inode,
+ HGFS_OPEN_MODE_WRITE_ONLY + 1,
&handle);
if (result) {
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsWritepage: could not get writable "
goto exit;
}
- /*
+ /*
* We were given an entire page to write. In most cases this means "start
* writing from the beginning of the page (byte 0) to the very end (byte
* PAGE_CACHE_SIZE). But what if this is the last page of the file? Then
}
}
- /*
+ /*
* This part is fairly intricate, so it deserves some explanation. We're
* really interested in calling HgfsDoWritepage with our page and
* handle, without having to then worry about locks or references. See
* must obey.
*
* Firstly, we acquire a reference to the page via page_cache_get() and call
- * compat_set_page_writeback(). The latter does a number of things: it sets
- * the writeback bit on the page, and if it wasn't already set, it sets the
+ * compat_set_page_writeback(). The latter does a number of things: it sets
+ * the writeback bit on the page, and if it wasn't already set, it sets the
* writeback bit in the radix tree. Then, if the page isn't dirty, it clears
- * the dirty bit in the radix tree. The end result is that the radix tree's
+ * the dirty bit in the radix tree. The end result is that the radix tree's
* notion of dirty and writeback is fully synced with the page itself.
*
- * Secondly, we write the page itself.
+ * Secondly, we write the page itself.
*
- * Thirdly, we end writeback of the page via compat_end_page_writeback(),
+ * Thirdly, we end writeback of the page via compat_end_page_writeback(),
* and release our reference on the page.
*
- * Finally, we unlock the page, waking up its waiters and making it
- * available to anyone else. Note that this step must be performed
+ * Finally, we unlock the page, waking up its waiters and making it
+ * available to anyone else. Note that this step must be performed
* regardless of whether we wrote anything, as the VFS locked the page for
* us.
*/
*
* Called by the generic write path to set up a write request for a page.
* We're expected to do any pre-allocation and housekeeping prior to
- * receiving the write.
+ * receiving the write.
*
* Results:
* Always zero.
*-----------------------------------------------------------------------------
*/
-static int
+static int
HgfsPrepareWrite(struct file *file, // IN: Ignored
struct page *page, // IN: Page to prepare
unsigned pageFrom, // IN: Beginning page offset
if ((offset >= currentFileSize) ||
((pageFrom == 0) && (offset + pageTo) >= currentFileSize)) {
void *kaddr = kmap_atomic(page, KM_USER0);
-
+
if (pageFrom) {
memset(kaddr, 0, pageFrom);
}
}
#endif
- /*
- * Prior to 2.4.10, our caller expected to call page_address(page) between
+ /*
+ * Prior to 2.4.10, our caller expected to call page_address(page) between
* the calls to prepare_write() and commit_write(). This meant filesystems
- * had to kmap() the page in prepare_write() and kunmap() it in
- * commit_write(). In 2.4.10, the call to page_address() was replaced with
+ * had to kmap() the page in prepare_write() and kunmap() it in
+ * commit_write(). In 2.4.10, the call to page_address() was replaced with
* __copy_to_user(), and while its not clear to me why this is safer,
* nfs_prepare_write() dropped the kmap()/kunmap() calls in the same patch,
* so the two events must be related.
* HgfsCommitWrite --
*
* This function is the more common write path for HGFS, called from
- * generic_file_buffered_write. It is much simpler for us than
- * HgfsWritepage above: the caller has obtained a reference to the page
- * and will unlock it when we're done. And we don't need to worry about
+ * generic_file_buffered_write. It is much simpler for us than
+ * HgfsWritepage above: the caller has obtained a reference to the page
+ * and will unlock it when we're done. And we don't need to worry about
* properly marking the writeback bit, either. See mm/filemap.c in the
* kernel for details about how we are called.
*
*-----------------------------------------------------------------------------
*/
-static int
+static int
HgfsCommitWrite(struct file *file, // IN: File we're writing to
struct page *page, // IN: Page we're writing from
unsigned pageFrom, // IN: Beginning page offset
if (writeTo > currentFileSize) {
compat_i_size_write(inode, writeTo);
}
-
+
/* We wrote a complete page, so it is up to date. */
if ((pageTo - pageFrom) == PAGE_CACHE_SIZE) {
SetPageUptodate(page);
}
#ifdef HGFS_ENABLE_WRITEBACK
- /*
- * Check if this is a partial write to a new page, which was
+ /*
+ * Check if this is a partial write to a new page, which was
* initialized in HgfsPrepareWrite.
*/
if ((offset >= currentFileSize) ||
* would make it uptodate (ie a complete cached page).
*/
handle = FILE_GET_FI_P(file)->handle;
- LOG(6, (KERN_DEBUG "VMware hgfs: HgfsCommitWrite: writing to handle %u\n",
- handle));
+ LOG(6, (KERN_DEBUG "VMware hgfs: HgfsCommitWrite: writing to handle %u\n",
+ handle));
return HgfsDoWritepage(handle, page, pageFrom, pageTo);
}
LOG(4, (KERN_DEBUG "VMware hgfs: HgfsWaitRequestReply: null req\n"));
return -EINVAL;
}
-
- timeleft = wait_event_timeout(req->queue,
+
+ timeleft = wait_event_timeout(req->queue,
(req->state == HGFS_REQ_STATE_COMPLETED ||
req->state == HGFS_REQ_STATE_ERROR),
HGFS_REQUEST_TIMEOUT);
- /*
- * Did we time out? If so, abandon the request. We have to be careful,
+ /*
+ * Did we time out? If so, abandon the request. We have to be careful,
* because a timeout means that the request is still on a list somewhere.
*/
if (timeleft == 0) {
}
spin_unlock(&hgfsBigLock);
- /*
+ /*
* Notice that we're completely ignoring any pending signals. That's
* because the request timed out; it was not interrupted. There's no
* point in having the client retry the syscall (through -ERESTARTSYS) if
*/
err = -EIO;
} else if (req->state == HGFS_REQ_STATE_ERROR) {
- /*
+ /*
* If the backdoor exploded, let's modify the return value so the client
* knows about it. We only care about this if we didn't timeout.
*/
req->state = HGFS_REQ_STATE_UNSENT;
- LOG(8, (KERN_DEBUG "VMware hgfs: HgfsSendRequest: Sending request id %d\n",
+ LOG(8, (KERN_DEBUG "VMware hgfs: HgfsSendRequest: Sending request id %d\n",
req->id));
- /*
+ /*
* Add the request to the queue, wake up the backdoor handler thread, and
* wait for a reply.
*/
wake_up_interruptible(&hgfsReqThreadWait);
error = HgfsWaitRequestReply(req);
- return error;
+ return error;
}
HgfsFreeRequest(HgfsReq *req) // IN: Request to free
{
ASSERT(hgfsReqCache);
-
+
/* Atomically decrement counter. */
spin_lock(&hgfsBigLock);
hgfsIdCounter--;
* asynchronously. The request is now on the sent list, and whenever
* the reply arrives, the backdoor handler will remove the request from
* the sent list and stuff the reply into the request's packet buffer.
- *
+ *
* HGFS_REQ_STATE_ERROR:
* The backdoor handler encountered an error while sending the request
* or getting the reply. The filesystem half of the driver should
* A request to be sent to the user process.
*/
typedef struct HgfsReq {
-
+
/* Links to place the object on various lists. */
struct list_head list;
-
- /*
+
+ /*
* When clients wait for the reply to a request, they'll wait on this
* wait queue.
*/
/* Total size of the payload.*/
size_t payloadSize;
- /*
+ /*
* Packet of data, for both incoming and outgoing messages.
* Include room for the command.
*/
*-----------------------------------------------------------------------------
*/
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(_MSC_VER)
static INLINE void
Div643232(uint64 dividend, // IN
uint32 *quotient, // OUT
uint32 *remainder) // OUT
{
- *quotient = dividend / divisor;
- *remainder = dividend % divisor;
+ *quotient = (uint32)(dividend / divisor);
+ *remainder = (uint32)(dividend % divisor);
}
#endif
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
/* LEVEL, REG, VENDOR, POS, SIZE, NAME, MASK TYPE, SET TO, CPL3, [FUNC] */
#define CPUID_FIELD_DATA_LEVEL_8x \
-FIELDDEF( 86, ECX, AMD, 0, 8, CACHE_LINE, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 8, 4, CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 12, 4, CACHE_WAYS, IGNORE, 0, FALSE) \
-FIELDDEF( 86, ECX, AMD, 16, 16, CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 0, 8, L2CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 8, 4, L2CACHE_LINE_PER_TAG, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 12, 4, L2CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, ECX, AMD, 16, 16, L2CACHE_SIZE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 0, 8, L3CACHE_LINE, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 8, 4, L3CACHE_LINE_PER_TAG,IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 12, 4, L3CACHE_WAYS, IGNORE, 0, FALSE) \
+FIELDDEF( 86, EDX, AMD, 18, 14, L3CACHE_SIZE, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 0, 1, TS, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 1, 1, FID, IGNORE, 0, FALSE) \
FLAGDEF( 87, EDX, AMD, 2, 1, VID, IGNORE, 0, FALSE) \
#define CPUID_MODEL_CORE 14
#define CPUID_MODEL_CORE2 15
#define CPUID_MODEL_PENRYN 0x17 // Effective model
+#define CPUID_MODEL_NEHALEM 0x1a // Effective model
static INLINE uint32
CPUID_EFFECTIVE_FAMILY(uint32 v) /* %eax from CPUID with %eax=1. */
#define IMPLIES(a,b) (!(a) || (b))
-
/*
* Not everybody (e.g., the monitor) has NULL
*/
#define VMW_INVALID_HANDLE -1
#endif
+/*
+ * Debug output macros for Windows drivers (the Eng variant is for
+ * display/printer drivers only.
+ */
+#ifdef _WIN32
+#ifndef USES_OLD_WINDDK
+#if defined(VMX86_DEBUG) || defined(ASSERT_ALWAYS_AVAILABLE)
+#define WinDrvPrint(arg, ...) DbgPrint(arg, __VA_ARGS__)
+#define WinDrvEngPrint(arg, ...) EngDbgPrint(arg, __VA_ARGS__)
+#else
+#define WinDrvPrint(arg, ...)
+#define WinDrvEngPrint(arg, ...)
+#endif
+#endif
+#endif // _WIN32
+
#endif // ifndef _VM_BASIC_DEFS_H_
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
#pragma warning (disable :4305) // truncation from 'const int' to 'short'
#pragma warning (disable :4244) // conversion from 'unsigned short' to 'unsigned char'
#pragma warning (disable :4267) // truncation of 'size_t'
-#if !defined VMX86_DEVEL // XXX until we clean up all the code -- edward
-#pragma warning (disable :4133) // incompatible types - from 'struct VM *' to 'int *'
-#pragma warning (disable :4047) // differs in levels of indirection
-#endif
#pragma warning (disable :4146) // unary minus operator applied to unsigned type, result still unsigned
#pragma warning (disable :4142) // benign redefinition of type
|| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
/* BSD/Darwin, Linux */
#define FMTSZ "z"
- #define FMTPD "t"
+
+ #ifdef VM_X86_64
+ #define FMTPD "l"
+ #else
+ #define FMTPD ""
+ #endif
#else
/* Systems with a pre-C99 libc */
#define FMTSZ "Z"
# define PRINTF_DECL(fmtPos, varPos)
#endif
+#if defined(__GNUC__)
+# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
+#else
+# define SCANF_DECL(fmtPos, varPos)
+#endif
+
/*
* UNUSED_PARAM should surround the parameter name and type declaration,
* e.g. "int MyFunction(int var1, UNUSED_PARAM(int var2))"
#define SCSI_MAX_CONTROLLERS 4 // Need more than 1 for MSCS clustering
#define SCSI_MAX_DEVICES 16 // BT-958 emulates only 16
#define SCSI_IDE_CHANNEL SCSI_MAX_CONTROLLERS
-#define SCSI_MAX_CHANNELS (SCSI_MAX_CONTROLLERS + 1)
+#define SCSI_IDE_HOSTED_CHANNEL (SCSI_MAX_CONTROLLERS + 1)
+#define SCSI_MAX_CHANNELS (SCSI_MAX_CONTROLLERS + 2)
/************* Strings for the VESA BIOS Identity Fields *****************/
#define VBE_OEM_STRING COMPANY_NAME " SVGA"
#define VMNET_CAP_LPD 0x10000 /* large pkt delivery */
#define VMNET_CAP_BPF 0x20000 /* BPF Support in VMXNET Virtual Hardware */
#define VMNET_CAP_SG_SPAN_PAGES 0x40000 /* Can do scatter-gather span multiple pages transmits. */
+#define VMNET_CAP_IP6_CSUM 0x80000 /* Can do IPv6 csum offload. */
+#define VMNET_CAP_TSO6 0x100000 /* Can do TSO segmentation offload for IPv6 pkts. */
+#define VMNET_CAP_TSO256k 0x200000 /* Can do TSO segmentation offload for pkts up to 256kB. */
#endif // _VMNET_DEF_H_
noinst_PROGRAMS = toolbox
-AM_CFLAGS =
-AM_CFLAGS += @GTK_CFLAGS@
-AM_CFLAGS += @COMMON_CFLAGS@
+AM_CFLAGS = @GTK_CPPFLAGS@
toolbox_LDADD =
toolbox_LDADD += ../lib/conf/libConf.a
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @GTK_CFLAGS@ @COMMON_CFLAGS@
+AM_CFLAGS = @GTK_CPPFLAGS@
# In the absence of the linker options --start-group and --end-group (which
# can't be put in LDADD), we need to bring the following libraries out of
# the alphabetical order so their symbols are properly resolved.
noinst_PROGRAMS = vmware-user
AM_CFLAGS =
-AM_CFLAGS += @GTK_CFLAGS@
-AM_CFLAGS += @COMMON_CFLAGS@
-AM_CFLAGS += @VMWARE_USER_CFLAGS@
+AM_CFLAGS += @GTK_CPPFLAGS@
+AM_CFLAGS += @VMWARE_USER_CPPFLAGS@
vmware_user_LDADD =
vmware_user_LDADD += ../lib/conf/libConf.a
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @GTK_CFLAGS@ @COMMON_CFLAGS@ @VMWARE_USER_CFLAGS@
+AM_CFLAGS = @GTK_CPPFLAGS@ @VMWARE_USER_CPPFLAGS@
# In the absence of the linker options --start-group and --end-group (which
# can't be put in LDADD), we need to bring the following libraries out of
# the alphabetical order so their symbols are properly resolved.
*
* We cannot link with winsock, since the DLL may not be present in all guests.
* That would create a dll link problem that would prevent the tools from loading.
- * Instead, we try to get the procedure pointer ourselves at runtime, and quietly
+ * Instead, we try to get the procedure pointer ourselves at runtime, and quietly
* fail if it is not there.
*-----------------------------------------------------------------------------
*/
int tolen);
typedef int (WSAAPI *SendSockOptProcType)(SOCKET s,
- int level,
- int optname,
+ int level,
+ int optname,
const void *optval,
socklen_t optlen);
#define VMToolsNet_FDIsSet FD_ISSET
#define VMToolsNet_Recvfrom recvfrom
-#endif
+#endif
Bool ForeignToolsMakeNonBlocking(int fd);
char *ipAddressStr = NULL;
char *destPtr;
char *endDestPtr;
- NicInfo nicInfo;
+ GuestNicInfo nicInfo;
#ifdef _WIN32
HMODULE hWs2_32 = NULL;
WSADATA wsaData;
VixSocketListenerPort);
/*
- * Find out how big the IP_ADAPTER_INFO table needs to be.
+ * Find out how big the IP_ADAPTER_INFO table needs to be.
*/
success = GuestInfoGetNicInfo(&nicInfo);
if (success) {
NicEntry *nicEntryPtr = NULL;
DblLnkLst_Links *nicEntryLink;
-
+
DblLnkLst_ForEach(nicEntryLink, &nicInfo.nicList) {
nicEntryPtr = DblLnkLst_Container(nicEntryLink, NicEntry, links);
destPtr += Str_Snprintf(destPtr,
"%s=%s;",
VIX_SLPV2_PROPERTY_MAC_ADDR,
nicEntryPtr->nicEntryProto.macAddress);
- }
+ }
GuestInfo_FreeDynamicMemoryInNicInfo(&nicInfo);
}
goto abort;
}
//success = ForeignToolsMakeNonBlocking(tcpListenerSocket);
- success = ForeignToolsSocketBind(tcpListenerSocket,
- INADDR_ANY,
+ success = ForeignToolsSocketBind(tcpListenerSocket,
+ INADDR_ANY,
VixSocketListenerPort);
if (!success) {
goto abort;
goto abort;
}
//success = ForeignToolsMakeNonBlocking(tcpListenerSocket);
- success = ForeignToolsSocketBind(udpListenerSocket,
- INADDR_ANY,
+ success = ForeignToolsSocketBind(udpListenerSocket,
+ INADDR_ANY,
SLPv2SocketListenerPort);
if (!success) {
goto abort;
}
- VMToolsNet_SetSockOpt(udpListenerSocket,
- SOL_SOCKET,
+ VMToolsNet_SetSockOpt(udpListenerSocket,
+ SOL_SOCKET,
SO_BROADCAST,
- (const void *) &bcast,
+ (const void *) &bcast,
sizeof(bcast));
#ifdef _WIN32
DWORD dwBytesReturned = 0;
BOOL bNewBehavior = FALSE;
DWORD status;
- status = VMToolsNet_WSAIoctl(udpListenerSocket,
+ status = VMToolsNet_WSAIoctl(udpListenerSocket,
SIO_UDP_CONNRESET,
- &bNewBehavior,
+ &bNewBehavior,
sizeof(bNewBehavior),
- NULL,
- 0,
+ NULL,
+ 0,
&dwBytesReturned,
- NULL,
+ NULL,
NULL);
if (SOCKET_ERROR == status) {
}
if (udpListenerSocket != -1) {
VMToolsNet_CloseSocket(udpListenerSocket);
udpListenerSocket = -1;
- }
+ }
} // ForeignToolsSelectLoop
}
}
-
+
VIX_ENTER_LOCK(&globalLock);
-
+
/*
* Allocate some state for the connection
*/
/*
* Read the message header.
*/
- result = VMToolsNet_Recv(connectionState->socket,
- (char *) &(connectionState->requestHeader),
+ result = VMToolsNet_Recv(connectionState->socket,
+ (char *) &(connectionState->requestHeader),
sizeof(connectionState->requestHeader),
0);
if (result <= 0) {
goto abort;
}
- connectionState->completeRequest
+ connectionState->completeRequest
= Util_SafeMalloc(connectionState->requestHeader.commonHeader.totalMessageLength);
memcpy(connectionState->completeRequest,
&(connectionState->requestHeader),
/*
* If this request has a variable-sized part, like a body or a user credential,
- * then start reading that. Otherwise, if the request only has a fixed-size header,
+ * then start reading that. Otherwise, if the request only has a fixed-size header,
* then we can start processing it now.
*/
if (connectionState->requestHeader.commonHeader.totalMessageLength > result) {
- result = VMToolsNet_Recv(connectionState->socket,
- connectionState->completeRequest + result,
+ result = VMToolsNet_Recv(connectionState->socket,
+ connectionState->completeRequest + result,
connectionState->requestHeader.commonHeader.totalMessageLength - result,
0);
if (result <= 0) {
responseHeader->responseFlags |= responseFlags;
- result = VMToolsNet_Send(connectionState->socket,
+ result = VMToolsNet_Send(connectionState->socket,
(const char *) responseHeader,
- totalMessageSize,
+ totalMessageSize,
0);
if (result <= 0) {
}
responseHeader->responseFlags |= responseFlags;
- result = VMToolsNet_Send(connectionState->socket,
+ result = VMToolsNet_Send(connectionState->socket,
(const char *) responseHeader,
- totalMessageSize,
+ totalMessageSize,
0);
if (result <= 0) {
}
char *replyPacket = NULL;
int replyPacketSize = 0;
- actualPacketLength = VMToolsNet_Recvfrom(udpListenerSocket,
- receiveBuffer,
+ actualPacketLength = VMToolsNet_Recvfrom(udpListenerSocket,
+ receiveBuffer,
sizeof(receiveBuffer),
0,
- (struct sockaddr *) &clientAddr,
+ (struct sockaddr *) &clientAddr,
&clientAddrLen);
if (actualPacketLength <= 0) {
goto abort;
"", // LDAPv3 predicate
&xid);
if (match) {
- Str_Sprintf(urlBuffer,
- sizeof urlBuffer,
- "%s://%s/",
+ Str_Sprintf(urlBuffer,
+ sizeof urlBuffer,
+ "%s://%s/",
VIX_SLPV2_SERVICE_NAME_TOOLS_SERVICE,
globalHostName);
success = SLPv2MsgAssembler_ServiceReply(&replyPacket,
* for more responses.
*/
if (NULL != replyPacket) {
- VMToolsNet_Sendto(udpListenerSocket,
- replyPacket,
+ VMToolsNet_Sendto(udpListenerSocket,
+ replyPacket,
replyPacketSize,
0, // flags
- (struct sockaddr *) &clientAddr,
+ (struct sockaddr *) &clientAddr,
clientAddrLen);
}
/*
* It's possible that data on a connection arrives late, after we have
- * closed it. In that case, VMAutomationReceiveMessage will correctly
+ * closed it. In that case, VMAutomationReceiveMessage will correctly
* not process the data. But, be careful that we don't try to close
* the connection again.
*/
ForeignToolsDiscardCommand(command);
}
-
+
command = nextCommand;
} // while (NULL != command)
localAddr.sin_addr.s_addr = VMToolsNet_htonl(INADDR_ANY);
localAddr.sin_port = VMToolsNet_htons(SLPv2SocketListenerPort);
- VMToolsNet_Sendto(udpListenerSocket,
- packet,
+ VMToolsNet_Sendto(udpListenerSocket,
+ packet,
sizeof(packet),
0, // flags
- (struct sockaddr *) &localAddr,
+ (struct sockaddr *) &localAddr,
sizeof(localAddr));
} // ForeignToolsWakeSelectThread
SIGTERM,
SIGUSR1,
SIGUSR2,
+ SIGPIPE
};
noinst_PROGRAMS = xferlogs
-AM_CFLAGS =
-AM_CFLAGS += @COMMON_CFLAGS@
-
xferlogs_LDADD =
xferlogs_LDADD += ../lib/rpcVmx/libRpcVmx.a
xferlogs_LDADD += ../lib/string/libString.a
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMMON_CFLAGS = @COMMON_CFLAGS@
-COMMON_PROG_CFLAGS = @COMMON_PROG_CFLAGS@
COMMON_XLIBS = @COMMON_XLIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DNET_CFLAGS = @DNET_CFLAGS@
DNET_CONFIG = @DNET_CONFIG@
+DNET_CPPFLAGS = @DNET_CPPFLAGS@
DNET_LIBS = @DNET_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
+GTK_CPPFLAGS = @GTK_CPPFLAGS@
GTK_LIBS = @GTK_LIBS@
GUESTD_LDADD = @GUESTD_LDADD@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
-ICU_CFLAGS = @ICU_CFLAGS@
ICU_CONFIG = @ICU_CONFIG@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
ICU_LIBS = @ICU_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIB_AUTH_CFLAGS = @LIB_AUTH_CFLAGS@
-LIB_FILE_CFLAGS = @LIB_FILE_CFLAGS@
-LIB_HGFS_SERVER_CFLAGS = @LIB_HGFS_SERVER_CFLAGS@
-LIB_IMPERSONATE_CFLAGS = @LIB_IMPERSONATE_CFLAGS@
-LIB_MISC_CFLAGS = @LIB_MISC_CFLAGS@
-LIB_PROC_MGR_CFLAGS = @LIB_PROC_MGR_CFLAGS@
-LIB_STRING_CFLAGS = @LIB_STRING_CFLAGS@
-LIB_USER_CFLAGS = @LIB_USER_CFLAGS@
+LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
+LIB_FILE_CPPFLAGS = @LIB_FILE_CPPFLAGS@
+LIB_HGFS_SERVER_CPPFLAGS = @LIB_HGFS_SERVER_CPPFLAGS@
+LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
+LIB_MISC_CPPFLAGS = @LIB_MISC_CPPFLAGS@
+LIB_PROC_MGR_CPPFLAGS = @LIB_PROC_MGR_CPPFLAGS@
+LIB_STRING_CPPFLAGS = @LIB_STRING_CPPFLAGS@
+LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PROCPS_CFLAGS = @PROCPS_CFLAGS@
+PROCPS_CPPFLAGS = @PROCPS_CPPFLAGS@
PROCPS_LIBS = @PROCPS_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-VMWARE_USER_CFLAGS = @VMWARE_USER_CFLAGS@
+VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = @COMMON_CFLAGS@
# In the absence of the linker options --start-group and --end-group (which can't
# be put in LDADD), we need to bring the following libraries out of the alphebetical
# order so their symbols are properly resolved.
projects / thirdparty / open-vm-tools.git / commitdiff
