git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inspect: Generic parsing of MAJOR.MINOR in product names.
[libguestfs.git]
/
fish
/
copy.c
diff --git
a/fish/copy.c
b/fish/copy.c
index
944f4cc
..
f5edad1
100644
(file)
--- a/
fish/copy.c
+++ b/
fish/copy.c
@@
-22,7
+22,6
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <assert.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>
@@
-31,10
+30,10
@@
static int make_tar_from_local (const char *local);
static int make_tar_output (const char *local, const char *basename);
static int make_tar_from_local (const char *local);
static int make_tar_output (const char *local, const char *basename);
-static int split_path (char *buf, size_t buf_size, const char *path, c
har **dirname,
char **basename);
+static int split_path (char *buf, size_t buf_size, const char *path, c
onst char **dirname, const
char **basename);
int
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,
@@
-119,7
+118,7
@@
make_tar_from_local (const char *local)
close (fd[1]);
char buf[PATH_MAX];
close (fd[1]);
char buf[PATH_MAX];
- char *dirname, *basename;
+ c
onst c
har *dirname, *basename;
if (split_path (buf, sizeof buf, local, &dirname, &basename) == -1)
_exit (EXIT_FAILURE);
if (split_path (buf, sizeof buf, local, &dirname, &basename) == -1)
_exit (EXIT_FAILURE);
@@
-132,7
+131,7
@@
make_tar_from_local (const char *local)
*/
static int
split_path (char *buf, size_t buf_size,
*/
static int
split_path (char *buf, size_t buf_size,
- const char *path, c
har **dirname,
char **basename)
+ const char *path, c
onst char **dirname, const
char **basename)
{
size_t len = strlen (path);
if (len == 0 || len > buf_size - 1) {
{
size_t len = strlen (path);
if (len == 0 || len > buf_size - 1) {
@@
-154,7
+153,7
@@
split_path (char *buf, size_t buf_size,
if (dirname) *dirname = buf;
if (basename) *basename = p;
} else if (p && p == buf) { /* "/foo" */
if (dirname) *dirname = buf;
if (basename) *basename = p;
} else if (p && p == buf) { /* "/foo" */
- if (dirname) *dirname =
bad_cast ("/")
;
+ if (dirname) *dirname =
"/"
;
if (basename) *basename = buf+1;
} else {
if (dirname) *dirname = NULL;
if (basename) *basename = buf+1;
} else {
if (dirname) *dirname = NULL;
@@
-177,7
+176,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,
@@
-207,7
+206,7
@@
do_copy_out (const char *cmd, int argc, char *argv[])
return -1;
if (r == 1) { /* is file */
char buf[PATH_MAX];
return -1;
if (r == 1) { /* is file */
char buf[PATH_MAX];
- char *basename;
+ c
onst c
har *basename;
if (split_path (buf, sizeof buf, argv[i], NULL, &basename) == -1)
return -1;
if (split_path (buf, sizeof buf, argv[i], NULL, &basename) == -1)
return -1;
@@
-228,7
+227,7
@@
do_copy_out (const char *cmd, int argc, char *argv[])
}
char buf[PATH_MAX];
}
char buf[PATH_MAX];
- char *basename;
+ c
onst c
har *basename;
if (split_path (buf, sizeof buf, argv[i], NULL, &basename) == -1)
return -1;
if (split_path (buf, sizeof buf, argv[i], NULL, &basename) == -1)
return -1;