mirror of
https://github.com/sheumann/hush.git
synced 2024-10-11 10:23:41 +00:00
Combined size reduction changes by Glenn and myself. Added back in "unknown"
for -p to match normal uname behavior (at a cost of 30-40 bytes).
This commit is contained in:
parent
1dbbd2fe34
commit
6509f92a3b
@ -31,126 +31,78 @@
|
|||||||
|
|
||||||
/* Busyboxed by Erik Andersen */
|
/* Busyboxed by Erik Andersen */
|
||||||
|
|
||||||
|
/* Further size reductions by Glenn McGrath and Manuel Novoa III. */
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stddef.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
|
#include <getopt.h>
|
||||||
#if defined (HAVE_SYSINFO) && defined (HAVE_SYS_SYSTEMINFO_H)
|
|
||||||
# include <sys/systeminfo.h>
|
|
||||||
#endif
|
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
static void print_element(unsigned int mask, char *element);
|
typedef struct {
|
||||||
|
struct utsname name;
|
||||||
/* Values that are bitwise or'd into `toprint'. */
|
char processor[8]; /* for "unknown" */
|
||||||
/* Operating system name. */
|
} uname_info_t;
|
||||||
static const int PRINT_SYSNAME = 1;
|
|
||||||
|
|
||||||
/* Node name on a communications network. */
|
|
||||||
static const int PRINT_NODENAME = 2;
|
|
||||||
|
|
||||||
/* Operating system release. */
|
|
||||||
static const int PRINT_RELEASE = 4;
|
|
||||||
|
|
||||||
/* Operating system version. */
|
|
||||||
static const int PRINT_VERSION = 8;
|
|
||||||
|
|
||||||
/* Machine hardware name. */
|
|
||||||
static const int PRINT_MACHINE = 16;
|
|
||||||
|
|
||||||
/* Host processor type. */
|
|
||||||
static const int PRINT_PROCESSOR = 32;
|
|
||||||
|
|
||||||
/* Mask indicating which elements of the name to print. */
|
|
||||||
static unsigned char toprint;
|
|
||||||
|
|
||||||
|
static const char options[] = "snrvmpa";
|
||||||
|
static const char flags[] = "\x01\x02\x04\x08\x10\x20\x3f";
|
||||||
|
static const unsigned short int utsname_offset[] = {
|
||||||
|
offsetof(uname_info_t,name.sysname),
|
||||||
|
offsetof(uname_info_t,name.nodename),
|
||||||
|
offsetof(uname_info_t,name.release),
|
||||||
|
offsetof(uname_info_t,name.version),
|
||||||
|
offsetof(uname_info_t,name.machine),
|
||||||
|
offsetof(uname_info_t,processor)
|
||||||
|
};
|
||||||
|
|
||||||
int uname_main(int argc, char **argv)
|
int uname_main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
struct utsname name;
|
uname_info_t uname_info;
|
||||||
char processor[256];
|
|
||||||
|
|
||||||
#if defined(__sparc__) && defined(__linux__)
|
#if defined(__sparc__) && defined(__linux__)
|
||||||
char *fake_sparc = getenv("FAKE_SPARC");
|
char *fake_sparc = getenv("FAKE_SPARC");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
toprint = 0;
|
const unsigned short int *delta;
|
||||||
|
int opt;
|
||||||
|
char toprint = 0;
|
||||||
|
|
||||||
/* Parse any options */
|
while ((opt = getopt(argc, argv, options)) != -1) {
|
||||||
//fprintf(stderr, "argc=%d, argv=%s\n", argc, *argv);
|
const char *p = strchr(options,opt);
|
||||||
while (--argc > 0 && **(++argv) == '-') {
|
if (p == NULL) {
|
||||||
while (*(++(*argv))) {
|
show_usage();
|
||||||
switch (**argv) {
|
}
|
||||||
case 's':
|
toprint |= flags[(int)(p-options)];
|
||||||
toprint |= PRINT_SYSNAME;
|
}
|
||||||
break;
|
|
||||||
case 'n':
|
if (toprint == 0) {
|
||||||
toprint |= PRINT_NODENAME;
|
toprint = flags[0]; /* sysname */
|
||||||
break;
|
}
|
||||||
case 'r':
|
|
||||||
toprint |= PRINT_RELEASE;
|
if (uname(&uname_info.name) == -1) {
|
||||||
break;
|
error_msg_and_die("cannot get system name");
|
||||||
case 'v':
|
}
|
||||||
toprint |= PRINT_VERSION;
|
|
||||||
break;
|
#if defined(__sparc__) && defined(__linux__)
|
||||||
case 'm':
|
if ((fake_sparc != NULL)
|
||||||
toprint |= PRINT_MACHINE;
|
&& ((fake_sparc[0] == 'y')
|
||||||
break;
|
|| (fake_sparc[0] == 'Y'))) {
|
||||||
case 'p':
|
strcpy(uname_info.name.machine, "sparc");
|
||||||
toprint |= PRINT_PROCESSOR;
|
}
|
||||||
break;
|
#endif
|
||||||
case 'a':
|
|
||||||
toprint = (PRINT_SYSNAME | PRINT_NODENAME | PRINT_RELEASE |
|
strcpy(uname_info.processor, "unknown");
|
||||||
PRINT_PROCESSOR | PRINT_VERSION |
|
|
||||||
PRINT_MACHINE);
|
for (delta=utsname_offset ; toprint ; delta++, toprint >>= 1) {
|
||||||
break;
|
if (toprint & 1) {
|
||||||
default:
|
printf("%s ", ((char *)(&uname_info)) + *delta );
|
||||||
show_usage();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (toprint == 0)
|
putchar('\n');
|
||||||
toprint = PRINT_SYSNAME;
|
|
||||||
|
|
||||||
if (uname(&name) == -1)
|
|
||||||
perror_msg("cannot get system name");
|
|
||||||
|
|
||||||
#if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE)
|
|
||||||
if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1)
|
|
||||||
perror_msg("cannot get processor type");
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
strcpy(processor, "unknown");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__sparc__) && defined(__linux__)
|
|
||||||
if (fake_sparc != NULL
|
|
||||||
&& (fake_sparc[0] == 'y'
|
|
||||||
|| fake_sparc[0] == 'Y')) strcpy(name.machine, "sparc");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
print_element(PRINT_SYSNAME, name.sysname);
|
|
||||||
print_element(PRINT_NODENAME, name.nodename);
|
|
||||||
print_element(PRINT_RELEASE, name.release);
|
|
||||||
print_element(PRINT_VERSION, name.version);
|
|
||||||
print_element(PRINT_MACHINE, name.machine);
|
|
||||||
print_element(PRINT_PROCESSOR, processor);
|
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If the name element set in MASK is selected for printing in `toprint',
|
|
||||||
print ELEMENT; then print a space unless it is the last element to
|
|
||||||
be printed, in which case print a newline. */
|
|
||||||
|
|
||||||
static void print_element(unsigned int mask, char *element)
|
|
||||||
{
|
|
||||||
if (toprint & mask) {
|
|
||||||
toprint &= ~mask;
|
|
||||||
printf("%s%c", element, toprint ? ' ' : '\n');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user