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

* dcrt0.cc (codepage_type): Remove definition.

Browse Source 
* strfuncs.cc: Move it here.  New file with bits of miscfuncs.cc.
* miscfuncs.cc: Remove wide character stuff.
This commit is contained in:
Christopher Faylor 2007-08-02 14:21:53 +00:00
parent dcd1ef4516
commit 7e4f1942e4
4 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2007-08-02 Christopher Faylor <me+cygwin@cgf.cx>
* dcrt0.cc (codepage_type): Remove definition.
* strfuncs.cc: Move it here. New file with bits of miscfuncs.cc.
* miscfuncs.cc: Remove wide character stuff.
2007-08-02 Corinna Vinschen <corinna@vinschen.de> 2007-08-02 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (rename): Move and add text to comment about testing * syscalls.cc (rename): Move and add text to comment about testing

1
winsup/cygwin/dcrt0.cc
View File

@ -55,7 +55,6 @@ bool display_title;
bool strip_title_path; bool strip_title_path;
bool allow_glob = true; bool allow_glob = true;
bool NO_COPY in_forkee; bool NO_COPY in_forkee;
codepage_type current_codepage = ansi_cp;
int __argc_safe; int __argc_safe;
int _declspec(dllexport) __argc; int _declspec(dllexport) __argc;

32
winsup/cygwin/miscfuncs.cc
View File

@ -15,8 +15,6 @@ details. */
#include <sys/uio.h> #include <sys/uio.h>
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <winbase.h>
#include <winnls.h>
#include "cygthread.h" #include "cygthread.h"
#include "cygtls.h" #include "cygtls.h"
@ -163,6 +161,7 @@ dummytest (volatile char *p)
{ {
return *p; return *p;
} }
ssize_t ssize_t
check_iovec (const struct iovec *iov, int iovcnt, bool forwrite) check_iovec (const struct iovec *iov, int iovcnt, bool forwrite)
{ {
@ -203,35 +202,6 @@ check_iovec (const struct iovec *iov, int iovcnt, bool forwrite)
return (ssize_t) tot; return (ssize_t) tot;
} }
UINT
get_cp ()
{
return current_codepage == ansi_cp ? GetACP() : GetOEMCP();
}
/* tlen is always treated as the maximum buffer size, including the '\0'
character. sys_wcstombs will always return a 0-terminated result, no
matter what. */
int __stdcall
sys_wcstombs (char *tgt, int tlen, const WCHAR *src, int slen)
{
int ret;
ret = WideCharToMultiByte (get_cp (), 0, src, slen, tgt, tlen, NULL, NULL);
if (ret)
tgt[ret < tlen ? ret : tlen - 1] = '\0';
return ret;
}
int __stdcall
sys_mbstowcs (WCHAR *tgt, const char *src, int len)
{
int res = MultiByteToWideChar (get_cp (), 0, src, -1, tgt, len);
if (!res)
debug_printf ("MultiByteToWideChar %E");
return res;
}
extern "C" int extern "C" int
low_priority_sleep (DWORD secs) low_priority_sleep (DWORD secs)
{ {

43
winsup/cygwin/strfuncs.cc Normal file
View File

@ -0,0 +1,43 @@
/* strfuncs.cc: misc funcs that don't belong anywhere else
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Red Hat, Inc.
This file is part of Cygwin.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
#include <winbase.h>
#include <winnls.h>
codepage_type current_codepage = ansi_cp;
UINT
get_cp ()
{
return current_codepage == ansi_cp ? GetACP() : GetOEMCP();
}
/* tlen is always treated as the maximum buffer size, including the '\0'
character. sys_wcstombs will always return a 0-terminated result, no
matter what. */
int __stdcall
sys_wcstombs (char *tgt, int tlen, const WCHAR *src, int slen)
{
int ret;
ret = WideCharToMultiByte (get_cp (), 0, src, slen, tgt, tlen, NULL, NULL);
if (ret)
tgt[ret < tlen ? ret : tlen - 1] = '\0';
return ret;
}
int __stdcall
sys_mbstowcs (WCHAR *tgt, const char *src, int len)
{
int res = MultiByteToWideChar (get_cp (), 0, src, -1, tgt, len);
return res;
}