summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-27 17:26:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-07-27 17:26:17 +0000
commit07ba38eb0c43c6eb8349fed1f7506a152224f2c9 (patch)
treeb17cacfaf14923f29ea1ed57a1d3628886c00b21 /usr.bin
parenteea87f149871d5b3020862c6c8cc276e297a4d06 (diff)
shorten lines
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/scp.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index abc4775f15f..0051e20f0e3 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.77 2001/07/18 16:45:52 mouring Exp $");
+RCSID("$OpenBSD: scp.c,v 1.78 2001/07/27 17:26:16 deraadt Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -129,8 +129,10 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
int pin[2], pout[2], reserved[2];
if (verbose_mode)
- fprintf(stderr, "Executing: program %s host %s, user %s, command %s\n",
- ssh_program, host, remuser ? remuser : "(unspecified)", cmd);
+ fprintf(stderr,
+ "Executing: program %s host %s, user %s, command %s\n",
+ ssh_program, host,
+ remuser ? remuser : "(unspecified)", cmd);
/*
* Reserve two descriptors so that the real pipes won't get
@@ -803,7 +805,8 @@ bad: run_err("%s: %s", np, strerror(errno));
count += amt;
do {
j = read(remin, cp, amt);
- if (j == -1 && (errno == EINTR || errno == EAGAIN)) {
+ if (j == -1 && (errno == EINTR ||
+ errno == EAGAIN)) {
continue;
} else if (j <= 0) {
run_err("%s", j ? strerror(errno) :
@@ -1092,8 +1095,10 @@ progressmeter(int flag)
i = barlength * ratio / 100;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
"|%.*s%*s|", i,
- "*****************************************************************************"
- "*****************************************************************************",
+ "***************************************"
+ "***************************************"
+ "***************************************"
+ "***************************************",
barlength - i, "");
}
i = 0;