b1611d9a4
Pere Orga
2011-08-16
Subject
hostid: fix behavior on identifiers starting with zeros
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/Config.src +0 -7coreutils/Kbuild.src +0 -1coreutils/hostid.c +12 -1include/applets.src.h +0 -1
coreutils/Config.src+0 -7
| @@ -269,13 +269,6 @@ config FEATURE_FANCY_HEAD | |
| help | |
| This enables the head options (-c, -q, and -v). | |
| - | config HOSTID |
| - | bool "hostid" |
| - | default y |
| - | help |
| - | hostid prints the numeric identifier (in hexadecimal) for |
| - | the current host. |
| - | |
| config INSTALL | |
| bool "install" | |
| default y | |
coreutils/Kbuild.src+0 -1
| @@ -36,7 +36,6 @@ lib-$(CONFIG_FALSE) += false.o | |
| lib-$(CONFIG_FOLD) += fold.o | |
| lib-$(CONFIG_FSYNC) += fsync.o | |
| lib-$(CONFIG_HEAD) += head.o | |
| - | lib-$(CONFIG_HOSTID) += hostid.o |
| lib-$(CONFIG_INSTALL) += install.o | |
| #lib-$(CONFIG_LENGTH) += length.o | |
| lib-$(CONFIG_LN) += ln.o | |
coreutils/hostid.c+12 -1
| @@ -9,6 +9,17 @@ | |
| /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ | |
| + | //config:config HOSTID |
| + | //config: bool "hostid" |
| + | //config: default y |
| + | //config: help |
| + | //config: hostid prints the numeric identifier (in hexadecimal) for |
| + | //config: the current host. |
| + | |
| + | //applet:IF_HOSTID(APPLET_NOFORK(hostid, hostid, BB_DIR_USR_BIN, BB_SUID_DROP, hostid)) |
| + | |
| + | //kbuild:lib-$(CONFIG_HOSTID) += hostid.o |
| + | |
| //usage:#define hostid_trivial_usage | |
| //usage: "" | |
| //usage:#define hostid_full_usage "\n\n" | |
| @@ -25,7 +36,7 @@ int hostid_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| bb_show_usage(); | |
| } | |
| - | printf("%lx\n", gethostid()); |
| + | printf("%08lx\n", gethostid()); |
| return fflush_all(); | |
| } | |
include/applets.src.h+0 -1
| @@ -176,7 +176,6 @@ IF_HD(APPLET_NOEXEC(hd, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hd)) | |
| IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head)) | |
| IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hexdump)) | |
| - | IF_HOSTID(APPLET_NOFORK(hostid, hostid, BB_DIR_USR_BIN, BB_SUID_DROP, hostid)) |
| IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP)) | |
| IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP)) | |
| IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP)) | |