Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge in changes from 1.1 release branch

This commit is contained in:
jtc 1995-11-28 20:58:08 +00:00
parent 9bf3251e46
commit db5284ed0a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.59 1995/11/17 09:49:19 thorpej Exp $
# $NetBSD: Makefile,v 1.60 1995/11/28 20:58:08 jtc Exp $
# from: @(#)Makefile 5.8.1.1 (Berkeley) 5/8/91
SUBDIR= apply apropos asa at banner basename bdes biff cal calendar cap_mkdb \
@ -21,7 +21,7 @@ SUBDIR= apply apropos asa at banner basename bdes biff cal calendar cap_mkdb \
xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
# Don't use the standard tool chain on the alpha.
.if (${MACHINE_ARCH} != "alpha")
.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips")
SUBDIR+= ar gprof nm ranlib size strip
.endif

11
usr.bin/ul/ul.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */
/* $NetBSD: ul.c,v 1.4 1995/11/28 20:58:38 jtc Exp $ */
/*
* Copyright (c) 1980, 1993
@ -43,10 +43,12 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
static char rcsid[] = "$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $";
static char rcsid[] = "$NetBSD: ul.c,v 1.4 1995/11/28 20:58:38 jtc Exp $";
#endif /* not lint */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define IESC '\033'
#define SO '\016'
@ -93,7 +95,6 @@ main(argc, argv)
char *termtype;
FILE *f;
char termcap[1024];
char *getenv(), *strcpy();
termtype = getenv("TERM");
if (termtype == NULL || (argv[0][0] == 'c' && !isatty(1)))
@ -142,8 +143,10 @@ main(argc, argv)
if (f == NULL) {
perror(argv[optind]);
exit(1);
} else
}
filter(f);
fclose(f);
}
exit(0);
}