git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add prototype for timeval_diff.
[libguestfs.git]
/
fish
/
copy.c
diff --git
a/fish/copy.c
b/fish/copy.c
index
5a451a5
..
2aa7c0a
100644
(file)
--- a/
fish/copy.c
+++ b/
fish/copy.c
@@
-22,7
+22,7
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <
assert
.h>
+#include <
limits
.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@
-34,7
+34,7
@@
static int make_tar_output (const char *local, const char *basename);
static int split_path (char *buf, size_t buf_size, const char *path, const char **dirname, const char **basename);
int
static int split_path (char *buf, size_t buf_size, const char *path, const char **dirname, const char **basename);
int
-
do_copy_in (const char *cmd, in
t argc, char *argv[])
+
run_copy_in (const char *cmd, size_
t argc, char *argv[])
{
if (argc < 2) {
fprintf (stderr,
{
if (argc < 2) {
fprintf (stderr,
@@
-177,7
+177,7
@@
tar_create (const char *dir, const char *path)
}
int
}
int
-
do_copy_out (const char *cmd, in
t argc, char *argv[])
+
run_copy_out (const char *cmd, size_
t argc, char *argv[])
{
if (argc < 2) {
fprintf (stderr,
{
if (argc < 2) {
fprintf (stderr,
@@
-192,7
+192,7
@@
do_copy_out (const char *cmd, int argc, char *argv[])
struct stat statbuf;
if (stat (local, &statbuf) == -1 ||
! (S_ISDIR (statbuf.st_mode))) {
struct stat statbuf;
if (stat (local, &statbuf) == -1 ||
! (S_ISDIR (statbuf.st_mode))) {
- fprintf (stderr, _("copy-
in
: target '%s' is not a directory\n"), local);
+ fprintf (stderr, _("copy-
out
: target '%s' is not a directory\n"), local);
return -1;
}
return -1;
}