jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 19:52:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Round up before checking if the width is smaller than the widest

Browse Source 
column, otherwise we may divide by zero later.

PR:		26283
Reviewed by:	roam
This commit is contained in:
David Malone 2001-04-03 18:03:29 +00:00
parent 9a44dfa794
commit 983e044ad8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=75137
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/column/column.c
View File

@ -29,6 +29,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifndef lint
@ -52,6 +54,8 @@ static const char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#include <string.h>
#include <unistd.h>
#define TAB 8
void c_columnate __P((void));
void *emalloc __P((int));
void input __P((FILE *));
@ -120,6 +124,7 @@ main(argc, argv)
if (!entries)
exit(eval);
maxlength = (maxlength + TAB) & ~(TAB - 1);
if (tflag)
maketbl();
else if (maxlength >= termwidth)
@ -131,14 +136,12 @@ main(argc, argv)
exit(eval);
}
#define TAB 8
void
c_columnate()
{
int chcnt, col, cnt, endcol, numcols;
char **lp;
maxlength = (maxlength + TAB) & ~(TAB - 1);
numcols = termwidth / maxlength;
endcol = maxlength;
for (chcnt = col = 0, lp = list;; ++lp) {
@ -166,7 +169,6 @@ r_columnate()
{
int base, chcnt, cnt, col, endcol, numcols, numrows, row;
maxlength = (maxlength + TAB) & ~(TAB - 1);
numcols = termwidth / maxlength;
numrows = entries / numcols;
if (entries % numcols)