PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
Kai Tietz 2012-10-27 12:09:38 +00:00
parent 0222a24fe3
commit f71f133bda
7 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -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

2
winsup/cygwin/dcrt0.cc
View File

@ -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;
}

2
winsup/cygwin/environ.cc
View File

@ -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;

4
winsup/cygwin/sec_acl.cc
View File

@ -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);

4
winsup/cygwin/sec_auth.cc
View File

@ -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);

6
winsup/cygwin/string.h
View File

@ -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;

2
winsup/cygwin/uinfo.cc
View File

@ -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;