drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* autoload.cc (wsock_init): Reorganize slightly to accomodate a new compiler.

This commit is contained in:
Christopher Faylor 2001-10-13 01:35:15 +00:00
parent cb1826572c
commit bc6ed54986
12 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2001-10-12 Christopher Faylor <cgf@redhat.com>
* autoload.cc (wsock_init): Reorganize slightly to accomodate a new
compiler.
2001-10-11 Egor Duda <deo@logos-m.ru> 2001-10-11 Egor Duda <deo@logos-m.ru>
* net.cc (cygwin_sendto): Use correct socket address when sending * net.cc (cygwin_sendto): Use correct socket address when sending

2
winsup/cygwin/autoload.cc
View File

@ -244,7 +244,6 @@ wsock_init ()
extern WSADATA wsadata; extern WSADATA wsadata;
struct func_info *func = (struct func_info *) __builtin_return_address (0); struct func_info *func = (struct func_info *) __builtin_return_address (0);
struct dll_info *dll = func->dll; struct dll_info *dll = func->dll;
retchain ret;
__asm__ (" \n\ __asm__ (" \n\
.section .ws2_32_info \n\ .section .ws2_32_info \n\
@ -293,6 +292,7 @@ wsock_init ()
movl $dll_chain1,4(%ebp) \n\ movl $dll_chain1,4(%ebp) \n\
"); ");
volatile retchain ret;
/* Set "arguments for dll_chain1. */ /* Set "arguments for dll_chain1. */
ret.low = (long) dll_func_load; ret.low = (long) dll_func_load;
ret.high = (long) func; ret.high = (long) func;

4
winsup/cygwin/exceptions.cc
View File

@ -49,11 +49,11 @@ static NO_COPY muto *mask_sync = NULL;
HMODULE NO_COPY cygwin_hmodule; HMODULE NO_COPY cygwin_hmodule;
static const struct NO_COPY static struct
{ {
unsigned int code; unsigned int code;
const char *name; const char *name;
} status_info[] NO_COPY = } status_info[] =
{ {
#define X(s) s, #s #define X(s) s, #s
{ X (STATUS_ABANDONED_WAIT_0) }, { X (STATUS_ABANDONED_WAIT_0) },

2
winsup/cygwin/fhandler_console.cc
View File

@ -1647,7 +1647,7 @@ fhandler_console::write (const void *vsrc, size_t len)
static struct { static struct {
int vk; int vk;
const char *val[4]; const char *val[4];
} const keytable[] NO_COPY = { } keytable[] NO_COPY = {
/* NORMAL */ /* SHIFT */ /* CTRL */ /* ALT */ /* NORMAL */ /* SHIFT */ /* CTRL */ /* ALT */
{VK_LEFT, {"\033[D", "\033[D", "\033[D", "\033\033[D"}}, {VK_LEFT, {"\033[D", "\033[D", "\033[D", "\033\033[D"}},
{VK_RIGHT, {"\033[C", "\033[C", "\033[C", "\033\033[C"}}, {VK_RIGHT, {"\033[C", "\033[C", "\033[C", "\033\033[C"}},

2
winsup/cygwin/fhandler_socket.cc
View File

@ -198,7 +198,7 @@ fhandler_socket::fixup_after_fork (HANDLE parent)
} }
if (new_sock != INVALID_SOCKET && ws2_32_handle) if (new_sock != INVALID_SOCKET && ws2_32_handle)
{ {
debug_printf ("WSASocket went fine"); debug_printf ("WSASocket went fine %p", new_sock);
set_io_handle ((HANDLE) new_sock); set_io_handle ((HANDLE) new_sock);
} }
else else

2
winsup/cygwin/grp.cc
View File

@ -198,7 +198,7 @@ read_etc_group ()
debug_printf ("Failed to get local admins group name. %E"); debug_printf ("Failed to get local admins group name. %E");
} }
snprintf (linebuf, sizeof (linebuf), "%s::%u:\n", group_name, DEFAULT_GID); snprintf (linebuf, sizeof (linebuf), "%s::%u:\n", group_name, (unsigned) DEFAULT_GID);
add_grp_line (linebuf); add_grp_line (linebuf);
group_state = emulated; group_state = emulated;
} }

2
winsup/cygwin/localtime.cc
View File

@ -501,7 +501,7 @@ struct tzhead {
static char wildabbr[] NO_COPY = WILDABBR; static char wildabbr[] NO_COPY = WILDABBR;
static const char gmt[] NO_COPY = "GMT"; static char gmt[] NO_COPY = "GMT";
struct ttinfo { /* time type information */ struct ttinfo { /* time type information */
long tt_gmtoff; /* UTC offset in seconds */ long tt_gmtoff; /* UTC offset in seconds */

2
winsup/cygwin/net.cc
View File

@ -356,7 +356,7 @@ __set_winsock_errno (const char *fn, int ln)
* Since the member `s' isn't used for debug output we can use it * Since the member `s' isn't used for debug output we can use it
* for the error text returned by herror and hstrerror. * for the error text returned by herror and hstrerror.
*/ */
const static NO_COPY struct tl host_errmap[] = static NO_COPY struct tl host_errmap[] =
{ {
{WSAHOST_NOT_FOUND, "Unknown host", HOST_NOT_FOUND}, {WSAHOST_NOT_FOUND, "Unknown host", HOST_NOT_FOUND},
{WSATRY_AGAIN, "Host name lookup failure", TRY_AGAIN}, {WSATRY_AGAIN, "Host name lookup failure", TRY_AGAIN},

2
winsup/cygwin/passwd.cc
View File

@ -170,7 +170,7 @@ read_etc_passwd ()
{ {
debug_printf ("Emulating /etc/passwd"); debug_printf ("Emulating /etc/passwd");
snprintf (linebuf, sizeof (linebuf), "%s::%u:%u::%s:/bin/sh", cygheap->user.name (), snprintf (linebuf, sizeof (linebuf), "%s::%u:%u::%s:/bin/sh", cygheap->user.name (),
DEFAULT_UID, DEFAULT_GID, getenv ("HOME") ?: "/"); (unsigned) DEFAULT_UID, (unsigned) DEFAULT_GID, getenv ("HOME") ?: "/");
add_pwd_line (linebuf); add_pwd_line (linebuf);
passwd_state = emulated; passwd_state = emulated;
} }

2
winsup/cygwin/strace.cc
View File

@ -229,7 +229,7 @@ strace_printf (unsigned category, const char *func, const char *fmt, ...)
} }
} }
static NO_COPY const struct tab static NO_COPY struct tab
{ {
int v; int v;
const char *n; const char *n;

6
winsup/cygwin/uinfo.cc
View File

@ -59,7 +59,7 @@ internal_getlogin (cygheap_user &user)
if (user.name () && user.domain ()) if (user.name () && user.domain ())
debug_printf ("User: %s, Domain: %s, Logon Server: %s", debug_printf ("User: %s, Domain: %s, Logon Server: %s",
user.name (), user.domain (), user.logsrv ()); user.name (), user.domain (), user.logsrv ());
else if (!(ret = NetWkstaUserGetInfo (NULL, 1, (LPBYTE *)&wui))) else if (!(ret = NetWkstaUserGetInfo (NULL, 1, (LPBYTE *) &wui)))
{ {
sys_wcstombs (buf, wui->wkui1_username, UNLEN + 1); sys_wcstombs (buf, wui->wkui1_username, UNLEN + 1);
user.set_name (buf); user.set_name (buf);
@ -78,17 +78,17 @@ internal_getlogin (cygheap_user &user)
} }
LPUSER_INFO_3 ui = NULL; LPUSER_INFO_3 ui = NULL;
WCHAR wuser[UNLEN + 1]; WCHAR wuser[UNLEN + 1];
WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
/* HOMEDRIVE and HOMEPATH are wrong most of the time, too, /* HOMEDRIVE and HOMEPATH are wrong most of the time, too,
after changing user context! */ after changing user context! */
sys_mbstowcs (wuser, user.name (), UNLEN + 1); sys_mbstowcs (wuser, user.name (), UNLEN + 1);
if (NetUserGetInfo (NULL, wuser, 3, (LPBYTE *) &ui) && user.logsrv ()) if (NetUserGetInfo (NULL, wuser, 3, (LPBYTE *) &ui) && user.logsrv ())
{ {
WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
strcat (strcpy (buf, "\\\\"), user.logsrv ()); strcat (strcpy (buf, "\\\\"), user.logsrv ());
sys_mbstowcs (wlogsrv, buf, INTERNET_MAX_HOST_NAME_LENGTH + 3); sys_mbstowcs (wlogsrv, buf, INTERNET_MAX_HOST_NAME_LENGTH + 3);
ui = NULL; ui = NULL;
if (NetUserGetInfo (wlogsrv, wuser, 3,(LPBYTE *) &ui)) if (NetUserGetInfo (wlogsrv, wuser, 3, (LPBYTE *) &ui))
ui = NULL; ui = NULL;
} }
if (ui) if (ui)

2
winsup/cygwin/window.cc
View File

@ -74,7 +74,7 @@ Winmain (VOID *)
{ {
MSG msg; MSG msg;
WNDCLASS wc; WNDCLASS wc;
static const NO_COPY char classname[] = "CygwinWndClass"; static NO_COPY char classname[] = "CygwinWndClass";
/* Register the window class for the main window. */ /* Register the window class for the main window. */