Module Name: src Committed By: tls Date: Sun Aug 10 06:51:54 UTC 2014
Modified Files: src/lib/libcurses [tls-earlyentropy]: Makefile addnstr.c src/lib/libcurses/PSD.doc [tls-earlyentropy]: Makefile Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.68.8.1 src/lib/libcurses/Makefile cvs rdiff -u -r1.13 -r1.13.6.1 src/lib/libcurses/addnstr.c cvs rdiff -u -r1.10 -r1.10.74.1 src/lib/libcurses/PSD.doc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libcurses/Makefile diff -u src/lib/libcurses/Makefile:1.68 src/lib/libcurses/Makefile:1.68.8.1 --- src/lib/libcurses/Makefile:1.68 Sat Apr 21 14:39:35 2012 +++ src/lib/libcurses/Makefile Sun Aug 10 06:51:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2012/04/21 14:39:35 roy Exp $ +# $NetBSD: Makefile,v 1.68.8.1 2014/08/10 06:51:54 tls Exp $ # @(#)Makefile 8.2 (Berkeley) 1/2/94 .include <bsd.own.mk> @@ -176,9 +176,7 @@ MLINKS+= curses_addch.3 addch.3 curses_a curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \ curses_underscore.3 wunderscore.3 curses_line.3 wvline.3 -.if make(install) SUBDIR+= PSD.doc -.endif fileio.h: shlib_version genfileioh.awk ${TOOL_AWK} -f ${.CURDIR}/genfileioh.awk < ${.CURDIR}/shlib_version > ${.CURDIR}/fileio.h Index: src/lib/libcurses/addnstr.c diff -u src/lib/libcurses/addnstr.c:1.13 src/lib/libcurses/addnstr.c:1.13.6.1 --- src/lib/libcurses/addnstr.c:1.13 Fri Sep 28 06:07:05 2012 +++ src/lib/libcurses/addnstr.c Sun Aug 10 06:51:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: addnstr.c,v 1.13 2012/09/28 06:07:05 blymn Exp $ */ +/* $NetBSD: addnstr.c,v 1.13.6.1 2014/08/10 06:51:54 tls Exp $ */ /* * Copyright (c) 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)addnstr.c 8.2 (Berkeley) 5/4/94"; #else -__RCSID("$NetBSD: addnstr.c,v 1.13 2012/09/28 06:07:05 blymn Exp $"); +__RCSID("$NetBSD: addnstr.c,v 1.13.6.1 2014/08/10 06:51:54 tls Exp $"); #endif #endif /* not lint */ @@ -147,16 +147,11 @@ waddnstr(WINDOW *win, const char *s, int * ncurses: if (n >= 0) then "at most n", else "len = strlen(s)" * XCURSES: if (n != -1) then "at most n", else "len = strlen(s)" * - * Also SUSv2 says these functions do not wrap nor change the - * cursor position. */ if (n >= 0) for (p = s, len = 0; n-- && *p++; ++len); else len = strlen(s); - if (len > (win->maxx - win->curx)) - len = win->maxx - win->curx; - return(waddbytes(win, s, (int) len)); } Index: src/lib/libcurses/PSD.doc/Makefile diff -u src/lib/libcurses/PSD.doc/Makefile:1.10 src/lib/libcurses/PSD.doc/Makefile:1.10.74.1 --- src/lib/libcurses/PSD.doc/Makefile:1.10 Thu Jul 10 10:34:22 2003 +++ src/lib/libcurses/PSD.doc/Makefile Sun Aug 10 06:51:54 2014 @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.10 2003/07/10 10:34:22 lukem Exp $ +# $NetBSD: Makefile,v 1.10.74.1 2014/08/10 06:51:54 tls Exp $ # from: @(#)Makefile 8.2 (Berkeley) 5/23/94 -DIR= psd/19.curses +SECTION=reference/ref3 +ARTICLE=curses SRCS= Master -MACROS= -me -OTHER= appen.A appen.B appen.C doc.I doc.II doc.III doc.IV fns.doc \ - intro.0 intro.1 intro.3 intro.4 intro.5 intro.6 \ - macros c_macros CEXAMPLES= ex1.gr ex2.gr life.gr twinkle1.gr twinkle2.gr win_st.gr -TBLFILES= intro.2.tbl -EXTRA= ${OTHER} ${CEXAMPLES:R:S/$/.c/g} ${TBLFILES:R} - -CLEANFILES+= ${CEXAMPLES} ${TBLFILES} +DEPSRCS=appen.A appen.B appen.C doc.I doc.II doc.III doc.IV fns.doc \ + intro.0 intro.1 intro.2.tbl intro.3 intro.4 intro.5 intro.6 \ + macros c_macros $(CEXAMPLES) +MACROS= -me +CLEANFILES+= ${CEXAMPLES} intro.2.tbl .SUFFIXES: .SUFFIXES: .c .gr @@ -22,16 +20,10 @@ CLEANFILES+= ${CEXAMPLES} ${TBLFILES} # bold font, and comments in italics. # - # Don't re-run vgrind unless you want to patch the output files. -# XXXBUILDSH: can we use TOOL_VGRIND here ? -VFONT= /usr/libexec/vfontedpr -.c.gr: - ${VFONT} ${.IMPSRC} | grep -v "^'wh" > ${.TARGET} -paper.ps: ${SRCS} ${OTHER} ${CEXAMPLES} ${TBLFILES} - ${TOOL_SOELIM} -I${.CURDIR} Master | \ - ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET} +.c.gr: + ${TOOL_VFONTEDPR} ${.IMPSRC} | grep -v "^'wh" > ${.TARGET} # Unfortunately our make doesn't handle single-suffix rules. intro.2.tbl: intro.2