From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 7/7] cp command: handle directories as last argument
Date: Mon, 11 Apr 2011 16:18:41 +0200 [thread overview]
Message-ID: <1302531521-7439-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1302531521-7439-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/cp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/commands/cp.c b/commands/cp.c
index ae8719b..3428105 100644
--- a/commands/cp.c
+++ b/commands/cp.c
@@ -31,6 +31,7 @@
#include <libbb.h>
#include <fs.h>
#include <malloc.h>
+#include <libgen.h>
/**
* @param[in] cmdtp FIXME
@@ -60,7 +61,7 @@ static int do_cp(struct command *cmdtp, int argc, char *argv[])
for (i = 1; i < argc - 1; i++) {
if (last_is_dir) {
char *dst;
- dst = concat_path_file(argv[argc - 1], argv[i]);
+ dst = concat_path_file(argv[argc - 1], basename(argv[i]));
ret = copy_file(argv[i], dst);
if (ret)
goto out;
--
1.7.2.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2011-04-11 14:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-11 14:18 assorted patches Sascha Hauer
2011-04-11 14:18 ` [PATCH 1/7] eth: check the result of edev->get_ethaddr Sascha Hauer
2011-04-11 14:18 ` [PATCH 2/7] net: add a context to the packet handler Sascha Hauer
2011-04-11 14:18 ` [PATCH 3/7] environment: make default env path configurable Sascha Hauer
2011-04-11 14:18 ` [PATCH 4/7] move simple_itoa to libbb so that others can use it Sascha Hauer
2011-04-11 14:18 ` [PATCH 5/7] kfifo: kfifo_put takes a const buffer Sascha Hauer
2011-04-11 14:18 ` [PATCH 6/7] copy_file: handle write return value correctly Sascha Hauer
2011-04-11 14:18 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302531521-7439-8-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox