pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for switch frrom legacy MSVC to ISO C17+analyser cleanup, 2023-12-22
Posted by Anonymous on Fri 22nd Dec 2023 13:56
raw | new post

  1. From 957e2274823fe1cc8e60eb2c1639617d6b8d4642 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Thu, 21 Dec 2023 17:23:06 +0100
  4. Subject: [PATCH 1/5] cygwin/Makefile: Binary tarball should have date
  5.  first+print full tarball path
  6.  
  7. The Cygwin binary tarball filename should have the date first,
  8. so the files can get correctly sorted the default (alphabetic) sort
  9. orderiung of download areas.
  10.  
  11. Also, $ make -f cygwin/Makefile bintarball # should print a message
  12. with the full path of the tarball, so developers can use copy&paste
  13. in xterm/konsole.
  14.  
  15. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  16. ---
  17. cygwin/Makefile | 10 +++++++---
  18.  1 file changed, 7 insertions(+), 3 deletions(-)
  19.  
  20. diff --git a/cygwin/Makefile b/cygwin/Makefile
  21. index e9207f6..4f62e85 100644
  22. --- a/cygwin/Makefile
  23. +++ b/cygwin/Makefile
  24. @@ -101,16 +101,20 @@ installdest: $(VS_BUILD_DIR)/nfsd.exe \
  25.                 "$(DESTDIR)/cygdrive/c/cygwin64/sbin/"
  26.  
  27.  bintarball: installdest
  28. +       set -o errexit ; \
  29. +       base_filename="msnfs41client_cygwin_binaries_$$(date +%Y%m%d_%Hh%Mm)_git$$(git rev-parse --short HEAD)" ; \
  30.         ( \
  31. -       base_filename="msnfs41client_cygwin_binaries_git$$(git rev-parse --short HEAD)_$$(date +%Y%m%d_%Hh%Mm)" ; \
  32. -       cd destdir && \
  33. +       cd "$(DESTDIR)" && \
  34.         cp "../cygwin/README.bintarball.txt" "$${base_filename}.readme" && \
  35.         tar -cvf - \
  36.                 --owner=SYSTEM:18 \
  37.                 --group=SYSTEM:18 \
  38.                 cygdrive/c/cygwin64 | \
  39.                         bzip2 -9 >"$${base_filename}.tar.bz2" \
  40. -       )
  41. +       ) ; \
  42. +       printf "\n#\n# tarball is ready now\n#\n" ; \
  43. +       ls -l "$(DESTDIR)/$${base_filename}.tar.bz2" ; \
  44. +       ls -l "$(DESTDIR)/$${base_filename}.readme"
  45.  
  46.  #
  47.  # clean destdir/, but only if nfsd*.exe does not use it right now
  48. --
  49. 2.42.1
  50.  
  51. From 68a8c270351c8d9170eb9ebaed2a9f99f3a60820 Mon Sep 17 00:00:00 2001
  52. From: Roland Mainz <roland.mainz@nrubsig.org>
  53. Date: Thu, 21 Dec 2023 18:45:25 +0100
  54. Subject: [PATCH 2/5] VC19 build: Switch to ISO C17
  55.  
  56. Switch default C language from legacy MSVC to VC19 ISO C17,
  57. this should give better performance, better compiler errors
  58. and warnings, and less suprises with C compiler behaviour.
  59.  
  60. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  61. ---
  62. build.vc19/libtirpc/libtirpc.vcxproj         |  4 ++++
  63.  build.vc19/nfs41_driver/nfs41_driver.vcxproj | 17 +++++++++++++++++
  64.  build.vc19/nfs41_np/nfs41_np.vcxproj         |  4 ++++
  65.  build.vc19/nfs_install/nfs_install.vcxproj   |  4 ++++
  66.  build.vc19/nfs_mount/nfs_mount.vcxproj       |  4 ++++
  67.  build.vc19/nfsd/nfsd.vcxproj                 |  4 ++++
  68.  daemon/nfs41_daemon.c                        |  4 ++++
  69.  daemon/nfs41_daemon.h                        |  4 ++++
  70.  dll/nfs41_np.c                               |  4 ++++
  71.  install/nfs_install.c                        |  4 ++++
  72.  libtirpc/libtirpc/libtirpc.rc                |  2 +-
  73.  libtirpc/src/gettimeofday.c                  |  2 +-
  74.  libtirpc/tirpc/wintirpc.h                    |  5 +++++
  75.  mount/mount.c                                |  3 +++
  76.  sys/nfs41_driver.c                           |  8 ++++++++
  77.  15 files changed, 71 insertions(+), 2 deletions(-)
  78.  
  79. diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj
  80. index 43881fd..c32475a 100644
  81. --- a/build.vc19/libtirpc/libtirpc.vcxproj
  82. +++ b/build.vc19/libtirpc/libtirpc.vcxproj
  83. @@ -89,6 +89,7 @@
  84.        <Optimization>Disabled</Optimization>
  85.        <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  86.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  87. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  88.      </ClCompile>
  89.      <Link>
  90.        <SubSystem>Windows</SubSystem>
  91. @@ -105,6 +106,7 @@
  92.        <Optimization>Disabled</Optimization>
  93.        <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  94.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  95. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  96.      </ClCompile>
  97.      <Link>
  98.        <SubSystem>Windows</SubSystem>
  99. @@ -123,6 +125,7 @@
  100.        <IntrinsicFunctions>true</IntrinsicFunctions>
  101.        <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  102.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  103. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  104.      </ClCompile>
  105.      <Link>
  106.        <SubSystem>Windows</SubSystem>
  107. @@ -143,6 +146,7 @@
  108.        <IntrinsicFunctions>true</IntrinsicFunctions>
  109.        <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  110.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  111. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  112.      </ClCompile>
  113.      <Link>
  114.        <SubSystem>Windows</SubSystem>
  115. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  116. index 31880bb..33e4053 100644
  117. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  118. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  119. @@ -42,6 +42,7 @@
  120.      <Configuration>Debug</Configuration>
  121.      <Platform Condition="'$(Platform)' == ''">Win32</Platform>
  122.      <RootNamespace>nfs41_driver</RootNamespace>
  123. +    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
  124.    </PropertyGroup>
  125.    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  126.    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  127. @@ -137,6 +138,8 @@
  128.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  129.        <WarningLevel>Level3</WarningLevel>
  130.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  131. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  132. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  133.      </ClCompile>
  134.      <Link>
  135.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  136. @@ -147,6 +150,8 @@
  137.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  138.        <WarningLevel>Level3</WarningLevel>
  139.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  140. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  141. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  142.      </ClCompile>
  143.      <Link>
  144.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  145. @@ -157,6 +162,8 @@
  146.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  147.        <WarningLevel>Level3</WarningLevel>
  148.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  149. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  150. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  151.      </ClCompile>
  152.      <Link>
  153.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  154. @@ -167,6 +174,8 @@
  155.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  156.        <WarningLevel>Level3</WarningLevel>
  157.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  158. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  159. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  160.      </ClCompile>
  161.      <Link>
  162.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  163. @@ -177,6 +186,8 @@
  164.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  165.        <WarningLevel>Level3</WarningLevel>
  166.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  167. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  168. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  169.      </ClCompile>
  170.      <Link>
  171.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  172. @@ -187,6 +198,8 @@
  173.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  174.        <WarningLevel>Level3</WarningLevel>
  175.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  176. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  177. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  178.      </ClCompile>
  179.      <Link>
  180.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  181. @@ -197,6 +210,8 @@
  182.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  183.        <WarningLevel>Level3</WarningLevel>
  184.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  185. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  186. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  187.      </ClCompile>
  188.      <Link>
  189.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  190. @@ -207,6 +222,8 @@
  191.        <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  192.        <WarningLevel>Level3</WarningLevel>
  193.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  194. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  195. +      <AdditionalOptions>/std:c17 /Zc:preprocessor- /kernel /wd5104</AdditionalOptions>
  196.      </ClCompile>
  197.      <Link>
  198.        <AdditionalDependencies>$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ntoskrnl.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\hal.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\bufferoverflowk.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\ksecdd.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rxce.lib;$(WindowsSdkDir)lib\10.0.19041.0\km\$(DDKPlatform)\rdbsslib.lib;$(WindowsSdkDir)lib\win7\km\$(DDKPlatform)\copysup.lib</AdditionalDependencies>
  199. diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj
  200. index a31a57d..60d3000 100644
  201. --- a/build.vc19/nfs41_np/nfs41_np.vcxproj
  202. +++ b/build.vc19/nfs41_np/nfs41_np.vcxproj
  203. @@ -89,6 +89,7 @@
  204.        <Optimization>Disabled</Optimization>
  205.        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  206.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  207. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  208.      </ClCompile>
  209.      <Link>
  210.        <SubSystem>Windows</SubSystem>
  211. @@ -104,6 +105,7 @@
  212.        <Optimization>Disabled</Optimization>
  213.        <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  214.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  215. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  216.      </ClCompile>
  217.      <Link>
  218.        <SubSystem>Windows</SubSystem>
  219. @@ -121,6 +123,7 @@
  220.        <IntrinsicFunctions>true</IntrinsicFunctions>
  221.        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  222.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  223. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  224.      </ClCompile>
  225.      <Link>
  226.        <SubSystem>Windows</SubSystem>
  227. @@ -140,6 +143,7 @@
  228.        <IntrinsicFunctions>true</IntrinsicFunctions>
  229.        <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  230.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  231. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  232.      </ClCompile>
  233.      <Link>
  234.        <SubSystem>Windows</SubSystem>
  235. diff --git a/build.vc19/nfs_install/nfs_install.vcxproj b/build.vc19/nfs_install/nfs_install.vcxproj
  236. index 8cb69bd..c17e568 100644
  237. --- a/build.vc19/nfs_install/nfs_install.vcxproj
  238. +++ b/build.vc19/nfs_install/nfs_install.vcxproj
  239. @@ -89,6 +89,7 @@
  240.        <Optimization>Disabled</Optimization>
  241.        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  242.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  243. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  244.      </ClCompile>
  245.      <Link>
  246.        <SubSystem>Console</SubSystem>
  247. @@ -103,6 +104,7 @@
  248.        <Optimization>Disabled</Optimization>
  249.        <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  250.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  251. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  252.      </ClCompile>
  253.      <Link>
  254.        <SubSystem>Console</SubSystem>
  255. @@ -119,6 +121,7 @@
  256.        <IntrinsicFunctions>true</IntrinsicFunctions>
  257.        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  258.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  259. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  260.      </ClCompile>
  261.      <Link>
  262.        <SubSystem>Console</SubSystem>
  263. @@ -137,6 +140,7 @@
  264.        <IntrinsicFunctions>true</IntrinsicFunctions>
  265.        <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  266.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  267. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  268.      </ClCompile>
  269.      <Link>
  270.        <SubSystem>Console</SubSystem>
  271. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  272. index 8ecd741..efb2384 100644
  273. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  274. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  275. @@ -89,6 +89,7 @@
  276.        <Optimization>Disabled</Optimization>
  277.        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  278.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  279. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  280.      </ClCompile>
  281.      <Link>
  282.        <SubSystem>Console</SubSystem>
  283. @@ -104,6 +105,7 @@
  284.        <Optimization>Disabled</Optimization>
  285.        <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  286.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  287. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  288.      </ClCompile>
  289.      <Link>
  290.        <SubSystem>Console</SubSystem>
  291. @@ -121,6 +123,7 @@
  292.        <IntrinsicFunctions>true</IntrinsicFunctions>
  293.        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  294.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  295. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  296.      </ClCompile>
  297.      <Link>
  298.        <SubSystem>Console</SubSystem>
  299. @@ -140,6 +143,7 @@
  300.        <IntrinsicFunctions>true</IntrinsicFunctions>
  301.        <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  302.        <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  303. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  304.      </ClCompile>
  305.      <Link>
  306.        <SubSystem>Console</SubSystem>
  307. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  308. index 6f93e1d..ac73fbd 100644
  309. --- a/build.vc19/nfsd/nfsd.vcxproj
  310. +++ b/build.vc19/nfsd/nfsd.vcxproj
  311. @@ -89,6 +89,7 @@
  312.        <Optimization>Disabled</Optimization>
  313.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  314.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  315. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  316.      </ClCompile>
  317.      <Link>
  318.        <SubSystem>Console</SubSystem>
  319. @@ -104,6 +105,7 @@
  320.        <Optimization>Disabled</Optimization>
  321.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  322.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  323. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  324.      </ClCompile>
  325.      <Link>
  326.        <SubSystem>Console</SubSystem>
  327. @@ -121,6 +123,7 @@
  328.        <IntrinsicFunctions>true</IntrinsicFunctions>
  329.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  330.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  331. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  332.      </ClCompile>
  333.      <Link>
  334.        <SubSystem>Console</SubSystem>
  335. @@ -140,6 +143,7 @@
  336.        <IntrinsicFunctions>true</IntrinsicFunctions>
  337.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  338.        <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  339. +      <LanguageStandard_C>stdc17</LanguageStandard_C>
  340.      </ClCompile>
  341.      <Link>
  342.        <SubSystem>Console</SubSystem>
  343. diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c
  344. index 31da803..0bb3299 100644
  345. --- a/daemon/nfs41_daemon.c
  346. +++ b/daemon/nfs41_daemon.c
  347. @@ -20,6 +20,10 @@
  348.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  349.   */
  350.  
  351. +#if ((__STDC_VERSION__-0) < 201710L)
  352. +#error Code requires ISO C17
  353. +#endif
  354. +
  355.  #include <Windows.h>
  356.  #include <process.h>
  357.  #include <tchar.h>
  358. diff --git a/daemon/nfs41_daemon.h b/daemon/nfs41_daemon.h
  359. index f89b281..9801379 100644
  360. --- a/daemon/nfs41_daemon.h
  361. +++ b/daemon/nfs41_daemon.h
  362. @@ -23,6 +23,10 @@
  363.  #ifndef __NFS41_DAEMON_H_
  364.  #define __NFS41_DAEMON_H_ 1
  365.  
  366. +#if ((__STDC_VERSION__-0) < 201710L)
  367. +#error Code requires ISO C17
  368. +#endif
  369. +
  370.  #include "nfs41_build_features.h"
  371.  #include "idmap.h"
  372.  
  373. diff --git a/dll/nfs41_np.c b/dll/nfs41_np.c
  374. index e194072..8fd75df 100644
  375. --- a/dll/nfs41_np.c
  376. +++ b/dll/nfs41_np.c
  377. @@ -19,6 +19,10 @@
  378.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  379.   */
  380.  
  381. +#if ((__STDC_VERSION__-0) < 201710L)
  382. +#error Code requires ISO C17
  383. +#endif
  384. +
  385.  #include <windows.h>
  386.  #include <npapi.h>
  387.  #include <devioctl.h>
  388. diff --git a/install/nfs_install.c b/install/nfs_install.c
  389. index 3637657..c5fa45c 100644
  390. --- a/install/nfs_install.c
  391. +++ b/install/nfs_install.c
  392. @@ -26,6 +26,10 @@
  393.   *
  394.   */
  395.  
  396. +#if ((__STDC_VERSION__-0) < 201710L)
  397. +#error Code requires ISO C17
  398. +#endif
  399. +
  400.  #include <tchar.h>
  401.  
  402.  #include "nfs41_driver.h"
  403. diff --git a/libtirpc/libtirpc/libtirpc.rc b/libtirpc/libtirpc/libtirpc.rc
  404. index 11c5d52..14ec524 100644
  405. --- a/libtirpc/libtirpc/libtirpc.rc
  406. +++ b/libtirpc/libtirpc/libtirpc.rc
  407. @@ -7,7 +7,7 @@
  408.  //
  409.  // Generated from the TEXTINCLUDE 2 resource.
  410.  //
  411. -#include "afxres.h"
  412. +//#include "afxres.h"
  413.  
  414.  /////////////////////////////////////////////////////////////////////////////
  415.  #undef APSTUDIO_READONLY_SYMBOLS
  416. diff --git a/libtirpc/src/gettimeofday.c b/libtirpc/src/gettimeofday.c
  417. index 5ccdfd4..4c8bef3 100644
  418. --- a/libtirpc/src/gettimeofday.c
  419. +++ b/libtirpc/src/gettimeofday.c
  420. @@ -1,6 +1,6 @@
  421.  /* XXX NEED Copyright info */
  422.  #include <wintirpc.h>
  423. -#include < time.h >
  424. +#include <time.h>
  425.  
  426.  #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
  427.    #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
  428. diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h
  429. index 88027c6..39f0cbd 100644
  430. --- a/libtirpc/tirpc/wintirpc.h
  431. +++ b/libtirpc/tirpc/wintirpc.h
  432. @@ -23,6 +23,11 @@
  433.  #ifndef _TIRPC_WINTIRPC_H
  434.  #define _TIRPC_WINTIRPC_H
  435.  
  436. +#if ((__STDC_VERSION__-0) < 201710L)
  437. +#error Code requires ISO C17
  438. +#endif
  439. +
  440. +
  441.  /*
  442.   * Eliminate warnings about possibly unsafe uses of snprintf and friends
  443.   * XXX Think about cleaning these up and removing this later XXX
  444. diff --git a/mount/mount.c b/mount/mount.c
  445. index 093baa5..274fea7 100644
  446. --- a/mount/mount.c
  447. +++ b/mount/mount.c
  448. @@ -20,6 +20,9 @@
  449.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  450.   */
  451.  
  452. +#if ((__STDC_VERSION__-0) < 201710L)
  453. +#error Code requires ISO C17
  454. +#endif
  455.  
  456.  #include <crtdbg.h>
  457.  #include <Windows.h>
  458. diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c
  459. index be4a0d0..a831c37 100644
  460. --- a/sys/nfs41_driver.c
  461. +++ b/sys/nfs41_driver.c
  462. @@ -20,6 +20,14 @@
  463.   * Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  464.   */
  465.  
  466. +#ifndef _KERNEL_MODE
  467. +#error module requires kernel mode
  468. +#endif
  469. +
  470. +#if ((__STDC_VERSION__-0) < 201710L)
  471. +#error Code requires ISO C17
  472. +#endif
  473. +
  474.  #define MINIRDR__NAME "Value is ignored, only fact of definition"
  475.  #include <rx.h>
  476.  #include <windef.h>
  477. --
  478. 2.42.1
  479.  
  480. From 791e38ad40304e21eb992e4ec672906a32a0964a Mon Sep 17 00:00:00 2001
  481. From: Roland Mainz <roland.mainz@nrubsig.org>
  482. Date: Thu, 21 Dec 2023 19:00:17 +0100
  483. Subject: [PATCH 3/5] sys/nfs41_driver: Remove unneccesary debug output from
  484.  kernel module
  485.  
  486. Remove unneccesary debug output from kernel module
  487.  
  488. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  489. ---
  490. sys/nfs41_driver.c | 13 ++++---------
  491.  1 file changed, 4 insertions(+), 9 deletions(-)
  492.  
  493. diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c
  494. index a831c37..dd9f565 100644
  495. --- a/sys/nfs41_driver.c
  496. +++ b/sys/nfs41_driver.c
  497. @@ -5449,10 +5449,8 @@ NTSTATUS nfs41_QueryFileInformation(
  498.      DbgEn();
  499.      print_debug_filedirquery_header(RxContext);
  500.  #endif
  501. -    DbgP("--> nfs41_QueryFileInformation, RxContext->Info.LengthRemaining=%ld, "
  502. -        "RxContext->LowIoContext.ParamsFor.IoCtl.InputBufferLength=%ld\n",
  503. -        (long)RxContext->Info.LengthRemaining,
  504. -        (long)RxContext->LowIoContext.ParamsFor.IoCtl.InputBufferLength);
  505. +    DbgP("--> nfs41_QueryFileInformation, RxContext->Info.LengthRemaining=%ld\n",
  506. +        (long)RxContext->Info.LengthRemaining);
  507.  
  508.      status = check_nfs41_dirquery_args(RxContext);
  509.      if (status) {
  510. @@ -5462,11 +5460,8 @@ NTSTATUS nfs41_QueryFileInformation(
  511.  
  512.      RtlZeroMemory(RxContext->Info.Buffer, RxContext->Info.LengthRemaining);
  513.  
  514. -    DbgP("nfs41_QueryFileInformation, RxContext->Info.LengthRemaining=%ld, "
  515. -        "RxContext->LowIoContext.ParamsFor.IoCtl.{InputBufferLength=%ld,OutputBufferLength=%ld}\n",
  516. -        (long)RxContext->Info.LengthRemaining,
  517. -        (long)RxContext->LowIoContext.ParamsFor.IoCtl.InputBufferLength,
  518. -        (long)RxContext->LowIoContext.ParamsFor.IoCtl.OutputBufferLength);
  519. +    DbgP("nfs41_QueryFileInformation, RxContext->Info.LengthRemaining=%ld\n",
  520. +        (long)RxContext->Info.LengthRemaining);
  521.  
  522.      switch (InfoClass) {
  523.      case FileEaInformation:
  524. --
  525. 2.42.1
  526.  
  527. From ec8a40c578e34ac47f13ccada3fa4cf1702da68f Mon Sep 17 00:00:00 2001
  528. From: Roland Mainz <roland.mainz@nrubsig.org>
  529. Date: Thu, 21 Dec 2023 19:41:32 +0100
  530. Subject: [PATCH 4/5] sys/nfs41_debug: Fix pointer to int conversion for
  531.  |PsGetCurrentProcessId()|
  532.  
  533. Fix pointer to int conversion for |PsGetCurrentProcessId()|, it returns
  534. a |HANDLE|/(void *), but is used as |int| (printf %x) for debug output.
  535. The fix is to just use the pointer difference between ptr and 0.
  536.  
  537. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  538. ---
  539. sys/nfs41_debug.c |  4 ++--
  540.  sys/nfs41_debug.h | 10 +++++++---
  541.  2 files changed, 9 insertions(+), 5 deletions(-)
  542.  
  543. diff --git a/sys/nfs41_debug.c b/sys/nfs41_debug.c
  544. index d52d580..ade08d3 100644
  545. --- a/sys/nfs41_debug.c
  546. +++ b/sys/nfs41_debug.c
  547. @@ -55,7 +55,7 @@ ULONG __cdecl DbgP(IN PCCH fmt, ...)
  548.              time_fields.Milliseconds, msg);
  549.  #else
  550.          DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL,
  551. -            "[%04x] %s", PsGetCurrentProcessId(), msg);
  552. +            "[%04x] %s", PsGetCurrentProcessShortDebugId(), msg);
  553.  #endif
  554.      }
  555.      va_end(args);
  556. @@ -87,7 +87,7 @@ ULONG __cdecl print_error(IN PCCH fmt, ...)
  557.              time_fields.Milliseconds, msg);
  558.  #else
  559.          DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL,
  560. -            "[%04x] %s", PsGetCurrentProcessId(), msg);
  561. +            "[%04x] %s", PsGetCurrentProcessShortDebugId(), msg);
  562.  #endif
  563.      }
  564.      va_end(args);
  565. diff --git a/sys/nfs41_debug.h b/sys/nfs41_debug.h
  566. index d469e1f..917ec11 100644
  567. --- a/sys/nfs41_debug.h
  568. +++ b/sys/nfs41_debug.h
  569. @@ -56,19 +56,23 @@ void print_wait_status(int on, const char *str, NTSTATUS status,
  570.                         const char *opcode, PVOID entry, LONGLONG xid);
  571.  void print_acl_args(SECURITY_INFORMATION info);
  572.  
  573. +#define PTR2PTRDIFF_T(p) (((char *)(p))-((char *)0))
  574. +#define PsGetCurrentProcessShortDebugId() ((int)PTR2PTRDIFF_T(PsGetCurrentProcessId()))
  575. +
  576. +
  577.  #define DbgEn() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
  578. -        "--> [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \
  579. +        "--> [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessShortDebugId(), \
  580.          __FUNCTION__); try {
  581.          
  582.  #define DbgEx() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
  583. -        "<-- [%s] [%04x] %s status = %08lx\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \
  584. +        "<-- [%s] [%04x] %s status = %08lx\n", _DRIVER_NAME_, PsGetCurrentProcessShortDebugId(), \
  585.          __FUNCTION__, status); \
  586.          } except (EXCEPTION_EXECUTE_HANDLER) { \
  587.              status = GetExceptionCode() ; \
  588.              DbgP("Exception encountered with value = Ox%x\n", status); \
  589.          }
  590.  #define DbgR() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
  591. -        "<-- [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessId(), __FUNCTION__); \
  592. +        "<-- [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessShortDebugId(), __FUNCTION__); \
  593.          } except (EXCEPTION_EXECUTE_HANDLER) { \
  594.              NTSTATUS status; \
  595.              status = GetExceptionCode() ; \
  596. --
  597. 2.42.1
  598.  
  599. From 15aabc04b2ad349df1ff0645f55c008b87f2ef50 Mon Sep 17 00:00:00 2001
  600. From: Roland Mainz <roland.mainz@nrubsig.org>
  601. Date: Fri, 22 Dec 2023 13:13:16 +0100
  602. Subject: [PATCH 5/5] mount: Fix "mount\mount.c(471): warning C6001: Using
  603.  uninitialized memory 'dwLength'."
  604.  
  605. Fix code analysis warning "mount\mount.c(471): warning C6001: Using
  606. uninitialized memory 'dwLength'."
  607.  
  608. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  609. ---
  610. mount/mount.c | 1 +
  611.  1 file changed, 1 insertion(+)
  612.  
  613. diff --git a/mount/mount.c b/mount/mount.c
  614. index 274fea7..40eeb60 100644
  615. --- a/mount/mount.c
  616. +++ b/mount/mount.c
  617. @@ -468,6 +468,7 @@ static DWORD DoMount(
  618.          goto out;
  619.  
  620.      /* fail if the connection already exists */
  621. +    dwLength = NFS41_SYS_MAX_PATH_LEN;
  622.      result = WNetGetConnection(pLocalName, (LPTSTR)szExisting, &dwLength);
  623.      if (result == NO_ERROR)
  624.      {
  625. --
  626. 2.42.1

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at