forked from pool/coreutils
135 lines
3.8 KiB
Diff
135 lines
3.8 KiB
Diff
Index: doc/coreutils.texi
|
|
================================================================================
|
|
--- doc/coreutils.texi
|
|
+++ doc/coreutils.texi
|
|
@@ -64,8 +64,6 @@
|
|
* fold: (coreutils)fold invocation. Wrap long input lines.
|
|
* groups: (coreutils)groups invocation. Print group names a user is in.
|
|
* head: (coreutils)head invocation. Output the first part of files.
|
|
-* hostid: (coreutils)hostid invocation. Print numeric host identifier.
|
|
-* hostname: (coreutils)hostname invocation. Print or set system name.
|
|
* id: (coreutils)id invocation. Print user identity.
|
|
* install: (coreutils)install invocation. Copy and change attributes.
|
|
* join: (coreutils)join invocation. Join lines on a common field.
|
|
@@ -399,8 +397,6 @@ System context
|
|
|
|
* date invocation:: Print or set system date and time
|
|
* uname invocation:: Print system information
|
|
-* hostname invocation:: Print or set system name
|
|
-* hostid invocation:: Print numeric host identifier.
|
|
|
|
@command{date}: Print or set system date and time
|
|
|
|
@@ -12306,8 +12302,6 @@ information.
|
|
@menu
|
|
* date invocation:: Print or set system date and time.
|
|
* uname invocation:: Print system information.
|
|
-* hostname invocation:: Print or set system name.
|
|
-* hostid invocation:: Print numeric host identifier.
|
|
@end menu
|
|
|
|
|
|
@@ -13065,55 +13059,6 @@ Print the kernel version.
|
|
@exitstatus
|
|
|
|
|
|
-@node hostname invocation
|
|
-@section @command{hostname}: Print or set system name
|
|
-
|
|
-@pindex hostname
|
|
-@cindex setting the hostname
|
|
-@cindex printing the hostname
|
|
-@cindex system name, printing
|
|
-@cindex appropriate privileges
|
|
-
|
|
-With no arguments, @command{hostname} prints the name of the current host
|
|
-system. With one argument, it sets the current host name to the
|
|
-specified string. You must have appropriate privileges to set the host
|
|
-name. Synopsis:
|
|
-
|
|
-@example
|
|
-hostname [@var{name}]
|
|
-@end example
|
|
-
|
|
-The only options are @option{--help} and @option{--version}. @xref{Common
|
|
-options}.
|
|
-
|
|
-@exitstatus
|
|
-
|
|
-
|
|
-@node hostid invocation
|
|
-@section @command{hostid}: Print numeric host identifier.
|
|
-
|
|
-@pindex hostid
|
|
-@cindex printing the host identifier
|
|
-
|
|
-@command{hostid} prints the numeric identifier of the current host
|
|
-in hexadecimal. This command accepts no arguments.
|
|
-The only options are @option{--help} and @option{--version}.
|
|
-@xref{Common options}.
|
|
-
|
|
-For example, here's what it prints on one system I use:
|
|
-
|
|
-@example
|
|
-$ hostid
|
|
-1bac013d
|
|
-@end example
|
|
-
|
|
-On that system, the 32-bit quantity happens to be closely
|
|
-related to the system's Internet address, but that isn't always
|
|
-the case.
|
|
-
|
|
-@exitstatus
|
|
-
|
|
-
|
|
@node Modified command invocation
|
|
@chapter Modified command invocation
|
|
|
|
--- src/sort.c
|
|
+++ src/sort.c
|
|
@@ -3517,10 +3517,7 @@ main (int argc, char **argv)
|
|
if (! (key->sword | key->schar))
|
|
key->sword = SIZE_MAX;
|
|
if (! s || *set_ordering (s, key, bl_start))
|
|
- {
|
|
- free (key);
|
|
- key = NULL;
|
|
- }
|
|
+ key = NULL;
|
|
else
|
|
{
|
|
if (minus_pos_usage)
|
|
--- src/system.h
|
|
+++ src/system.h
|
|
@@ -168,7 +168,7 @@ enum
|
|
# define DEV_BSIZE BBSIZE
|
|
#endif
|
|
#ifndef DEV_BSIZE
|
|
-# define DEV_BSIZE 4096
|
|
+# define DEV_BSIZE 512
|
|
#endif
|
|
|
|
/* Extract or fake data from a `struct stat'.
|
|
--- tests/help-version
|
|
+++ tests/help-version
|
|
@@ -197,7 +197,7 @@ lbracket_args=": ]"
|
|
|
|
for i in $all_programs; do
|
|
# Skip these.
|
|
- case $i in chroot|stty|tty|false) continue;; esac
|
|
+ case $i in chroot|stty|tty|false|df) continue;; esac
|
|
|
|
rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
|
|
echo > $tmp_in
|
|
--- tests/other-fs-tmpdir
|
|
+++ tests/other-fs-tmpdir
|
|
@@ -44,6 +44,8 @@ for d in $CANDIDATE_TMP_DIRS; do
|
|
fi
|
|
|
|
done
|
|
+# Autobuild hack
|
|
+test -f /bin/uname.bin && other_partition_tmpdir=
|
|
|
|
if test -z "$other_partition_tmpdir"; then
|
|
cat <<EOF 1>&2
|