diff options
| author | emaste <emaste@FreeBSD.org> | 2010-01-26 20:02:53 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2010-01-26 20:02:53 +0000 |
| commit | bf00a8f9cee5fcc9bf83f86f12a91079c4ce287e (patch) | |
| tree | 54404723d113dcd0c3f7c73815983aca7a463c37 /usr.bin | |
| parent | 5f00b658cb1e376af0d3476125b32a1757b7cbd6 (diff) | |
| download | FreeBSD-src-bf00a8f9cee5fcc9bf83f86f12a91079c4ce287e.zip FreeBSD-src-bf00a8f9cee5fcc9bf83f86f12a91079c4ce287e.tar.gz | |
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
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/uname/uname.1 | 6 | ||||
| -rw-r--r-- | 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 2a28464..332ce6e 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 81aef45..a33b557 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': |
