diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2012-12-30 04:22:34 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2012-12-30 04:22:34 +0000 |
| commit | 52bf5abd924bc78494905f16ffbd4bd67062240c (patch) | |
| tree | 6d48accafd38ffd900622df8c9eab499d302c36f /contrib/dialog/columns.c | |
| parent | 7e3a527820c0248a0703bbf8809aabef78a41db6 (diff) | |
| download | FreeBSD-src-52bf5abd924bc78494905f16ffbd4bd67062240c.zip FreeBSD-src-52bf5abd924bc78494905f16ffbd4bd67062240c.tar.gz | |
Revert r241818 that updated dialog to 20120706. This turns out to horribly
break mixed form dialogs in conjunction with the FreeBSD termcap, making
the bsdinstall partition editor Add dialog, among other things, completely
nonfunctional. This restores dialog 20110707.
Diffstat (limited to 'contrib/dialog/columns.c')
| -rw-r--r-- | contrib/dialog/columns.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/dialog/columns.c b/contrib/dialog/columns.c index d03761f..8e5620c 100644 --- a/contrib/dialog/columns.c +++ b/contrib/dialog/columns.c @@ -1,5 +1,5 @@ /* - * $Id: columns.c,v 1.10 2011/10/20 20:53:55 tom Exp $ + * $Id: columns.c,v 1.8 2011/06/28 09:26:23 tom Exp $ * * columns.c -- implements column-alignment * @@ -45,7 +45,7 @@ next_row(char **target, int per_row) { char *result = (char *) target; result += per_row; - return (char **) (void *) result; + return (char **) result; } static char * @@ -148,7 +148,6 @@ dlg_align_columns(char **target, int per_row, int num_rows) memcpy(text + offset, *value + offsets[n], (size_t) widths[n]); offset += maxwidth[n] + 1; } - text[realwidth] = 0; *value = text; } |
