Mageia Bugzilla – Attachment 14308 Details for
Bug 32753
mandoc: a utility used for formatting man pages in BSD Operating Systems. Needed to update serd. NEW PKG REQUEST
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
patch to build mandoc with spec from OpenSuse
boo1209830-endless-loop.patch (text/plain), 2.43 KB, created by
Philippe Didier
on 2024-01-25 18:05:05 CET
(
hide
)
Description:
patch to build mandoc with spec from OpenSuse
Filename:
MIME Type:
Creator:
Philippe Didier
Created:
2024-01-25 18:05:05 CET
Size:
2.43 KB
patch
obsolete
>=================================================================== >RCS file: /cvsrepo/anoncvs/cvs/a/out.c,v >retrieving revision 1.54 >retrieving revision 1.55 >--- > out.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > >--- a/out.c >+++ b/out.c >@@ -1,4 +1,4 @@ >-/* $Id: out.c,v 1.82 2021/09/07 17:07:58 schwarze Exp $ */ >+/* $OpenBSD: out.c,v 1.55 2021/09/28 17:06:17 schwarze Exp $ */ > /* > * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> > * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 >@@ -123,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struc > const struct tbl_dat *dp; > struct roffcol *col; > struct tbl_colgroup *first_group, **gp, *g; >+ size_t *colwidth; > size_t ewidth, min1, min2, wanted, width, xwidth; > int done, icol, maxcol, necol, nxcol, quirkcol; > >@@ -256,16 +257,28 @@ tblcalc(struct rofftbl *tbl, const struc > gp = &(*gp)->next; > } > >+ colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth)); > while (first_group != NULL) { > > /* >+ * Rebuild the array of the widths of all columns >+ * participating in spans that require expansion. >+ */ >+ >+ for (icol = 0; icol <= maxcol; icol++) >+ colwidth[icol] = SIZE_MAX; >+ for (g = first_group; g != NULL; g = g->next) >+ for (icol = g->startcol; icol <= g->endcol; icol++) >+ colwidth[icol] = tbl->cols[icol].width; >+ >+ /* > * Find the smallest and second smallest column width > * among the columns which may need expamsion. > */ > > min1 = min2 = SIZE_MAX; > for (icol = 0; icol <= maxcol; icol++) { >- width = tbl->cols[icol].width; >+ width = colwidth[icol]; > if (min1 > width) { > min2 = min1; > min1 = width; >@@ -283,7 +296,7 @@ tblcalc(struct rofftbl *tbl, const struc > for (g = first_group; g != NULL; g = g->next) { > necol = 0; > for (icol = g->startcol; icol <= g->endcol; icol++) >- if (tbl->cols[icol].width == min1) >+ if (colwidth[icol] == min1) > necol++; > if (necol == 0) > continue; >@@ -300,7 +313,7 @@ tblcalc(struct rofftbl *tbl, const struc > while ((g = *gp) != NULL) { > done = 0; > for (icol = g->startcol; icol <= g->endcol; icol++) { >- if (tbl->cols[icol].width != min1) >+ if (colwidth[icol] != min1) > continue; > if (g->wanted <= wanted - min1) { > tbl->cols[icol].width += g->wanted; >@@ -317,6 +330,7 @@ tblcalc(struct rofftbl *tbl, const struc > gp = &(*gp)->next; > } > } >+ free(colwidth); > > /* > * Align numbers with text.
=================================================================== RCS file: /cvsrepo/anoncvs/cvs/a/out.c,v retrieving revision 1.54 retrieving revision 1.55 --- out.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) --- a/out.c +++ b/out.c @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.82 2021/09/07 17:07:58 schwarze Exp $ */ +/* $OpenBSD: out.c,v 1.55 2021/09/28 17:06:17 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021 @@ -123,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struc const struct tbl_dat *dp; struct roffcol *col; struct tbl_colgroup *first_group, **gp, *g; + size_t *colwidth; size_t ewidth, min1, min2, wanted, width, xwidth; int done, icol, maxcol, necol, nxcol, quirkcol; @@ -256,16 +257,28 @@ tblcalc(struct rofftbl *tbl, const struc gp = &(*gp)->next; } + colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth)); while (first_group != NULL) { /* + * Rebuild the array of the widths of all columns + * participating in spans that require expansion. + */ + + for (icol = 0; icol <= maxcol; icol++) + colwidth[icol] = SIZE_MAX; + for (g = first_group; g != NULL; g = g->next) + for (icol = g->startcol; icol <= g->endcol; icol++) + colwidth[icol] = tbl->cols[icol].width; + + /* * Find the smallest and second smallest column width * among the columns which may need expamsion. */ min1 = min2 = SIZE_MAX; for (icol = 0; icol <= maxcol; icol++) { - width = tbl->cols[icol].width; + width = colwidth[icol]; if (min1 > width) { min2 = min1; min1 = width; @@ -283,7 +296,7 @@ tblcalc(struct rofftbl *tbl, const struc for (g = first_group; g != NULL; g = g->next) { necol = 0; for (icol = g->startcol; icol <= g->endcol; icol++) - if (tbl->cols[icol].width == min1) + if (colwidth[icol] == min1) necol++; if (necol == 0) continue; @@ -300,7 +313,7 @@ tblcalc(struct rofftbl *tbl, const struc while ((g = *gp) != NULL) { done = 0; for (icol = g->startcol; icol <= g->endcol; icol++) { - if (tbl->cols[icol].width != min1) + if (colwidth[icol] != min1) continue; if (g->wanted <= wanted - min1) { tbl->cols[icol].width += g->wanted; @@ -317,6 +330,7 @@ tblcalc(struct rofftbl *tbl, const struc gp = &(*gp)->next; } } + free(colwidth); /* * Align numbers with text.
View Attachment As Raw
Actions:
View
Attachments on
bug 32753
:
14275
|
14307
| 14308