Add standard wrapper macro for strchrnul()

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index cac4ee3c9a435c03e20c9c38b8d57b3e11de6ab0..598569d00462512eeb9f13022073a3a708b974e0 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -117,7 +117,7 @@ functions that are called quite often; for other calls to external libraries
 #define Urename(s,t)       rename(CCS(s),CCS(t))
 #define Ustat(s,t)         stat(CCS(s),t)
 #define Ustrchr(s,n)       US strchr(CCS(s),n)
 #define Urename(s,t)       rename(CCS(s),CCS(t))
 #define Ustat(s,t)         stat(CCS(s),t)
 #define Ustrchr(s,n)       US strchr(CCS(s),n)

-#define CUstrchr(s,n)      CUS strchr(CCS(s),n)
+#define Ustrchrnul(s,n)    US strchrnul(CCS(s),n)

 #define CUstrerror(n)      CUS strerror(n)
 #define Ustrcmp(s,t)       strcmp(CCS(s),CCS(t))
 #define Ustrcpy_nt(s,t)    strcpy(CS s, CCS t)         /* no taint check */
 #define CUstrerror(n)      CUS strerror(n)
 #define Ustrcmp(s,t)       strcmp(CCS(s),CCS(t))
 #define Ustrcpy_nt(s,t)    strcpy(CS s, CCS t)         /* no taint check */

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index b2caa81abcf8025e47bda0efdae8e3ec78ff8a36..13820dc331fa75a549ce2a1118c71d8b44c0169d 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -665,7 +665,7 @@ memset(pub, 0, sizeof(pdkim_pubkey));
 for (const uschar * ele = raw_record, * tspec, * end, * val; *ele; ele = end)
   {
   Uskip_whitespace(&ele);
 for (const uschar * ele = raw_record, * tspec, * end, * val; *ele; ele = end)
   {
   Uskip_whitespace(&ele);

-  end = US strchrnul(CS ele, ';');
+  end = Ustrchrnul(ele, ';');

   tspec = string_copyn(ele, end - ele);
   if (*end) end++;                     /* skip the ; */
 
   tspec = string_copyn(ele, end - ele);
   if (*end) end++;                     /* skip the ; */