From: Ronnie Sahlberg Date: Thu, 30 May 2013 02:28:27 +0000 (-0700) Subject: Merge pull request #34 from Memphiz/win32fix2 X-Git-Tag: upstream/1.9.6^2~192^2 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=fc0da5c64cb22d2609757a0bb4d8293c8c64bb16;hp=c5e346e15c043a6253cc5a838dd9c77febf624aa;p=deb_libnfs.git Merge pull request #34 from Memphiz/win32fix2 Win32fix2 --- diff --git a/examples/nfsclient-listservers.c b/examples/nfsclient-listservers.c index db71520..e275e7f 100644 --- a/examples/nfsclient-listservers.c +++ b/examples/nfsclient-listservers.c @@ -21,6 +21,10 @@ #include "aros_compat.h" #endif +#ifdef WIN32 +#include "win32_compat.h" +#endif + #include #include #include "libnfs-zdr.h" diff --git a/lib/libnfs-win32.def b/lib/libnfs-win32.def index 4b1e6f5..25ddfe8 100644 --- a/lib/libnfs-win32.def +++ b/lib/libnfs-win32.def @@ -78,3 +78,21 @@ nfs_utimes_async nfs_which_events nfs_write nfs_write_async +win32_poll +rpc_which_events +rpc_service +rpc_init_context +rpc_get_fd +rpc_get_error +rpc_destroy_context +rpc_rquota1_getquota_async +rpc_pmap_null_async +rpc_pmap_getport_async +rpc_nfsacl_null_async +rpc_nfsacl_getacl_async +rpc_mount_null_async +rpc_mount_mnt_async +rpc_mount_export_async +rpc_disconnect +rpc_connect_async +rpc_nfs_fsinfo_async diff --git a/nfs/nfs.c b/nfs/nfs.c index 361502f..44b7538 100644 --- a/nfs/nfs.c +++ b/nfs/nfs.c @@ -261,7 +261,7 @@ int rpc_nfs_write_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, args.file.data.data_val = fh->data.data_val; args.offset = offset; args.count = count; - args.stable = stable_how;; + args.stable = stable_how; args.data.data_len = count; args.data.data_val = buf; diff --git a/win32/libnfs/libnfs.sln b/win32/libnfs/libnfs.sln index aa62eac..d7caa5e 100644 --- a/win32/libnfs/libnfs.sln +++ b/win32/libnfs/libnfs.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnfs", "libnfs.vcxproj", "{7CAB9B67-6AA9-497F-A900-20D9D05049F5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-sync", "..\nfsclient-sync\nfsclient-sync.vcxproj", "{B907AC9A-50C5-4E43-97C3-27DC7241F6C5}" @@ -8,6 +8,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-sync", "..\nfscli {7CAB9B67-6AA9-497F-A900-20D9D05049F5} = {7CAB9B67-6AA9-497F-A900-20D9D05049F5} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-async", "..\nfsclient-async\nfsclient-async.vcxproj", "{00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-bcast", "..\nfsclient-bcast\nfsclient-bcast.vcxproj", "{4F1B789D-B760-4B27-A5AD-D923765413F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-listservers", "..\nfsclient-listservers\nfsclient-listservers.vcxproj", "{C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfsclient-raw", "..\nfsclient-raw\nfsclient-raw.vcxproj", "{5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfs-cp", "..\nfs-cp\nfs-cp.vcxproj", "{8C223950-DD30-4C89-BD5D-C105951FE2B6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfs-ls", "..\nfs-ls\nfs-ls.vcxproj", "{43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -32,6 +44,54 @@ Global {B907AC9A-50C5-4E43-97C3-27DC7241F6C5}.Release|Win32.Build.0 = Release|Win32 {B907AC9A-50C5-4E43-97C3-27DC7241F6C5}.Release|x64.ActiveCfg = Release|x64 {B907AC9A-50C5-4E43-97C3-27DC7241F6C5}.Release|x64.Build.0 = Release|x64 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Debug|Win32.Build.0 = Debug|Win32 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Debug|x64.ActiveCfg = Debug|x64 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Debug|x64.Build.0 = Debug|x64 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Release|Win32.ActiveCfg = Release|Win32 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Release|Win32.Build.0 = Release|Win32 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Release|x64.ActiveCfg = Release|x64 + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0}.Release|x64.Build.0 = Release|x64 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Debug|Win32.Build.0 = Debug|Win32 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Debug|x64.ActiveCfg = Debug|x64 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Debug|x64.Build.0 = Debug|x64 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Release|Win32.ActiveCfg = Release|Win32 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Release|Win32.Build.0 = Release|Win32 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Release|x64.ActiveCfg = Release|x64 + {4F1B789D-B760-4B27-A5AD-D923765413F4}.Release|x64.Build.0 = Release|x64 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Debug|Win32.Build.0 = Debug|Win32 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Debug|x64.ActiveCfg = Debug|x64 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Debug|x64.Build.0 = Debug|x64 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Release|Win32.ActiveCfg = Release|Win32 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Release|Win32.Build.0 = Release|Win32 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Release|x64.ActiveCfg = Release|x64 + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6}.Release|x64.Build.0 = Release|x64 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Debug|Win32.Build.0 = Debug|Win32 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Debug|x64.ActiveCfg = Debug|x64 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Debug|x64.Build.0 = Debug|x64 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Release|Win32.ActiveCfg = Release|Win32 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Release|Win32.Build.0 = Release|Win32 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Release|x64.ActiveCfg = Release|x64 + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5}.Release|x64.Build.0 = Release|x64 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Debug|Win32.Build.0 = Debug|Win32 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Debug|x64.ActiveCfg = Debug|x64 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Debug|x64.Build.0 = Debug|x64 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Release|Win32.ActiveCfg = Release|Win32 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Release|Win32.Build.0 = Release|Win32 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Release|x64.ActiveCfg = Release|x64 + {8C223950-DD30-4C89-BD5D-C105951FE2B6}.Release|x64.Build.0 = Release|x64 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Debug|Win32.ActiveCfg = Debug|Win32 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Debug|Win32.Build.0 = Debug|Win32 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Debug|x64.ActiveCfg = Debug|x64 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Debug|x64.Build.0 = Debug|x64 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Release|Win32.ActiveCfg = Release|Win32 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Release|Win32.Build.0 = Release|Win32 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Release|x64.ActiveCfg = Release|x64 + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/libnfs/libnfs.vcxproj b/win32/libnfs/libnfs.vcxproj index f157748..f0b938c 100644 --- a/win32/libnfs/libnfs.vcxproj +++ b/win32/libnfs/libnfs.vcxproj @@ -89,7 +89,7 @@ Level3 Disabled WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;_USE_32BIT_TIME_T;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions) - ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\lib + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\lib Default 4996 @@ -97,25 +97,12 @@ Windows true ..\..\lib\libnfs-win32.def - oncrpc.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) MSVCRT - copy $(ProjectDir)..\..\nfs\nfs.x $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x -rpcgen.exe -h $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x > $(ProjectDir)..\..\nfs\libnfs-raw-nfs.h -rpcgen.exe -c $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x > $(ProjectDir)..\..\nfs\libnfs-raw-nfs.c - -copy $(ProjectDir)..\..\rquota\rquota.x $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x -rpcgen.exe -h $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x > $(ProjectDir)..\..\rquota\libnfs-raw-rquota.h -rpcgen.exe -c $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x > $(ProjectDir)..\..\rquota\libnfs-raw-rquota.c - -copy $(ProjectDir)..\..\portmap\portmap.x $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x -rpcgen.exe -h $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x > $(ProjectDir)..\..\portmap\libnfs-raw-portmap.h -rpcgen.exe -c $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x > $(ProjectDir)..\..\portmap\libnfs-raw-portmap.c - -copy $(ProjectDir)..\..\mount\mount.x $(ProjectDir)..\..\mount\libnfs-raw-mount.x -rpcgen.exe -h $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\..\mount\libnfs-raw-mount.h -rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\..\mount\libnfs-raw-mount.c + + @@ -163,7 +150,7 @@ rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;__STDC_CONSTANT_MACROS;ONCRPC_STATIC;%(PreprocessorDefinitions) - ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\lib + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\lib 4996 @@ -171,25 +158,12 @@ rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\ true true true - oncrpc.lib;ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) ..\..\lib\libnfs-win32.def - copy $(ProjectDir)..\..\nfs\nfs.x $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x -rpcgen.exe -h $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x > $(ProjectDir)..\..\nfs\libnfs-raw-nfs.h -rpcgen.exe -c $(ProjectDir)..\..\nfs\libnfs-raw-nfs.x > $(ProjectDir)..\..\nfs\libnfs-raw-nfs.c - -copy $(ProjectDir)..\..\rquota\rquota.x $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x -rpcgen.exe -h $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x > $(ProjectDir)..\..\rquota\libnfs-raw-rquota.h -rpcgen.exe -c $(ProjectDir)..\..\rquota\libnfs-raw-rquota.x > $(ProjectDir)..\..\rquota\libnfs-raw-rquota.c - -copy $(ProjectDir)..\..\portmap\portmap.x $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x -rpcgen.exe -h $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x > $(ProjectDir)..\..\portmap\libnfs-raw-portmap.h -rpcgen.exe -c $(ProjectDir)..\..\portmap\libnfs-raw-portmap.x > $(ProjectDir)..\..\portmap\libnfs-raw-portmap.c - -copy $(ProjectDir)..\..\mount\mount.x $(ProjectDir)..\..\mount\libnfs-raw-mount.x -rpcgen.exe -h $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\..\mount\libnfs-raw-mount.h -rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\..\mount\libnfs-raw-mount.c + + @@ -235,6 +209,7 @@ rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\ + @@ -255,6 +230,7 @@ rpcgen.exe -c $(ProjectDir)..\..\mount\libnfs-raw-mount.x > $(ProjectDir)..\ + diff --git a/win32/libnfs/libnfs.vcxproj.filters b/win32/libnfs/libnfs.vcxproj.filters index 24f3db0..966f680 100644 --- a/win32/libnfs/libnfs.vcxproj.filters +++ b/win32/libnfs/libnfs.vcxproj.filters @@ -56,6 +56,9 @@ Source Files + + Source Files + @@ -73,6 +76,9 @@ Header Files + + Header Files + diff --git a/win32/nfs-cp/nfs-cp.vcxproj b/win32/nfs-cp/nfs-cp.vcxproj new file mode 100644 index 0000000..70fe4b3 --- /dev/null +++ b/win32/nfs-cp/nfs-cp.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C223950-DD30-4C89-BD5D-C105951FE2B6} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfs-cp/nfs-cp.vcxproj.filters b/win32/nfs-cp/nfs-cp.vcxproj.filters new file mode 100644 index 0000000..ebe1a53 --- /dev/null +++ b/win32/nfs-cp/nfs-cp.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfs-ls/nfs-ls.vcxproj b/win32/nfs-ls/nfs-ls.vcxproj new file mode 100644 index 0000000..ef36ef4 --- /dev/null +++ b/win32/nfs-ls/nfs-ls.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {43A2C9EF-338F-4326-9DF2-1CE0B1DA1C6B} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfs-ls/nfs-ls.vcxproj.filters b/win32/nfs-ls/nfs-ls.vcxproj.filters new file mode 100644 index 0000000..96cd701 --- /dev/null +++ b/win32/nfs-ls/nfs-ls.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfsclient-async/nfsclient-async.vcxproj b/win32/nfsclient-async/nfsclient-async.vcxproj new file mode 100644 index 0000000..a776a9c --- /dev/null +++ b/win32/nfsclient-async/nfsclient-async.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {00EB73F2-8DA9-43DC-A0BB-5A09464DA4A0} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfsclient-async/nfsclient-async.vcxproj.filters b/win32/nfsclient-async/nfsclient-async.vcxproj.filters new file mode 100644 index 0000000..112e4d1 --- /dev/null +++ b/win32/nfsclient-async/nfsclient-async.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfsclient-bcast/nfsclient-bcast.vcxproj b/win32/nfsclient-bcast/nfsclient-bcast.vcxproj new file mode 100644 index 0000000..2249b60 --- /dev/null +++ b/win32/nfsclient-bcast/nfsclient-bcast.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4F1B789D-B760-4B27-A5AD-D923765413F4} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\portmap + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\portmap + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfsclient-bcast/nfsclient-bcast.vcxproj.filters b/win32/nfsclient-bcast/nfsclient-bcast.vcxproj.filters new file mode 100644 index 0000000..0ab434a --- /dev/null +++ b/win32/nfsclient-bcast/nfsclient-bcast.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfsclient-listservers/nfsclient-listservers.vcxproj b/win32/nfsclient-listservers/nfsclient-listservers.vcxproj new file mode 100644 index 0000000..b717390 --- /dev/null +++ b/win32/nfsclient-listservers/nfsclient-listservers.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C9EE015F-D35B-4DC6-B024-7C9C2C5D45E6} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfsclient-listservers/nfsclient-listservers.vcxproj.filters b/win32/nfsclient-listservers/nfsclient-listservers.vcxproj.filters new file mode 100644 index 0000000..54f16cb --- /dev/null +++ b/win32/nfsclient-listservers/nfsclient-listservers.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfsclient-raw/nfsclient-raw.vcxproj b/win32/nfsclient-raw/nfsclient-raw.vcxproj new file mode 100644 index 0000000..79fab04 --- /dev/null +++ b/win32/nfsclient-raw/nfsclient-raw.vcxproj @@ -0,0 +1,163 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C31C9BE-13AA-4012-A3C2-12A8042BE0B5} + Win32Proj + nfsclientsync + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + true + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + false + ..\libnfs\Release;..\..\..\oncrpc-win32\win32\bin;..\..\bin;$(LibraryPath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\rquota + + + Console + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + false + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs;..\..\rquota + + + Console + true + true + true + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) + ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + + + Console + true + true + true + libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/win32/nfsclient-raw/nfsclient-raw.vcxproj.filters b/win32/nfsclient-raw/nfsclient-raw.vcxproj.filters new file mode 100644 index 0000000..53a87cd --- /dev/null +++ b/win32/nfsclient-raw/nfsclient-raw.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/nfsclient-sync/nfsclient-sync.vcxproj b/win32/nfsclient-sync/nfsclient-sync.vcxproj index c5a0e90..80e706d 100644 --- a/win32/nfsclient-sync/nfsclient-sync.vcxproj +++ b/win32/nfsclient-sync/nfsclient-sync.vcxproj @@ -85,12 +85,12 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions) - ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs Console true - libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) false @@ -125,14 +125,14 @@ true true WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;ONCRPC_STATIC;%(PreprocessorDefinitions) - ..\..\..\oncrpc-win32\win32\include;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs + ..\..\include\nfsc;..\..\include;..\..\.;..\..\win32;..\..\mount;..\..\nfs Console true true true - libnfs.lib;oncrpc.lib;WS2_32.lib;%(AdditionalDependencies) + libnfs.lib;WS2_32.lib;%(AdditionalDependencies) diff --git a/win32/win32_compat.c b/win32/win32_compat.c index 87f9ab1..738da9d 100644 --- a/win32/win32_compat.c +++ b/win32/win32_compat.c @@ -29,7 +29,6 @@ static int dummy ATTRIBUTE((unused)); #include "win32_compat.h" #include #include -#include #undef poll #undef socket diff --git a/win32/win32_compat.h b/win32/win32_compat.h index 71f10bd..67e44e4 100644 --- a/win32/win32_compat.h +++ b/win32/win32_compat.h @@ -32,6 +32,7 @@ THE SOFTWARE. #include #include #include +#include typedef int uid_t; typedef int gid_t;