summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2006-03-08 13:48:05 +0000
committerMatt Johnston <matt@ucc.asn.au>2006-03-08 13:48:05 +0000
commited824deca7c90770b9fc277cdd4309dcd136176c (patch)
tree3ec22f4440e319b46d00f041e9bdaabf1ef46f34
parent2533fe733bbb818b5e00923c0882fb49009bbe93 (diff)
downloaddropbear-ed824deca7c90770b9fc277cdd4309dcd136176c.tar.gz
some minor cleanups to the uClinux parts
-rw-r--r--scp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/scp.c b/scp.c
index ffc4deb..7ee25f9 100644
--- a/scp.c
+++ b/scp.c
@@ -166,8 +166,8 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
close(reserved[0]);
close(reserved[1]);
- // uClinux needs to build the args here before vforking,
- // otherwise we do it later on.
+ /* uClinux needs to build the args here before vforking,
+ otherwise we do it later on. */
#ifdef __uClinux__
args.list[0] = ssh_program;
if (remuser != NULL)
@@ -212,17 +212,17 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
#ifdef __uClinux__
/* clean up command */
/* pop cmd */
- free(args->list[--args->num]);
+ xfree(args->list[--args->num]);
args->list[args->num]=NULL;
/* pop host */
- free(args->list[--args->num-1]);
+ xfree(args->list[--args->num-1]);
args->list[args->num]=NULL;
/* pop user */
if (remuser != NULL) {
- free(args->list[--args->num-1]);
+ xfree(args->list[--args->num-1]);
args->list[args->num]=NULL;
}
-#endif /* __uClinux__
+#endif /* __uClinux__ */
/* Parent. Close the other side, and return the local side. */
close(pin[0]);