Sync with 4.4-Lite, plus local changes.
This commit is contained in:
parent
d22604a33d
commit
db6e530eb0
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)config.c 8.5 (Berkeley) 11/26/93";
|
||||
static char sccsid[] = "@(#)config.c 8.7 (Berkeley) 1/3/94";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -77,6 +77,8 @@ config(fname)
|
||||
err(1, "%s", fname);
|
||||
TAILQ_INIT(&head);
|
||||
for (lcnt = 1; (p = fgetln(cfp, &len)) != NULL; ++lcnt) {
|
||||
if (len == 1) /* Skip empty lines. */
|
||||
continue;
|
||||
if (p[len - 1] != '\n') { /* Skip corrupted lines. */
|
||||
warnx("%s: line %d corrupted", fname, lcnt);
|
||||
continue;
|
||||
|
@ -29,9 +29,9 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)man.1 8.2 (Berkeley) 11/26/93
|
||||
.\" @(#)man.1 8.2 (Berkeley) 1/2/94
|
||||
.\"
|
||||
.Dd November 26, 1993
|
||||
.Dd January 2, 1994
|
||||
.Dt MAN 1
|
||||
.Os BSD 4
|
||||
.Sh NAME
|
||||
|
@ -38,7 +38,7 @@ static char copyright[] =
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)man.c 8.13 (Berkeley) 12/20/93";
|
||||
static char sccsid[] = "@(#)man.c 8.16 (Berkeley) 4/16/94";
|
||||
#endif /* not lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -731,6 +731,6 @@ static void
|
||||
usage()
|
||||
{
|
||||
(void)fprintf(stderr,
|
||||
"usage: man [-ac] [-C file] [-M path] [-m path] [section] title ...\n");
|
||||
"usage: man [-achw] [-C file] [-M path] [-m path] [section] title ...\n");
|
||||
exit(1);
|
||||
}
|
||||
|
@ -29,9 +29,9 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)man.conf.5 8.4 (Berkeley) 11/26/93
|
||||
.\" @(#)man.conf.5 8.5 (Berkeley) 1/2/94
|
||||
.\"
|
||||
.Dd November 26, 1993
|
||||
.Dd January 2, 1994
|
||||
.Dt MAN.CONF 5
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)pathnames.h 8.3 (Berkeley) 10/13/93
|
||||
* @(#)pathnames.h 8.3 (Berkeley) 1/2/94
|
||||
*/
|
||||
|
||||
#define _PATH_MANCONF "/etc/man.conf"
|
||||
|
Loading…
Reference in New Issue
Block a user