Page MenuHomeFreeBSD
Files F140915903

D9137.id24138.diff
No OneTemporary
Actions

D9137.id24138.diff
View Options

Index: etc/mtree/BSD.tests.dist
===================================================================
--- etc/mtree/BSD.tests.dist
+++ etc/mtree/BSD.tests.dist
@@ -634,6 +634,8 @@
..
opensm
..
+ pr
+ ..
printf
..
sdiff
Index: usr.bin/pr/Makefile
===================================================================
--- usr.bin/pr/Makefile
+++ usr.bin/pr/Makefile
@@ -1,7 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= pr
SRCS= pr.c egetopt.c
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Index: usr.bin/pr/pr.c
===================================================================
--- usr.bin/pr/pr.c
+++ usr.bin/pr/pr.c
@@ -103,7 +103,7 @@
static int sflag; /* -s option for multiple columns */
static int nohead; /* do not write head and trailer */
static int pgwd; /* page width with multiple col output */
-static const char *timefrmt; /* time conversion string */
+static char *timefrmt; /* time conversion string */
/*
* misc globals
@@ -135,6 +135,7 @@
ret_val = horzcol(argc, argv);
else
ret_val = vertcol(argc, argv);
+ free(timefrmt);
} else
usage();
flsh_errs();
@@ -207,6 +208,7 @@
* allocate header buffer
*/
if ((hbuf = malloc((unsigned)(HDBUF + offst)*sizeof(char))) == NULL) {
+ free(obuf);
mfail();
return(1);
}
@@ -259,7 +261,7 @@
break;
if (!linecnt && !nohead &&
prhead(hbuf, fname, pagecnt))
- return(1);
+ goto err;
/*
* start of new line.
@@ -268,9 +270,9 @@
if (num)
addnum(nbuf, num, ++lncnt);
if (otln(obuf,cnt+off, &ips, &ops, mor))
- return(1);
+ goto err;
} else if (otln(lbuf, cnt, &ips, &ops, mor))
- return(1);
+ goto err;
/*
* if line bigger than buffer, get more
@@ -293,7 +295,7 @@
* fill to end of page
*/
if (linecnt && prtail(lines-linecnt-lrgln, lrgln))
- return(1);
+ goto err;
/*
* On EOF go to next file
@@ -306,8 +308,14 @@
(void)fclose(inf);
}
if (eoptind < argc)
- return(1);
+ goto err;
+ free(hbuf);
+ free(obuf);
return(0);
+err:
+ free(hbuf);
+ free(obuf);
+ return(1);
}
/*
@@ -317,27 +325,27 @@
vertcol(int argc, char *argv[])
{
char *ptbf;
- char **lstdat;
+ char **lstdat = NULL;
int i;
int j;
int cnt = -1;
int pln;
- int *indy;
+ int *indy = NULL;
int cvc;
- int *lindy;
+ int *lindy = NULL;
int lncnt;
int stp;
int pagecnt;
int col = colwd + 1;
int mxlen = pgwd + offst + 1;
int mclcnt = clcnt - 1;
- struct vcol *vc;
+ struct vcol *vc = NULL;
int mvc;
int tvc;
int cw = nmwd + 1;
int fullcol;
- char *buf;
- char *hbuf;
+ char *buf = NULL;
+ char *hbuf = NULL;
char *ohbuf;
const char *fname;
FILE *inf;
@@ -345,6 +353,7 @@
int cps = 0;
int ops = 0;
int mor = 0;
+ int retval = 0;
/*
* allocate page buffer
@@ -359,7 +368,8 @@
*/
if ((hbuf = malloc((unsigned)(HDBUF + offst)*sizeof(char))) == NULL) {
mfail();
- return(1);
+ retval = 1;
+ goto out;
}
ohbuf = hbuf + offst;
if (offst)
@@ -372,7 +382,8 @@
if ((vc =
(struct vcol *)malloc((unsigned)mvc*sizeof(struct vcol))) == NULL) {
mfail();
- return(1);
+ retval = 1;
+ goto out;
}
/*
@@ -380,7 +391,8 @@
*/
if ((lstdat = (char **)malloc((unsigned)lines*sizeof(char *))) == NULL){
mfail();
- return(1);
+ retval = 1;
+ goto out;
}
/*
@@ -388,11 +400,13 @@
*/
if ((indy = (int *)malloc((unsigned)lines*sizeof(int))) == NULL) {
mfail();
- return(1);
+ retval = 1;
+ goto out;
}
if ((lindy = (int *)malloc((unsigned)lines*sizeof(int))) == NULL) {
mfail();
- return(1);
+ retval = 1;
+ goto out;
}
if (nmwd)
@@ -532,13 +546,18 @@
/*
* print header
*/
- if (!nohead && prhead(hbuf, fname, pagecnt))
- return(1);
+ if (!nohead && prhead(hbuf, fname, pagecnt)) {
+ retval = 1;
+ goto out;
+ }
for (i = 0; i < pln; ++i) {
ips = 0;
ops = 0;
- if (offst&& otln(buf,offst,&ips,&ops,1))
- return(1);
+ if (offst &&
+ otln(buf,offst,&ips,&ops,1)) {
+ retval = 1;
+ goto out;
+ }
tvc = i;
for (j = 0; j < clcnt; ++j) {
@@ -562,8 +581,10 @@
} else
cnt = fullcol;
if (otln(vc[tvc].pt, cnt, &ips,
- &ops, 1))
- return(1);
+ &ops, 1)) {
+ retval = 1;
+ goto out;
+ }
tvc += pln;
if (tvc >= cvc)
break;
@@ -571,14 +592,18 @@
/*
* terminate line
*/
- if (otln(buf, 0, &ips, &ops, 0))
- return(1);
+ if (otln(buf, 0, &ips, &ops, 0)) {
+ retval = 1;
+ goto out;
+ }
}
/*
* pad to end of page
*/
- if (prtail((lines - pln), 0))
- return(1);
+ if (prtail((lines - pln), 0)) {
+ retval = 1;
+ goto out;
+ }
/*
* done with output, go to next file
*/
@@ -596,8 +621,10 @@
/*
* print header
*/
- if (pln && !nohead && prhead(hbuf, fname, pagecnt))
- return(1);
+ if (pln && !nohead && prhead(hbuf, fname, pagecnt)) {
+ retval = 1;
+ goto out;
+ }
/*
* output each line
@@ -606,15 +633,19 @@
ptbf = buf + lindy[i];
if ((j = lstdat[i] - ptbf) <= offst)
break;
- if (otln(ptbf, j, &ips, &ops, 0))
- return(1);
+ if (otln(ptbf, j, &ips, &ops, 0)) {
+ retval = 1;
+ goto out;
+ }
}
/*
* pad to end of page
*/
- if (pln && prtail((lines - pln), 0))
- return(1);
+ if (pln && prtail((lines - pln), 0)) {
+ retval = 1;
+ goto out;
+ }
/*
* if EOF go to next file
@@ -627,8 +658,15 @@
(void)fclose(inf);
}
if (eoptind < argc)
- return(1);
- return(0);
+ retval = 1;
+out:
+ free(lindy);
+ free(indy);
+ free(lstdat);
+ free(vc);
+ free(hbuf);
+ free(buf);
+ return(retval);
}
/*
@@ -665,6 +703,7 @@
* page header
*/
if ((hbuf = malloc((unsigned)(HDBUF + offst)*sizeof(char))) == NULL) {
+ free(buf);
mfail();
return(1);
}
@@ -744,19 +783,19 @@
break;
if (!i && !nohead &&
prhead(hbuf, fname, pagecnt))
- return(1);
+ goto err;
/*
* output line
*/
if (otln(buf, j, &ips, &ops, 0))
- return(1);
+ goto err;
}
/*
* pad to end of page
*/
if (i && prtail(lines-i, 0))
- return(1);
+ goto err;
/*
* if EOF go to next file
@@ -769,8 +808,14 @@
(void)fclose(inf);
}
if (eoptind < argc)
- return(1);
+ goto err;
+ free(hbuf);
+ free(buf);
return(0);
+err:
+ free(hbuf);
+ free(buf);
+ return(1);
}
/*
@@ -792,7 +837,7 @@
int col;
int pagecnt;
int fproc;
- char *buf;
+ char *buf = NULL;
char *hbuf;
char *ohbuf;
const char *fname;
@@ -813,6 +858,7 @@
* page header
*/
if ((hbuf = malloc((unsigned)(HDBUF + offst)*sizeof(char))) == NULL) {
+ free(fbuf);
mfail();
return(1);
}
@@ -838,7 +884,7 @@
* if no files, exit
*/
if (!j)
- return(1);
+ goto err;
/*
* calculate page boundaries based on open file count
@@ -854,7 +900,7 @@
if (colwd < 1) {
(void)fprintf(err,
"pr: page width too small for %d columns\n", clcnt);
- return(1);
+ goto err;
}
actf = clcnt;
col = colwd + 1;
@@ -864,7 +910,7 @@
*/
if ((buf = malloc((unsigned)(pgwd+offst+1)*sizeof(char))) == NULL) {
mfail();
- return(1);
+ goto err;
}
if (offst) {
(void)memset(buf, (int)' ', offst);
@@ -951,13 +997,13 @@
break;
if (!i && !nohead && prhead(hbuf, fname, pagecnt))
- return(1);
+ goto err;
/*
* output line
*/
if (otln(buf, j, &ips, &ops, 0))
- return(1);
+ goto err;
/*
* if no more active files, done
@@ -972,12 +1018,20 @@
* pad to end of page
*/
if (i && prtail(lines-i, 0))
- return(1);
+ goto err;
++pagecnt;
}
if (eoptind < argc)
- return(1);
+ goto err;
+ free(buf);
+ free(hbuf);
+ free(fbuf);
return(0);
+err:
+ free(buf);
+ free(hbuf);
+ free(fbuf);
+ return(1);
}
/*
@@ -1344,6 +1398,7 @@
(void)fprintf(err,
"pr: cannot get time of day, %s\n",
strerror(errno));
+ fclose(inf);
return(NULL);
}
timeptr = localtime(&tv_sec);
@@ -1354,6 +1409,7 @@
(void)fprintf(err,
"pr: cannot stat %s, %s\n",
argv[eoptind], strerror(errno));
+ fclose(inf);
return(NULL);
}
timeptr = localtime(&(statbuf.st_mtime));
@@ -1725,7 +1781,9 @@
break;
case 'w':
++wflag;
- if (!isdigit((unsigned char)*eoptarg) || ((pgwd = atoi(eoptarg)) < 1)){
+ if ((eoptarg == NULL ) ||
+ !isdigit((unsigned char)*eoptarg) ||
+ ((pgwd = atoi(eoptarg)) < 1)){
(void)fputs(
"pr: -w width must be 1 or more \n",err);
return(1);
Index: usr.bin/pr/tests/Makefile
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PACKAGE= tests
+
+ATF_TESTS_SH+= basic2
+NETBSD_ATF_TESTS_SH= basic
+
+${PACKAGE}FILES+= across.out
+${PACKAGE}FILES+= d_basic.in
+${PACKAGE}FILES+= d_basic.out
+${PACKAGE}FILES+= merge.out
+${PACKAGE}FILES+= other.in
+${PACKAGE}FILES+= threecol.out
+
+.include <netbsd-tests.test.mk>
+
+.include <bsd.test.mk>
Index: usr.bin/pr/tests/across.out
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/across.out
@@ -0,0 +1,2 @@
+987 654 321 ghi def abc
+foo bar baz
Index: usr.bin/pr/tests/basic2.sh
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/basic2.sh
@@ -0,0 +1,59 @@
+# Copyright (c) 2017 Alan Somers
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT 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$
+
+atf_test_case across
+across_head() {
+ atf_set "descr" "Format columns in round-robin order with pr -a"
+}
+across_body() {
+ atf_check -s exit:0 -o file:$(atf_get_srcdir)/across.out \
+ -x "pr -t -a -2 $(atf_get_srcdir)/other.in"
+}
+
+atf_test_case merge
+merge_head() {
+ atf_set "descr" "Merge two files with pr -m"
+}
+merge_body() {
+ atf_check -s ignore -o file:$(atf_get_srcdir)/merge.out \
+ pr -t -m $(atf_get_srcdir)/d_basic.in $(atf_get_srcdir)/other.in
+}
+
+atf_test_case threecol
+threecol_head() {
+ atf_set "descr" "Format a file with three columns"
+}
+threecol_body() {
+ atf_check -s ignore -o file:$(atf_get_srcdir)/threecol.out \
+ pr -t -3 $(atf_get_srcdir)/other.in
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case across
+ atf_add_test_case merge
+ atf_add_test_case threecol
+}
Index: usr.bin/pr/tests/merge.out
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/merge.out
@@ -0,0 +1,3 @@
+123 456 789 987 654 321
+abc def ghi ghi def abc
+ foo bar baz
Index: usr.bin/pr/tests/other.in
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/other.in
@@ -0,0 +1,3 @@
+987 654 321
+ghi def abc
+foo bar baz
Index: usr.bin/pr/tests/threecol.out
===================================================================
--- /dev/null
+++ usr.bin/pr/tests/threecol.out
@@ -0,0 +1 @@
+987 654 321 ghi def abc foo bar baz

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 30, 2:48 PM (9 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27386098
Default Alt Text
D9137.id24138.diff (12 KB)

Event Timeline