Support the "-f" option by simply ignoring it.

This allows script compatibility with Linux, whose
"hostname" is the same as BSD "hostname -s".
With this change, "hostname -f" is the same on
both systems.

MFC after: 7 days

2 files changed, 11 insertions, 2 deletions

diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 5cf4534..62df0df 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -29,7 +29,7 @@
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd December 5, 2006
+.Dd December 7, 2006
 .Dt HOSTNAME 1
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Nd set or print name of current host system
 .Sh SYNOPSIS
 .Nm
+.Op Fl f
 .Op Fl s
 .Op Ar name-of-host
 .Sh DESCRIPTION
@@ -56,6 +57,9 @@ variable in
 .Pp
 Options:
 .Bl -tag -width flag
+.It Fl f
+Include domain information in the printed name.
+This is the default behavior.
 .It Fl s
 Trim off any domain information from the printed
 name.
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 512327b..dd3f7e9 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -58,8 +58,13 @@ main(int argc, char *argv[])
 	char *p, hostname[MAXHOSTNAMELEN];
 
 	sflag = 0;
-	while ((ch = getopt(argc, argv, "s")) != -1)
+	while ((ch = getopt(argc, argv, "sf")) != -1)
 		switch (ch) {
+		case 'f':
+			/* On Linux, "hostname -f" prints FQDN. */
+			/* BSD "hostname" always print FQDN by
+			 * default, so we accept but ignore -f. */
+			break;
 		case 's':
 			sflag = 1;
 			break;