summaryrefslogtreecommitdiffstats
path: root/bin/cp
diff options
context:
space:
mode:
authormaxim <maxim@FreeBSD.org>2006-10-07 12:14:50 +0000
committermaxim <maxim@FreeBSD.org>2006-10-07 12:14:50 +0000
commit1f6d578128bdb774878bd6fd41f2503ec39e7e4a (patch)
treefc3c80123886ef14ecafdedd2510a9a7596da3ad /bin/cp
parenta9cb1cf4c1c019322d972507dbca9d570755222f (diff)
downloadFreeBSD-src-1f6d578128bdb774878bd6fd41f2503ec39e7e4a.zip
FreeBSD-src-1f6d578128bdb774878bd6fd41f2503ec39e7e4a.tar.gz
o Style(9).
Submitted by: bde
Diffstat (limited to 'bin/cp')
-rw-r--r--bin/cp/utils.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 5286c74..7eea8fa 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -62,10 +62,10 @@ copy_file(const FTSENT *entp, int dne)
{
static char buf[MAXBSIZE];
struct stat *fs;
- int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
ssize_t wcount;
size_t wresid;
off_t wtotal;
+ int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0;
char *bufp;
#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
char *p;
@@ -156,10 +156,9 @@ copy_file(const FTSENT *entp, int dne)
if (info) {
info = 0;
(void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
}
if (wcount >= (ssize_t)wresid)
break;
@@ -188,10 +187,9 @@ copy_file(const FTSENT *entp, int dne)
if (info) {
info = 0;
(void)fprintf(stderr,
- "%s -> %s %3d%%\n",
- entp->fts_path, to.p_path,
- cp_pct(wtotal, fs->st_size));
-
+ "%s -> %s %3d%%\n",
+ entp->fts_path, to.p_path,
+ cp_pct(wtotal, fs->st_size));
}
if (wcount >= (ssize_t)wresid)
break;
OpenPOWER on IntegriCloud