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

Cygwin: uname: Raise size of utsname fields and revamp uname(2) output

Browse Source 
New format:

  sysname:      CYGWIN_NT-${osversion}-${os_build_number}[-WOW64]
  nodename:     `gethostname`
  release:      ${cygwin_version}-${API minor}.${arch}[.snap]
  version:      YYYY-MM-DD HH:MM UTC
  machine:      ${arch}
_GNU_SOURCE:
  domainname:   `getdomainname`
!_GNU_SOURCE:
  __domainname: `getdomainname`

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2019-01-24 12:01:01 +01:00
parent 6ffcc50f19
commit 84230b71c6
8 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
winsup/cygwin/uname.cc
View File

@ -10,15 +10,83 @@ details. */
#include "winsup.h"
#include <sys/utsname.h>
#include <netdb.h>
#include "cygwin_version.h"
#include "cygtls.h"
extern "C" int cygwin_gethostname (char *__name, size_t __len);
extern "C" int getdomainname (char *__name, size_t __len);
/* uname: POSIX 4.4.1.1 */
/* New entrypoint for applications since API 335 */
extern "C" int
uname (struct utsname *name)
uname_x (struct utsname *name)
{
__try
{
char buf[NI_MAXHOST + 1];
char *snp = strstr (cygwin_version.dll_build_date, "SNP");
memset (name, 0, sizeof (*name));
/* sysname */
__small_sprintf (name->sysname, "CYGWIN_%s-%u%s",
wincap.osname (), wincap.build_number (),
wincap.is_wow64 () ? "-WOW64" : "");
/* nodename */
memset (buf, 0, sizeof buf);
cygwin_gethostname (buf, sizeof buf - 1);
strncat (name->nodename, buf, sizeof (name->nodename) - 1);
/* release */
__small_sprintf (name->release, "%d.%d.%d-%d.",
cygwin_version.dll_major / 1000,
cygwin_version.dll_major % 1000,
cygwin_version.dll_minor,
cygwin_version.api_minor);
/* version */
stpcpy (name->version, cygwin_version.dll_build_date);
if (snp)
name->version[snp - cygwin_version.dll_build_date] = '\0';
strcat (name->version, " UTC");
/* machine */
switch (wincap.cpu_arch ())
{
case PROCESSOR_ARCHITECTURE_INTEL:
strcat (name->release, strcpy (name->machine, "i686"));
break;
case PROCESSOR_ARCHITECTURE_AMD64:
strcat (name->release, strcpy (name->machine, "x86_64"));
break;
default:
strcpy (name->machine, "unknown");
break;
}
if (snp)
strcat (name->release, ".snap");
/* domainame */
memset (buf, 0, sizeof buf);
getdomainname (buf, sizeof buf - 1);
strncat (name->domainname, buf, sizeof (name->domainname) - 1);
}
__except (EFAULT) { return -1; }
__endtry
return 0;
}
/* Old entrypoint for applications up to API 334 */
struct old_utsname
{
char sysname[20];
char nodename[20];
char release[20];
char version[20];
char machine[20];
};
extern "C" int
uname (struct utsname *in_name)
{
struct old_utsname *name = (struct old_utsname *) in_name;
__try
{
char *snp = strstr (cygwin_version.dll_build_date, "SNP");