mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
hostid: fix behavior on identifiers starting with zeros
Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
4619802a5f
commit
b1611d9a46
@ -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
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user