JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* exec.cc (strccpy): Move function from here...

Browse Source 
* strfuncs.cc (strccpy): ...to here.
	* string.h (strccpy): Declare.
	* winsup.h (strccpy): Drop declaration.
This commit is contained in:
Corinna Vinschen 2011-01-19 09:41:54 +00:00
parent 808aae3d13
commit 17133a85de
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2011-01-19 Corinna Vinschen <corinna@vinschen.de>
* exec.cc (strccpy): Move function from here...
* strfuncs.cc (strccpy): ...to here.
* string.h (strccpy): Declare.
* winsup.h (strccpy): Drop declaration.
2011-01-19 Corinna Vinschen <corinna@vinschen.de> 2011-01-19 Corinna Vinschen <corinna@vinschen.de>
* errno.cc (errmap): Add error codes for invalid binaries. * errno.cc (errmap): Add error codes for invalid binaries.

15
winsup/cygwin/exec.cc
View File

@ -68,21 +68,6 @@ sexecve_is_bad ()
return 0; return 0;
} }
/* Copy string, until c or <nul> is encountered.
NUL-terminate the destination string (s1).
Return pointer to terminating byte in dst string. */
char * __stdcall
strccpy (char *s1, const char **s2, char c)
{
while (**s2 && **s2 != c)
*s1++ = *((*s2)++);
*s1 = 0;
MALLOC_CHECK;
return s1;
}
extern "C" int extern "C" int
execvp (const char *path, char * const *argv) execvp (const char *path, char * const *argv)
{ {

16
winsup/cygwin/strfuncs.cc
View File

@ -1,7 +1,7 @@
/* strfuncs.cc: misc funcs that don't belong anywhere else /* strfuncs.cc: misc funcs that don't belong anywhere else
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. 2005, 2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -663,6 +663,20 @@ sys_mbstowcs_alloc (wchar_t **dst_p, int type, const char *src, size_t nms)
return ret; return ret;
} }
/* Copy string, until c or <nul> is encountered.
NUL-terminate the destination string (s1).
Return pointer to terminating byte in dst string. */
char * __stdcall
strccpy (char *s1, const char **s2, char c)
{
while (**s2 && **s2 != c)
*s1++ = *((*s2)++);
*s1 = 0;
MALLOC_CHECK;
return s1;
}
static WCHAR hex_wchars[] = L"0123456789abcdef"; static WCHAR hex_wchars[] = L"0123456789abcdef";
NTSTATUS NTAPI NTSTATUS NTAPI

4
winsup/cygwin/string.h
View File

@ -1,6 +1,6 @@
/* string.h: Extra string defs /* string.h: Extra string defs
Copyright 2001, 2007, 2008 Red Hat, Inc. Copyright 2001, 2007, 2008, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -119,6 +119,8 @@ char * __stdcall cygwin_strupr (char *);
#endif /* __INSIDE_CYGWIN__ */ #endif /* __INSIDE_CYGWIN__ */
char *__stdcall strccpy (char *s1, const char **s2, char c);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
winsup/cygwin/winsup.h
View File

@ -211,9 +211,6 @@ __ino64_t __stdcall hash_path_name (__ino64_t hash, PCWSTR name) __attribute__ (
__ino64_t __stdcall hash_path_name (__ino64_t hash, const char *name) __attribute__ ((regparm(2))); __ino64_t __stdcall hash_path_name (__ino64_t hash, const char *name) __attribute__ ((regparm(2)));
void __stdcall nofinalslash (const char *src, char *dst) __attribute__ ((regparm(2))); void __stdcall nofinalslash (const char *src, char *dst) __attribute__ ((regparm(2)));
/* String manipulation */
extern "C" char *__stdcall strccpy (char *s1, const char **s2, char c);
void *hook_or_detect_cygwin (const char *, const void *, WORD&) __attribute__ ((regparm (3))); void *hook_or_detect_cygwin (const char *, const void *, WORD&) __attribute__ ((regparm (3)));
/* Time related */ /* Time related */