summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/scp.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>1999-11-24 19:53:43 +0000
committermarkus <markus@openbsd.org>1999-11-24 19:53:43 +0000
commitbbc3e7c1e8e1af65828ac62d704e08603bfb3791 (patch)
tree4283772edb80175f48931910dc69d6bca31941f2 /usr.bin/ssh/scp.c
parentLimit newaliases to root and trusted users; sendmail+gshapiro@sendmail.orG (diff)
downloadwireguard-openbsd-bbc3e7c1e8e1af65828ac62d704e08603bfb3791.tar.xz
wireguard-openbsd-bbc3e7c1e8e1af65828ac62d704e08603bfb3791.zip
KNF, final part 3
Diffstat (limited to 'usr.bin/ssh/scp.c')
-rw-r--r--usr.bin/ssh/scp.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index f5f53e7ad3b..d046409593a 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -45,7 +45,7 @@
*/
#include "includes.h"
-RCSID("$Id: scp.c,v 1.19 1999/11/24 00:26:03 deraadt Exp $");
+RCSID("$Id: scp.c,v 1.20 1999/11/24 19:53:50 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -97,9 +97,11 @@ char *identity = NULL;
/* This is the port to use in contacting the remote site (is non-NULL). */
char *port = NULL;
-/* This function executes the given command as the specified user on the given
- host. This returns < 0 if execution fails, and >= 0 otherwise.
- This assigns the input and output file descriptors on success. */
+/*
+ * This function executes the given command as the specified user on the
+ * given host. This returns < 0 if execution fails, and >= 0 otherwise. This
+ * assigns the input and output file descriptors on success.
+ */
int
do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
@@ -110,8 +112,10 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
fprintf(stderr, "Executing: host %s, user %s, command %s\n",
host, remuser ? remuser : "(unspecified)", cmd);
- /* Reserve two descriptors so that the real pipes won't get
- descriptors 0 and 1 because that will screw up dup2 below. */
+ /*
+ * Reserve two descriptors so that the real pipes won't get
+ * descriptors 0 and 1 because that will screw up dup2 below.
+ */
pipe(reserved);
/* Create a socket pair for communicating with ssh. */
@@ -970,7 +974,7 @@ run_err(const char *fmt,...)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scp.c,v 1.19 1999/11/24 00:26:03 deraadt Exp $
+ * $Id: scp.c,v 1.20 1999/11/24 19:53:50 markus Exp $
*/
char *