From owner-svn-src-all@freebsd.org Fri Oct 6 12:30:56 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6282E361E3; Fri, 6 Oct 2017 12:30:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A29118152C; Fri, 6 Oct 2017 12:30:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v96CUtFe048898; Fri, 6 Oct 2017 12:30:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v96CUtZT048891; Fri, 6 Oct 2017 12:30:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201710061230.v96CUtZT048891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 6 Oct 2017 12:30:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324361 - in head/contrib: ctfdump mdocml X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/contrib: ctfdump mdocml X-SVN-Commit-Revision: 324361 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Oct 2017 12:30:56 -0000 Author: bapt Date: Fri Oct 6 12:30:54 2017 New Revision: 324361 URL: https://svnweb.freebsd.org/changeset/base/324361 Log: Revert r324358, some cruft when in with it, it will be properly reimported in another commit Deleted: head/contrib/ctfdump/ Modified: head/contrib/mdocml/Makefile head/contrib/mdocml/NEWS head/contrib/mdocml/man_term.c head/contrib/mdocml/mansearch.c head/contrib/mdocml/mdoc_validate.c head/contrib/mdocml/tbl_html.c head/contrib/mdocml/tbl_term.c Directory Properties: head/contrib/mdocml/ (props changed) Modified: head/contrib/mdocml/Makefile ============================================================================== --- head/contrib/mdocml/Makefile Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/Makefile Fri Oct 6 12:30:54 2017 (r324361) @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -VERSION = 1.14.3 +VERSION = 1.14.2 # === LIST OF FILES ==================================================== Modified: head/contrib/mdocml/NEWS ============================================================================== --- head/contrib/mdocml/NEWS Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/NEWS Fri Oct 6 12:30:54 2017 (r324361) @@ -2,21 +2,6 @@ $Id: NEWS,v 1.26 2017/07/28 14:57:56 schwarze Exp $ This file lists the most important changes in the mandoc.bsd.lv distribution. -Changes in version 1.14.3, released on August 5, 2017 - - --- BUG FIXES --- - * man(7): Do not crash with out-of-bounds read access to a constant - array if .sp or a blank line immediately precedes .SS or .SH. - * mdoc(7): Do not crash with out-of-bounds read access to a constant - array if .sp or a blank line precede the first .Sh macro. - * tbl(7): Ignore explicitly specified negative column widths rather than - wrapping around to huge numbers and risking memory exhaustion. - * man(1): No longer use names that only occur in the SYNOPSIS section. - Gets rid of some surprising behaviour and bogus warnings. - --- THANKS TO --- - Leah Neukirchen (Void Linux), Markus Waldeck (Debian), - Peter Bui (nd.edu), and Yuri Pankov (illumos) for bug reports. - Changes in version 1.14.2, released on July 28, 2017 --- MAJOR NEW FEATURES --- Modified: head/contrib/mdocml/man_term.c ============================================================================== --- head/contrib/mdocml/man_term.c Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/man_term.c Fri Oct 6 12:30:54 2017 (r324361) @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.209 2017/07/31 15:19:06 schwarze Exp $ */ +/* $Id: man_term.c,v 1.208 2017/06/25 11:42:02 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2015, 2017 Ingo Schwarze @@ -673,7 +673,7 @@ pre_SS(DECL_ARGS) do { n = n->prev; - } while (n != NULL && n->tok >= MAN_TH && + } while (n != NULL && n->tok != TOKEN_NONE && termacts[n->tok].flags & MAN_NOTEXT); if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL)) break; @@ -735,7 +735,7 @@ pre_SH(DECL_ARGS) do { n = n->prev; - } while (n != NULL && n->tok >= MAN_TH && + } while (n != NULL && n->tok != TOKEN_NONE && termacts[n->tok].flags & MAN_NOTEXT); if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) break; Modified: head/contrib/mdocml/mansearch.c ============================================================================== --- head/contrib/mdocml/mansearch.c Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/mansearch.c Fri Oct 6 12:30:54 2017 (r324361) @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.76 2017/08/02 13:29:04 schwarze Exp $ */ +/* $OpenBSD: mansearch.c,v 1.50 2016/07/09 15:23:36 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons * Copyright (c) 2013-2017 Ingo Schwarze @@ -171,9 +171,7 @@ mansearch(const struct mansearch *search, page = dbm_page_get(rp->page); if (lstmatch(search->sec, page->sect) == 0 || - lstmatch(search->arch, page->arch) == 0 || - (search->argmode == ARG_NAME && - rp->bits <= (int32_t)(NAME_SYN & NAME_MASK))) + lstmatch(search->arch, page->arch) == 0) continue; if (res == NULL) { @@ -454,28 +452,14 @@ lstlen(const char *cp, size_t sep) { size_t sz; - for (sz = 0; *cp != '\0'; cp++) { - - /* Skip names appearing only in the SYNOPSIS. */ - if (*cp <= (char)(NAME_SYN & NAME_MASK)) { - while (*cp != '\0') - cp++; - continue; - } - - /* Skip name class markers. */ - if (*cp < ' ') - cp++; - - /* Print a separator before each but the first string. */ - if (sz) - sz += sep; - - /* Copy one string. */ - while (*cp != '\0') { - sz++; - cp++; - } + for (sz = 0;; sz++) { + if (cp[0] == '\0') { + if (cp[1] == '\0') + break; + sz += sep - 1; + } else if (cp[0] < ' ') + sz--; + cp++; } return sz; } @@ -487,34 +471,19 @@ lstlen(const char *cp, size_t sep) static void lstcat(char *buf, size_t *i, const char *cp, const char *sep) { - const char *s; - size_t i_start; + const char *s; - for (i_start = *i; *cp != '\0'; cp++) { - - /* Skip names appearing only in the SYNOPSIS. */ - if (*cp <= (char)(NAME_SYN & NAME_MASK)) { - while (*cp != '\0') - cp++; - continue; - } - - /* Skip name class markers. */ - if (*cp < ' ') - cp++; - - /* Print a separator before each but the first string. */ - if (*i > i_start) { + for (;;) { + if (cp[0] == '\0') { + if (cp[1] == '\0') + break; s = sep; while (*s != '\0') buf[(*i)++] = *s++; - } - - /* Copy one string. */ - while (*cp != '\0') - buf[(*i)++] = *cp++; + } else if (cp[0] >= ' ') + buf[(*i)++] = cp[0]; + cp++; } - } /* Modified: head/contrib/mdocml/mdoc_validate.c ============================================================================== --- head/contrib/mdocml/mdoc_validate.c Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/mdoc_validate.c Fri Oct 6 12:30:54 2017 (r324361) @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.352 2017/08/02 13:29:04 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.350 2017/07/20 12:54:02 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -1137,6 +1137,8 @@ post_fname(POST_ARGS) if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse, n->line, n->pos + pos, n->string); + if (n->sec == SEC_SYNOPSIS && mdoc->meta.msec != NULL) + mandoc_xr_add(mdoc->meta.msec, n->string, -1, -1); } static void @@ -1203,8 +1205,9 @@ post_nm(POST_ARGS) n = mdoc->last; - if (n->sec == SEC_NAME && n->child != NULL && - n->child->type == ROFFT_TEXT && mdoc->meta.msec != NULL) + if ((n->sec == SEC_NAME || n->sec == SEC_SYNOPSIS) && + n->child != NULL && n->child->type == ROFFT_TEXT && + mdoc->meta.msec != NULL) mandoc_xr_add(mdoc->meta.msec, n->child->string, -1, -1); if (n->last != NULL && @@ -1928,7 +1931,7 @@ post_root(POST_ARGS) /* Check that we begin with a proper `Sh'. */ n = mdoc->first->child; - while (n != NULL && n->tok >= MDOC_Dd && + while (n != NULL && n->tok != TOKEN_NONE && mdoc_macros[n->tok].flags & MDOC_PROLOGUE) n = n->next; Modified: head/contrib/mdocml/tbl_html.c ============================================================================== --- head/contrib/mdocml/tbl_html.c Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/tbl_html.c Fri Oct 6 12:30:54 2017 (r324361) @@ -1,4 +1,4 @@ -/* $Id: tbl_html.c,v 1.23 2017/07/31 16:14:10 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.22 2017/06/12 20:14:18 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2017 Ingo Schwarze @@ -49,9 +49,6 @@ html_tbl_strlen(const char *p, void *arg) static size_t html_tbl_sulen(const struct roffsu *su, void *arg) { - if (su->scale < 0.0) - return 0; - switch (su->unit) { case SCALE_FS: /* 2^16 basic units */ return su->scale * 65536.0 / 24.0; Modified: head/contrib/mdocml/tbl_term.c ============================================================================== --- head/contrib/mdocml/tbl_term.c Fri Oct 6 12:21:46 2017 (r324360) +++ head/contrib/mdocml/tbl_term.c Fri Oct 6 12:30:54 2017 (r324361) @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.57 2017/07/31 16:14:10 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.56 2017/07/08 13:43:15 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze @@ -51,10 +51,7 @@ static void tbl_word(struct termp *, const struct tbl_ static size_t term_tbl_sulen(const struct roffsu *su, void *arg) { - int i; - - i = term_hen((const struct termp *)arg, su); - return i > 0 ? i : 0; + return term_hen((const struct termp *)arg, su); } static size_t