From 8293a8fe11891f6e298d08392792fa488dc2753a Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 26 Jan 2010 20:02:53 +0000
Subject: [PATCH] Allow -o as a synonym for -s, for compatibility with other
 systems.

Using -s is preferred, but some existing scripts and makefiles expect
to get the system name from uname -o.

Reviewed by:	imp
---
 usr.bin/uname/uname.1 | 6 +++++-
 usr.bin/uname/uname.c | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 2a28464efa23..332ce6e9e5ad 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -32,7 +32,7 @@
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2003
+.Dd January 26, 2010
 .Dt UNAME 1
 .Os
 .Sh NAME
@@ -63,6 +63,10 @@ Write the kernel ident to standard output.
 Write the type of the current hardware platform to standard output.
 .It Fl n
 Write the name of the system to standard output.
+.It Fl o
+This is a synonym for the
+.Fl s
+option, for compatibility with other systems.
 .It Fl p
 Write the type of the machine processor architecture to standard output.
 .It Fl r
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 81aef452a74e..a33b5570db1e 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
 	setup_get();
 	flags = 0;
 
-	while ((ch = getopt(argc, argv, "aimnprsv")) != -1)
+	while ((ch = getopt(argc, argv, "aimnoprsv")) != -1)
 		switch(ch) {
 		case 'a':
 			flags |= (MFLAG | NFLAG | RFLAG | SFLAG | VFLAG);
@@ -109,6 +109,7 @@ main(int argc, char *argv[])
 			flags |= RFLAG;
 			break;
 		case 's':
+		case 'o':
 			flags |= SFLAG;
 			break;
 		case 'v':