diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-12-11 22:01:14 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-12-11 22:01:14 +0000 |
| commit | 0a4b967b12c2c46a46d4f1ea49d2122d2dd2190e (patch) | |
| tree | 3ea44e73764ae204bde5e39c5b5c7b259d76590a /usr.bin | |
| parent | 3a0d341d13be684fef9c1200d8c3aa968dba880f (diff) | |
Don't require a list of object file for the -d, -m, -q and -r options
since neither Solaris nor GNU ar require this. Personally I'd
rather change the world to use the BSD behavior but that is unlikely
and the differing behavior causes problems with libtool and automake.
deraadt@ OK
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ar/ar.1 | 20 | ||||
| -rw-r--r-- | usr.bin/ar/ar.c | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1 index 4dd4d3447c5..f93aa5c424e 100644 --- a/usr.bin/ar/ar.1 +++ b/usr.bin/ar/ar.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ar.1,v 1.10 2000/11/09 17:52:02 aaron Exp $ +.\" $OpenBSD: ar.1,v 1.11 2002/12/11 22:01:13 millert Exp $ .\" $NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -47,15 +47,18 @@ .Nm ar .Fl d .Op Fl \Tv -.Ar archive file ... +.Ar archive +.Op Ar file ... .Nm ar .Fl m .Op Fl \Tv -.Ar archive file ... +.Ar archive +.Op Ar file ... .Nm ar .Fl m .Op Fl abiTv -.Ar position archive file ... +.Ar position archive +.Or Ar file ... .Nm ar .Fl p .Op Fl \Tv @@ -64,15 +67,18 @@ .Nm ar .Fl q .Op Fl cTv -.Ar archive file ... +.Ar archive +.Op Ar file ... .Nm ar .Fl r .Op Fl cuTv -.Ar archive file ... +.Ar archive +.Op Ar file ... .Nm ar .Fl r .Op Fl abciuTv -.Ar position archive file ... +.Ar position archive +.Op Ar file ... .Nm ar .Fl t .Op Fl \Tv diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 2ca0b6b9d4b..090d17cf2c3 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar.c,v 1.7 2002/02/16 21:27:43 millert Exp $ */ +/* $OpenBSD: ar.c,v 1.8 2002/12/11 22:01:13 millert Exp $ */ /* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ar.c,v 1.7 2002/02/16 21:27:43 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar.c,v 1.8 2002/12/11 22:01:13 millert Exp $"; #endif #endif /* not lint */ @@ -212,12 +212,6 @@ main(argc, argv) usage(); } - /* -dmqr require a list of archive elements. */ - if (options & (AR_D|AR_M|AR_Q|AR_R) && !*argv) { - warnx("no archive members specified"); - usage(); - } - exit((*fcall)(argv)); } |