* dcrt0.cc (quoted): Renamed strechr to strchrnul.

        * environ.cc (environ_init): Likewise.
        * sec_acl.cc (aclfromtext32): Likewise.
        * sec_auth.cc (extract_nt_dom_user): Likewise.
        * uinfo.cc (pwdgrp::next_str): Likewise.
        * string.h (strechr): Likewise.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b76166b7a72737e1dcd11d4ec76b0245d9875b69..133caeea748b5a402af42eff9b4aa9d972b7a60f 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-27  Kai Tietz  <ktietz@redhat.com>
+
+       * dcrt0.cc (quoted): Renamed strechr to strchrnul.
+       * environ.cc (environ_init): Likewise.
+       * sec_acl.cc (aclfromtext32): Likewise.
+       * sec_auth.cc (extract_nt_dom_user): Likewise.
+       * uinfo.cc (pwdgrp::next_str): Likewise.
+       * string.h (strechr): Likewise.
+
 2012-10-26  Kai Tietz  <ktietz@redhat.com>
 
        * string.h (strechr): Replace assembler by

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 0cda2e5d5ae30a2152abd5eb2dac65f361645123..1f5ffbf7bccf499aa44db64c0c00495da725cdee 100644 (file)
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -162,7 +162,7 @@ quoted (char *cmd, int winshell)
     {
       char *p;
       strcpy (cmd, cmd + 1);
-      if (*(p = strechr (cmd, quote)))
+      if (*(p = strchrnul (cmd, quote)))
        strcpy (p, p + 1);
       return p;
     }

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index ae3944a6c8e90f1407f8e1909cdc6ab07c8d46ad..4b33b743afc8d0220736e3a31525a5f201ee42ce 100644 (file)
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -829,7 +829,7 @@ environ_init (char **envp, int envc)
       envp[i] = newp;
       if (*newp == '=')
        *newp = '!';
-      char *eq = strechr (newp, '=');
+      char *eq = strchrnul (newp, '=');
       ucenv (newp, eq);        /* uppercase env vars which need it */
       if (*newp == 'T' && strncmp (newp, "TERM=", 5) == 0)
        sawTERM = 1;

diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
index 14cb886674dece2e5e69d505b2560a9156f330b1..8ce43fe282aaec3995843c31877ffe3b5fd67ca0 100644 (file)
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -861,7 +861,7 @@ aclfromtext32 (char *acltextp, int *)
                      return NULL;
                    }
                  lacl[pos].a_id = pw->pw_uid;
-                 c = strechr (c, ':');
+                 c = strchrnul (c, ':');
                }
              else if (isdigit (*c))
                lacl[pos].a_id = strtol (c, &c, 10);
@@ -889,7 +889,7 @@ aclfromtext32 (char *acltextp, int *)
                      return NULL;
                    }
                  lacl[pos].a_id = gr->gr_gid;
-                 c = strechr (c, ':');
+                 c = strchrnul (c, ':');
                }
              else if (isdigit (*c))
                lacl[pos].a_id = strtol (c, &c, 10);

diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc
index 26f276b8485961ba88ee13976a18230c7fa794ee..15bdf7b7bb9ee7308305646e4059d4222680dc65 100644 (file)
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec_auth.cc
@@ -120,8 +120,8 @@ extract_nt_dom_user (const struct passwd *pw, PWCHAR domain, PWCHAR user)
   if ((d = strstr (pw->pw_gecos, "U-")) != NULL &&
       (d == pw->pw_gecos || d[-1] == ','))
     {
-      c = strechr (d + 2, ',');
-      if ((u = strechr (d + 2, '\\')) >= c)
+      c = strchrnul (d + 2, ',');
+      if ((u = strchrnul (d + 2, '\\')) >= c)
        u = d + 1;
       else if (u - d <= MAX_DOMAIN_NAME_LEN + 2)
        sys_mbstowcs (domain, MAX_DOMAIN_NAME_LEN + 1, d + 2, u - d - 1);

diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h
index 70f6f4e4586ae394e62b47c357331a023eff6c18..bb0375ccbd72a02a320e0fbc3c0441df3d67bcdc 100644 (file)
--- a/winsup/cygwin/string.h
+++ b/winsup/cygwin/string.h
@@ -17,10 +17,10 @@ details. */
 extern "C" {
 #endif
 
-#undef strechr
-#define strechr cygwin_strechr
+#undef strchrnul
+#define strchrnul cygwin_strchrnul
 static inline __stdcall char *
-strechr (const char *s, int c)
+strchrnul (const char *s, int c)
 {
   while (*s != (char) c && *s != 0)
     ++s;

diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index a26ccb88e84274ed6fffc305471f2f0aefaac789..a83d1080d1ae4e1a2c89d1e32609ac8f873d5e10 100644 (file)
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -489,7 +489,7 @@ char *
 pwdgrp::next_str (char c)
 {
   char *res = lptr;
-  lptr = strechr (lptr, c);
+  lptr = strchrnul (lptr, c);
   if (*lptr)
     *lptr++ = '\0';
   return res;