893ac8e03c
everywhere. Leave some thread.cc stuff alone for now. * cygtls.h: Kludge some definitions to avoid including a problematic windows header. (_cygtls::_myfault): New entry. (_cygtls::_myfault_errno): Ditto. (_cygtls::fault_guarded): New function. (_cygtls::setup_fault): Ditto. (_cygtls::return_from_fault): Ditto. (_cygtls::clear_fault): Ditto. (myfault): New class. * exceptions.cc (handle_exceptions): Handle case of guarded fault in system routine. * gendef: Add another entry point for setjmp that the compiler doesn't know about and won't complain about. * gentls_offsets: Just include windows.h rather than kludging a HANDLE def. * miscfuncs.cc (check_null_str): Delete. (check_null_empty_str): Ditto. (check_null_empty_str_errno): Ditto. (check_null_str_errno): Ditto. (__check_null_invalid_struct): Ditto. (__check_null_invalid_struct_errno): Ditto. (__check_invalid_read_ptr): Ditto. (__check_invalid_read_ptr_errno): Ditto. (dummytest): New function. (check_iovec_for_read): Delete. (chec_iovec): Rename from check_iovec_for_write. Take a read/write parameter. * tlsoffsets.h: Regenerate. * winsup.h: Remove check_* declarations. (check_iovec_for_read): Delete declaration. Turn into a define instead. (check_iovec_for_write): Ditto. (check_iovec): New declaration. * thread.h: Use ifdef guard name consistent with other header files.
105 lines
2.7 KiB
C++
105 lines
2.7 KiB
C++
/* uname.cc
|
|
|
|
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
|
|
Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
|
|
Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com
|
|
|
|
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 <stdio.h>
|
|
#include <sys/utsname.h>
|
|
#include "cygwin_version.h"
|
|
#include "cygtls.h"
|
|
|
|
/* uname: POSIX 4.4.1.1 */
|
|
extern "C" int
|
|
uname (struct utsname *name)
|
|
{
|
|
SYSTEM_INFO sysinfo;
|
|
|
|
myfault efault;
|
|
if (efault.faulted (EFAULT))
|
|
return -1;
|
|
|
|
char *snp = strstr (cygwin_version.dll_build_date, "SNP");
|
|
|
|
memset (name, 0, sizeof (*name));
|
|
__small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
|
|
|
|
BOOL is_64bit_machine = FALSE;
|
|
if (IsWow64Process (hMainProc, &is_64bit_machine) && is_64bit_machine)
|
|
GetNativeSystemInfo (&sysinfo);
|
|
else
|
|
GetSystemInfo (&sysinfo);
|
|
|
|
/* Computer name */
|
|
cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1);
|
|
|
|
/* Cygwin dll release */
|
|
__small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)",
|
|
cygwin_version.dll_major / 1000,
|
|
cygwin_version.dll_major % 1000,
|
|
cygwin_version.dll_minor,
|
|
snp ? "s" : "",
|
|
cygwin_version.api_major,
|
|
cygwin_version.api_minor,
|
|
cygwin_version.shared_data,
|
|
cygwin_version.mount_registry);
|
|
|
|
/* Cygwin "version" aka build date */
|
|
strcpy (name->version, cygwin_version.dll_build_date);
|
|
if (snp)
|
|
name->version[snp - cygwin_version.dll_build_date] = '\0';
|
|
|
|
/* CPU type */
|
|
switch (sysinfo.wProcessorArchitecture)
|
|
{
|
|
case PROCESSOR_ARCHITECTURE_INTEL:
|
|
unsigned int ptype;
|
|
if (wincap.has_valid_processorlevel ())
|
|
{
|
|
if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */
|
|
ptype = 3;
|
|
else if (sysinfo.wProcessorLevel > 9) /* P4 */
|
|
ptype = 6;
|
|
else
|
|
ptype = sysinfo.wProcessorLevel;
|
|
}
|
|
else
|
|
{
|
|
if (sysinfo.dwProcessorType == PROCESSOR_INTEL_386 ||
|
|
sysinfo.dwProcessorType == PROCESSOR_INTEL_486)
|
|
ptype = sysinfo.dwProcessorType / 100;
|
|
else
|
|
ptype = PROCESSOR_INTEL_PENTIUM / 100;
|
|
}
|
|
__small_sprintf (name->machine, "i%d86", ptype);
|
|
break;
|
|
case PROCESSOR_ARCHITECTURE_IA64:
|
|
strcpy (name->machine, "ia64");
|
|
break;
|
|
case PROCESSOR_ARCHITECTURE_AMD64:
|
|
strcpy (name->machine, "x86_64");
|
|
break;
|
|
case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
|
|
strcpy (name->machine, "ia32-win64");
|
|
break;
|
|
case PROCESSOR_ARCHITECTURE_ALPHA:
|
|
strcpy (name->machine, "alpha");
|
|
break;
|
|
case PROCESSOR_ARCHITECTURE_MIPS:
|
|
strcpy (name->machine, "mips");
|
|
break;
|
|
default:
|
|
strcpy (name->machine, "unknown");
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|