diff options
| author | Damien Miller <djm@mindrot.org> | 2005-04-03 10:16:39 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-04-03 10:16:39 +1000 |
| commit | 4942de57199424734567879dacad61c00e96ffab (patch) | |
| tree | 54c4e9679a20136d323ed44006877a0c59d57e77 | |
| parent | 3dae15c6111a90a4a7417a34fa47a1cfee16963e (diff) | |
| download | openssh-git-4942de57199424734567879dacad61c00e96ffab.tar.gz | |
- djm@cvs.openbsd.org 2005/04/02 12:41:16
[scp.c]
since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
build
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | scp.c | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -3,6 +3,10 @@ - deraadt@cvs.openbsd.org 2005/03/31 18:39:21 [scp.c] copy argv[] element instead of smashing the one that ps will see; ok otto + - djm@cvs.openbsd.org 2005/04/02 12:41:16 + [scp.c] + since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror + build 20050331 - (dtucker) OpenBSD CVS Sync @@ -2414,4 +2418,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3735 2005/04/03 00:16:11 djm Exp $ +$Id: ChangeLog,v 1.3736 2005/04/03 00:16:39 djm Exp $ @@ -71,7 +71,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.120 2005/03/31 18:39:21 deraadt Exp $"); +RCSID("$OpenBSD: scp.c,v 1.121 2005/04/02 12:41:16 djm Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -367,9 +367,7 @@ toremote(char *targ, int argc, char **argv) if (*targ == 0) targ = "."; - arg = strdup(argv[argc - 1]); - if (!arg) - err(1, "malloc"); + arg = xstrdup(argv[argc - 1]); if ((thost = strrchr(arg, '@'))) { /* user@host */ *thost++ = 0; |