uname(1) now behaves much more like its GNU coreutils counterpart.
This commit is contained in:
Jonas 'Sortie' Termansen
parent
87c8120b95
commit
ba07631aa2
179
utils/uname.cpp
179
utils/uname.cpp
|
|
@ -1,6 +1,6 @@
|
|||
/*******************************************************************************
|
||||
|
||||
COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011, 2012.
|
||||
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the Free
|
||||
|
|
@ -21,20 +21,185 @@
|
|||
*******************************************************************************/
|
||||
|
||||
#include <sys/kernelinfo.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <error.h>
|
||||
|
||||
const unsigned long PRINT_KERNELNAME = 1UL << 0UL;
|
||||
const unsigned long PRINT_NODENAME = 1UL << 1UL;
|
||||
const unsigned long PRINT_KERNELREL = 1UL << 2UL;
|
||||
const unsigned long PRINT_KERNELVER = 1UL << 3UL;
|
||||
const unsigned long PRINT_MACHINE = 1UL << 4UL;
|
||||
const unsigned long PRINT_PROCESSOR = 1UL << 5UL;
|
||||
const unsigned long PRINT_HARDWARE = 1UL << 6UL;
|
||||
const unsigned long PRINT_OPSYS = 1UL << 7UL;
|
||||
|
||||
const size_t INFOBUFSIZE = 256UL;
|
||||
char infobuf[INFOBUFSIZE];
|
||||
|
||||
const char* GetProcessorArchitecture()
|
||||
{
|
||||
#if defined(__x86_64__)
|
||||
return "x86_64";
|
||||
#elif defined(__i386__)
|
||||
return "i386";
|
||||
#else
|
||||
return "unknown";
|
||||
#endif
|
||||
}
|
||||
|
||||
const char* GetKernelName()
|
||||
{
|
||||
if ( kernelinfo("name", infobuf, INFOBUFSIZE) )
|
||||
return "unknown";
|
||||
return infobuf;
|
||||
}
|
||||
|
||||
const char* GetNodeName()
|
||||
{
|
||||
return "sortix";
|
||||
}
|
||||
|
||||
const char* GetKernelRelease()
|
||||
{
|
||||
if ( kernelinfo("version", infobuf, INFOBUFSIZE) )
|
||||
return "unknown";
|
||||
return infobuf;
|
||||
}
|
||||
|
||||
const char* GetKernelVersion()
|
||||
{
|
||||
if ( kernelinfo("builddate", infobuf, INFOBUFSIZE) )
|
||||
return "unknown";
|
||||
return infobuf;
|
||||
}
|
||||
|
||||
const char* GetMachine()
|
||||
{
|
||||
return GetProcessorArchitecture();
|
||||
}
|
||||
|
||||
const char* GetProcessor()
|
||||
{
|
||||
return GetProcessorArchitecture();
|
||||
}
|
||||
|
||||
const char* GetHardwarePlatform()
|
||||
{
|
||||
return GetProcessorArchitecture();
|
||||
}
|
||||
|
||||
const char* GetOperatingSystem()
|
||||
{
|
||||
return GetKernelName();
|
||||
}
|
||||
|
||||
bool has_printed = false;
|
||||
|
||||
void DoPrint(const char* msg)
|
||||
{
|
||||
if ( has_printed )
|
||||
printf(" ");
|
||||
printf("%s", msg);
|
||||
has_printed = true;
|
||||
}
|
||||
|
||||
void Usage(FILE* fp, const char* argv0)
|
||||
{
|
||||
fprintf(fp, "Usage: %s [OPTION]...\n");
|
||||
fprintf(fp, "Print certain system information.\n");
|
||||
}
|
||||
|
||||
void Help(FILE* fp, const char* argv0)
|
||||
{
|
||||
Usage(fp, argv0);
|
||||
}
|
||||
|
||||
void Version(FILE* fp, const char* argv0)
|
||||
{
|
||||
Usage(fp, argv0);
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
size_t VERSIONSIZE = 256UL;
|
||||
char version[VERSIONSIZE];
|
||||
if ( kernelinfo("version", version, VERSIONSIZE) )
|
||||
const char* argv0 = argv[0];
|
||||
unsigned long flags = 0;
|
||||
for ( int i = 1; i < argc; i++ )
|
||||
{
|
||||
error(1, errno, "kernelinfo(\"version\")");
|
||||
const char* arg = argv[i];
|
||||
if ( arg[0] != '-' )
|
||||
{
|
||||
fprintf(stderr, "%s: extra operand: %s\n", argv0, arg);
|
||||
Usage(stderr, argv0);
|
||||
exit(1);
|
||||
}
|
||||
if ( arg[1] != '-' )
|
||||
for ( size_t i = 1; arg[i]; i++ )
|
||||
switch ( arg[i] )
|
||||
{
|
||||
case 'a': flags |= LONG_MAX; break;
|
||||
case 's': flags |= PRINT_KERNELNAME; break;
|
||||
case 'n': flags |= PRINT_NODENAME; break;
|
||||
case 'r': flags |= PRINT_KERNELREL; break;
|
||||
case 'v': flags |= PRINT_KERNELVER; break;
|
||||
case 'm': flags |= PRINT_MACHINE; break;
|
||||
case 'p': flags |= PRINT_PROCESSOR; break;
|
||||
case 'i': flags |= PRINT_HARDWARE; break;
|
||||
case 'o': flags |= PRINT_OPSYS; break;
|
||||
default:
|
||||
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, arg[i]);
|
||||
Usage(stderr, argv0);
|
||||
exit(1);
|
||||
}
|
||||
else if ( !strcmp(arg, "--kernel-name") )
|
||||
flags |= PRINT_KERNELNAME;
|
||||
else if ( !strcmp(arg, "--nodename") )
|
||||
flags |= PRINT_NODENAME;
|
||||
else if ( !strcmp(arg, "--kernel-release") )
|
||||
flags |= PRINT_KERNELREL;
|
||||
else if ( !strcmp(arg, "--kernel-version") )
|
||||
flags |= PRINT_KERNELVER;
|
||||
else if ( !strcmp(arg, "--machine") )
|
||||
flags |= PRINT_MACHINE;
|
||||
else if ( !strcmp(arg, "--processor") )
|
||||
flags |= PRINT_PROCESSOR;
|
||||
else if ( !strcmp(arg, "--hardware-platform") )
|
||||
flags |= PRINT_HARDWARE;
|
||||
else if ( !strcmp(arg, "--operating-system") )
|
||||
flags |= PRINT_OPSYS;
|
||||
else if ( !strcmp(arg, "--help") ) { Help(stdout, argv0); exit(0); }
|
||||
else if ( !strcmp(arg, "--usage") ) { Usage(stdout, argv0); exit(0); }
|
||||
else if ( !strcmp(arg, "--version") ) { Version(stdout, argv0); exit(0); }
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "%s: unknown option: %s\n", argv0, arg);
|
||||
Usage(stderr, argv0);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
printf("Sortix %zu bit (%s)\n", sizeof(size_t) * 8UL, version);
|
||||
|
||||
if ( !flags )
|
||||
flags = PRINT_KERNELNAME;
|
||||
if ( flags & PRINT_KERNELNAME )
|
||||
DoPrint(GetKernelName());
|
||||
if ( flags & PRINT_NODENAME )
|
||||
DoPrint(GetNodeName());
|
||||
if ( flags & PRINT_KERNELREL )
|
||||
DoPrint(GetKernelRelease());
|
||||
if ( flags & PRINT_KERNELVER )
|
||||
DoPrint(GetKernelVersion());
|
||||
if ( flags & PRINT_MACHINE )
|
||||
DoPrint(GetMachine());
|
||||
if ( flags & PRINT_PROCESSOR )
|
||||
DoPrint(GetProcessor());
|
||||
if ( flags & PRINT_HARDWARE )
|
||||
DoPrint(GetHardwarePlatform());
|
||||
if ( flags & PRINT_OPSYS )
|
||||
DoPrint(GetOperatingSystem());
|
||||
printf("\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue