This commit was generated by cvs2svn to compensate for changes in r23690,
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
commit
18dac96b7b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23691
@ -38,12 +38,13 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
void usage __P((void));
|
void usage __P((void));
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -47,6 +47,7 @@ static char sccsid[] = "@(#)colrm.c 8.1 (Berkeley) 6/6/93";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#define TAB 8
|
#define TAB 8
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -50,6 +50,7 @@ static char sccsid[] = "@(#)column.c 8.3 (Berkeley) 4/2/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
void c_columnate __P((void));
|
void c_columnate __P((void));
|
||||||
void *emalloc __P((int));
|
void *emalloc __P((int));
|
||||||
|
@ -41,7 +41,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
@ -50,6 +50,7 @@ static char sccsid[] = "@(#)comm.c 8.3 (Berkeley) 4/2/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#define MAXLINELEN (LINE_MAX + 1)
|
#define MAXLINELEN (LINE_MAX + 1)
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* 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. */
|
extern char tbuf[1024]; /* Temp buffer for anybody. */
|
||||||
@ -40,7 +40,6 @@ extern DB *db; /* Database. */
|
|||||||
void enter_lastlog __P((PERSON *));
|
void enter_lastlog __P((PERSON *));
|
||||||
PERSON *enter_person __P((struct passwd *));
|
PERSON *enter_person __P((struct passwd *));
|
||||||
void enter_where __P((struct utmp *, PERSON *));
|
void enter_where __P((struct utmp *, PERSON *));
|
||||||
void err __P((const char *, ...));
|
|
||||||
PERSON *find_person __P((char *));
|
PERSON *find_person __P((char *));
|
||||||
void lflag_print __P((void));
|
void lflag_print __P((void));
|
||||||
int match __P((struct passwd *, char *));
|
int match __P((struct passwd *, char *));
|
||||||
|
@ -32,9 +32,9 @@
|
|||||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
.\" SUCH DAMAGE.
|
.\" 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
|
.Dt JOIN 1
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -84,6 +84,11 @@ The following options are available:
|
|||||||
In addition to the default output, produce a line for each unpairable
|
In addition to the default output, produce a line for each unpairable
|
||||||
line in file
|
line in file
|
||||||
.Ar file_number .
|
.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
|
.It Fl e Ar string
|
||||||
Replace empty output fields with
|
Replace empty output fields with
|
||||||
.Ar string .
|
.Ar string .
|
||||||
@ -165,6 +170,10 @@ the following options are available:
|
|||||||
.It Fl a
|
.It Fl a
|
||||||
In addition to the default output, produce a line for each unpairable line
|
In addition to the default output, produce a line for each unpairable line
|
||||||
in both file 1 and file 2.
|
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
|
.It Fl j1 Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -46,6 +46,7 @@ static char sccsid[] = "@(#)printenv.c 8.1 (Berkeley) 6/6/93";
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
void usage __P((void));
|
void usage __P((void));
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -48,6 +48,7 @@ static char sccsid[] = "@(#)rev.c 8.2 (Berkeley) 1/2/94";
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
void usage __P((void));
|
void usage __P((void));
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -47,6 +47,7 @@ static char sccsid[] = "@(#)uname.c 8.1 (Berkeley) 6/6/93";
|
|||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
void usage __P((void));
|
void usage __P((void));
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ static char copyright[] =
|
|||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#ifndef 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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
@ -49,6 +49,7 @@ static char sccsid[] = "@(#)uniq.c 8.1 (Berkeley) 6/6/93";
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#define MAXLINELEN (8 * 1024)
|
#define MAXLINELEN (8 * 1024)
|
||||||
|
|
||||||
@ -171,7 +172,8 @@ show(ofp, str)
|
|||||||
FILE *ofp;
|
FILE *ofp;
|
||||||
char *str;
|
char *str;
|
||||||
{
|
{
|
||||||
if (cflag)
|
|
||||||
|
if (cflag && *str)
|
||||||
(void)fprintf(ofp, "%4d %s", repeats + 1, str);
|
(void)fprintf(ofp, "%4d %s", repeats + 1, str);
|
||||||
if (dflag && repeats || uflag && !repeats)
|
if (dflag && repeats || uflag && !repeats)
|
||||||
(void)fprintf(ofp, "%s", str);
|
(void)fprintf(ofp, "%s", str);
|
||||||
|
Loading…
Reference in New Issue
Block a user