nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove uname -i and -o options. 

These are unportable GNU extensions that's not needed for Sortix.
This commit is contained in:
Jonas 'Sortie' Termansen 2016-04-30 13:46:29 +02:00
parent e4a3bb997b
commit 264805a4aa
3 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/include/sys/utsname.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014 Jonas 'Sortie' Termansen. * Copyright (c) 2014, 2015, 2016 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -37,8 +37,6 @@ struct utsname
char tagline[_UTSNAME_LENGTH]; char tagline[_UTSNAME_LENGTH];
char machine[_UTSNAME_LENGTH]; char machine[_UTSNAME_LENGTH];
char processor[_UTSNAME_LENGTH]; char processor[_UTSNAME_LENGTH];
char hwplatform[_UTSNAME_LENGTH];
char opsysname[_UTSNAME_LENGTH];
}; };
int uname(struct utsname*); int uname(struct utsname*);

6
libc/sys/utsname/uname.c
View File

@ -27,7 +27,6 @@
#if defined(__x86_64__) #if defined(__x86_64__)
static const char* machine = "x86_64"; static const char* machine = "x86_64";
static const char* processor = "x86_64"; static const char* processor = "x86_64";
static const char* hwplatform = "x86_64";
#elif defined(__i386__) #elif defined(__i386__)
#if defined(__i686__) #if defined(__i686__)
static const char* machine = "i686"; static const char* machine = "i686";
@ -39,13 +38,10 @@ static const char* machine = "i486";
static const char* machine = "i386"; static const char* machine = "i386";
#endif #endif
static const char* processor = "i386"; static const char* processor = "i386";
static const char* hwplatform = "i386";
#else #else
static const char* machine = "unknown"; static const char* machine = "unknown";
static const char* processor = "unknown"; static const char* processor = "unknown";
static const char* hwplatform = "unknown";
#endif #endif
static const char* opsysname = BRAND_OPERATING_SYSTEM_NAME;
int uname(struct utsname* name) int uname(struct utsname* name)
{ {
@ -61,7 +57,5 @@ int uname(struct utsname* name)
strlcpy(name->version, "unknown", sizeof(name->version)); strlcpy(name->version, "unknown", sizeof(name->version));
strlcpy(name->machine, machine, sizeof(name->machine)); strlcpy(name->machine, machine, sizeof(name->machine));
strlcpy(name->processor, processor, sizeof(name->processor)); strlcpy(name->processor, processor, sizeof(name->processor));
strlcpy(name->hwplatform, hwplatform, sizeof(name->hwplatform));
strlcpy(name->opsysname, opsysname, sizeof(name->opsysname));
return 0; return 0;
} }

55
utils/uname.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2012, 2014 Jonas 'Sortie' Termansen. * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -35,17 +35,11 @@ static const int PRINT_KERNELVER = 1 << 3;
static const int PRINT_TAGLINE = 1 << 4; static const int PRINT_TAGLINE = 1 << 4;
static const int PRINT_MACHINE = 1 << 5; static const int PRINT_MACHINE = 1 << 5;
static const int PRINT_PROCESSOR = 1 << 6; static const int PRINT_PROCESSOR = 1 << 6;
static const int PRINT_HWPLATFORM = 1 << 7;
static const int PRINT_OPSYS = 1 << 8;
bool has_printed = false; const char* print(const char* prefix, const char* msg)
void DoPrint(const char* msg)
{ {
if ( has_printed ) printf("%s%s", prefix, msg);
printf(" "); return " ";
printf("%s", msg);
has_printed = true;
} }
static void compact_arguments(int* argc, char*** argv) static void compact_arguments(int* argc, char*** argv)
@ -90,15 +84,13 @@ int main(int argc, char* argv[])
while ( (c = *++arg) ) switch ( c ) while ( (c = *++arg) ) switch ( c )
{ {
case 'a': flags |= INT_MAX; break; case 'a': flags |= INT_MAX; break;
case 's': flags |= PRINT_KERNELNAME; break; case 'm': flags |= PRINT_MACHINE; break;
case 'n': flags |= PRINT_NODENAME; break; case 'n': flags |= PRINT_NODENAME; break;
case 'p': flags |= PRINT_PROCESSOR; break;
case 'r': flags |= PRINT_KERNELREL; break; case 'r': flags |= PRINT_KERNELREL; break;
case 's': flags |= PRINT_KERNELNAME; break;
case 't': flags |= PRINT_TAGLINE; break; case 't': flags |= PRINT_TAGLINE; break;
case 'v': flags |= PRINT_KERNELVER; break; case 'v': flags |= PRINT_KERNELVER; break;
case 'm': flags |= PRINT_MACHINE; break;
case 'p': flags |= PRINT_PROCESSOR; break;
case 'i': flags |= PRINT_HWPLATFORM; break;
case 'o': flags |= PRINT_OPSYS; break;
default: default:
fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c); fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
help(stderr, argv0); help(stderr, argv0);
@ -107,22 +99,18 @@ int main(int argc, char* argv[])
} }
else if ( !strcmp(arg, "--kernel-name") ) else if ( !strcmp(arg, "--kernel-name") )
flags |= PRINT_KERNELNAME; flags |= PRINT_KERNELNAME;
else if ( !strcmp(arg, "--nodename") )
flags |= PRINT_NODENAME;
else if ( !strcmp(arg, "--kernel-release") ) else if ( !strcmp(arg, "--kernel-release") )
flags |= PRINT_KERNELREL; flags |= PRINT_KERNELREL;
else if ( !strcmp(arg, "--kernel-version") ) else if ( !strcmp(arg, "--kernel-version") )
flags |= PRINT_KERNELVER; flags |= PRINT_KERNELVER;
else if ( !strcmp(arg, "--tagline") )
flags |= PRINT_TAGLINE;
else if ( !strcmp(arg, "--machine") ) else if ( !strcmp(arg, "--machine") )
flags |= PRINT_MACHINE; flags |= PRINT_MACHINE;
else if ( !strcmp(arg, "--nodename") )
flags |= PRINT_NODENAME;
else if ( !strcmp(arg, "--processor") ) else if ( !strcmp(arg, "--processor") )
flags |= PRINT_PROCESSOR; flags |= PRINT_PROCESSOR;
else if ( !strcmp(arg, "--hardware-platform") ) else if ( !strcmp(arg, "--tagline") )
flags |= PRINT_HWPLATFORM; flags |= PRINT_TAGLINE;
else if ( !strcmp(arg, "--operating-system") )
flags |= PRINT_OPSYS;
else if ( !strcmp(arg, "--help") ) else if ( !strcmp(arg, "--help") )
help(stdout, argv0), exit(0); help(stdout, argv0), exit(0);
else if ( !strcmp(arg, "--version") ) else if ( !strcmp(arg, "--version") )
@ -146,24 +134,23 @@ int main(int argc, char* argv[])
if ( !flags ) if ( !flags )
flags = PRINT_KERNELNAME; flags = PRINT_KERNELNAME;
const char* prefix = "";
if ( flags & PRINT_KERNELNAME ) if ( flags & PRINT_KERNELNAME )
DoPrint(utsname.sysname); prefix = print(prefix, utsname.sysname);
if ( flags & PRINT_NODENAME ) if ( flags & PRINT_NODENAME )
DoPrint(utsname.nodename); prefix = print(prefix, utsname.nodename);
if ( flags & PRINT_KERNELREL ) if ( flags & PRINT_KERNELREL )
DoPrint(utsname.release); prefix = print(prefix, utsname.release);
if ( flags & PRINT_TAGLINE ) if ( flags & PRINT_TAGLINE )
DoPrint(utsname.tagline); prefix = print(prefix, utsname.tagline);
if ( flags & PRINT_KERNELVER ) if ( flags & PRINT_KERNELVER )
DoPrint(utsname.version); prefix = print(prefix, utsname.version);
if ( flags & PRINT_MACHINE ) if ( flags & PRINT_MACHINE )
DoPrint(utsname.machine); prefix = print(prefix, utsname.machine);
if ( flags & PRINT_PROCESSOR ) if ( flags & PRINT_PROCESSOR )
DoPrint(utsname.processor); prefix = print(prefix, utsname.processor);
if ( flags & PRINT_HWPLATFORM )
DoPrint(utsname.hwplatform);
if ( flags & PRINT_OPSYS )
DoPrint(utsname.opsysname);
printf("\n"); printf("\n");
return 0; return 0;
} }