This commit was generated by cvs2svn to compensate for changes in r23690,

which included commits to RCS files with non-trunk default branches.

10 files changed, 30 insertions, 13 deletions

diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index b369190..4925b27 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -38,12 +38,13 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)basename.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 void usage __P((void));
 
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index a7c7a65..06f6232 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -38,7 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)colrm.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)colrm.c	8.1 (Berkeley) 6/6/93";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define	TAB	8
 
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index d3f71c5..5dbab1c 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -38,7 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)column.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)column.c	8.3 (Berkeley) 4/2/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 void  c_columnate __P((void));
 void *emalloc __P((int));
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 8ffbbb5..82f995f 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -41,7 +41,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)comm.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <fcntl.h>
@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)comm.c	8.3 (Berkeley) 4/2/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define	MAXLINELEN	(LINE_MAX + 1)
 
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 2b675f1..b213fe4 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)extern.h	8.1 (Berkeley) 6/6/93
+ *	@(#)extern.h	8.2 (Berkeley) 4/28/95
  */
 
 extern char tbuf[1024];			/* Temp buffer for anybody. */
@@ -40,7 +40,6 @@ extern DB *db;				/* Database. */
 void	 enter_lastlog __P((PERSON *));
 PERSON	*enter_person __P((struct passwd *));
 void	 enter_where __P((struct utmp *, PERSON *));
-void	 err __P((const char *, ...));
 PERSON	*find_person __P((char *));
 void	 lflag_print __P((void));
 int	 match __P((struct passwd *, char *));
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index fa383c6..a1855cf 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -32,9 +32,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)join.1	8.1 (Berkeley) 6/6/93
+.\"	@(#)join.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd June 6, 1993
+.Dd April 28, 1995
 .Dt JOIN 1
 .Os
 .Sh NAME
@@ -84,6 +84,11 @@ The following options are available:
 In addition to the default output, produce a line for each unpairable
 line in file
 .Ar file_number .
+(The argument to
+.Fl a
+must not be preceded by a space; see the
+.Sx COMPATIBILITY
+section.)
 .It Fl e Ar string
 Replace empty output fields with
 .Ar string .
@@ -165,6 +170,10 @@ the following options are available:
 .It Fl a
 In addition to the default output, produce a line for each unpairable line
 in both file 1 and file 2.
+(To distinguish between this and
+.Fl a Ar file_number ,
+.Nm join
+currently requires that the latter not include any white space.)
 .It Fl j1 Ar field
 Join on the
 .Ar field Ns 'th
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 121cd2f..fc40e3d 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -38,7 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)printenv.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -46,6 +46,7 @@ static char sccsid[] = "@(#)printenv.c	8.1 (Berkeley) 6/6/93";
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 void	usage __P((void));
 
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index fe95991..2fe272e 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -38,7 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)rev.c	8.2 (Berkeley) 1/2/94";
+static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -48,6 +48,7 @@ static char sccsid[] = "@(#)rev.c	8.2 (Berkeley) 1/2/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 void usage __P((void));
 
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 2ee1547..86b5dce 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -38,7 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)uname.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)uname.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)uname.c	8.1 (Berkeley) 6/6/93";
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 void usage __P((void));
 
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index e84f82e..b2b85e1 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -41,7 +41,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)uniq.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <errno.h>
@@ -49,6 +49,7 @@ static char sccsid[] = "@(#)uniq.c	8.1 (Berkeley) 6/6/93";
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #define	MAXLINELEN	(8 * 1024)
 
@@ -171,7 +172,8 @@ show(ofp, str)
 	FILE *ofp;
 	char *str;
 {
-	if (cflag)
+
+	if (cflag && *str)
 		(void)fprintf(ofp, "%4d %s", repeats + 1, str);
 	if (dflag && repeats || uflag && !repeats)
 		(void)fprintf(ofp, "%s", str);