From e0a7fc54eb23f925d2ea885fb1b8699931f9001a Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 2 Jul 2008 11:14:59 +0000 Subject: uname,individual: fix improper printf usage uname,awk: small code shrink function old new delta uname_main 175 166 -9 nvalloc 167 157 -10 evaluate 6381 6370 -11 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-30) Total: -30 bytes --- coreutils/uname.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'coreutils/uname.c') diff --git a/coreutils/uname.c b/coreutils/uname.c index 34600e7a9..76fd3ca8d 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -17,7 +17,7 @@ -m, --machine sun -a, --all SunOS rocky8 4.0 sun - The default behavior is equivalent to `-s'. + The default behavior is equivalent to '-s'. David MacKenzie */ @@ -39,47 +39,43 @@ typedef struct { } uname_info_t; static const char options[] ALIGN1 = "snrvmpa"; -static const unsigned short utsname_offset[] ALIGN2 = { - 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) +static const unsigned short 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) MAIN_EXTERNALLY_VISIBLE; -int uname_main(int argc, char **argv) +int uname_main(int argc ATTRIBUTE_UNUSED, char **argv) { uname_info_t uname_info; #if defined(__sparc__) && defined(__linux__) char *fake_sparc = getenv("FAKE_SPARC"); #endif - const unsigned short int *delta; + const unsigned short *delta; char toprint; toprint = getopt32(argv, options); - if (argc != optind) { + if (argv[optind]) { /* coreutils-6.9 compat */ bb_show_usage(); } - if (toprint & (1 << 6)) { + if (toprint & (1 << 6)) { /* -a => all opts on */ toprint = 0x3f; } - if (toprint == 0) { - toprint = 1; /* sysname */ + if (toprint == 0) { /* no opts => -s (sysname) */ + toprint = 1; } - if (uname(&uname_info.name) == -1) { - bb_error_msg_and_die("cannot get system name"); - } + uname(&uname_info.name); /* never fails */ #if defined(__sparc__) && defined(__linux__) - if ((fake_sparc != NULL) - && ((fake_sparc[0] == 'y') - || (fake_sparc[0] == 'Y'))) { + if (fake_sparc && (fake_sparc[0] | 0x20) == 'y') { strcpy(uname_info.name.machine, "sparc"); } #endif @@ -89,7 +85,8 @@ int uname_main(int argc, char **argv) delta = utsname_offset; do { if (toprint & 1) { - printf("%s", ((char *)(&uname_info)) + *delta); + /* printf would not be safe here */ + fputs((char *)(&uname_info) + *delta, stdout); if (toprint > 1) { bb_putchar(' '); } @@ -98,5 +95,5 @@ int uname_main(int argc, char **argv) } while (toprint >>= 1); bb_putchar('\n'); - fflush_stdout_and_exit(EXIT_SUCCESS); + fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */ } -- cgit v1.2.3