git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore launch() error in virt-rescue. (RHBZ#618556)
[libguestfs.git]
/
daemon
/
dir.c
diff --git
a/daemon/dir.c
b/daemon/dir.c
index
300bb4c
..
3a4647c
100644
(file)
--- a/
daemon/dir.c
+++ b/
daemon/dir.c
@@
-39,7
+39,7
@@
do_rmdir (const char *path)
CHROOT_OUT;
if (r == -1) {
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("
rmdir:
%s", path);
+ reply_with_perror ("%s", path);
return -1;
}
return -1;
}
@@
-57,7
+57,7
@@
do_rm_rf (const char *path)
char *buf, *err;
if (STREQ (path, "/")) {
char *buf, *err;
if (STREQ (path, "/")) {
- reply_with_error ("
rm -rf:
cannot remove root directory");
+ reply_with_error ("cannot remove root directory");
return -1;
}
return -1;
}
@@
-72,7
+72,7
@@
do_rm_rf (const char *path)
/* rm -rf is never supposed to fail. I/O errors perhaps? */
if (r == -1) {
/* rm -rf is never supposed to fail. I/O errors perhaps? */
if (r == -1) {
- reply_with_error ("
rm -rf:
%s: %s", path, err);
+ reply_with_error ("%s: %s", path, err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-92,7
+92,7
@@
do_mkdir (const char *path)
CHROOT_OUT;
if (r == -1) {
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("
mkdir:
%s", path);
+ reply_with_perror ("%s", path);
return -1;
}
return -1;
}
@@
-104,12
+104,17
@@
do_mkdir_mode (const char *path, int mode)
{
int r;
{
int r;
+ if (mode < 0) {
+ reply_with_error ("%s: mode is negative", path);
+ return -1;
+ }
+
CHROOT_IN;
r = mkdir (path, mode);
CHROOT_OUT;
if (r == -1) {
CHROOT_IN;
r = mkdir (path, mode);
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("
mkdir_mode:
%s", path);
+ reply_with_perror ("%s", path);
return -1;
}
return -1;
}
@@
-174,11
+179,11
@@
do_mkdir_p (const char *path)
CHROOT_OUT;
if (r == -1) {
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("
mkdir -p:
%s", path);
+ reply_with_perror ("%s", path);
return -1;
}
if (r == -2) {
return -1;
}
if (r == -2) {
- reply_with_error ("
mkdir -p:
%s: a path element was not a directory", path);
+ reply_with_error ("%s: a path element was not a directory", path);
return -1;
}
return -1;
}
@@
-221,7
+226,7
@@
do_mkdtemp (const char *template)
CHROOT_OUT;
if (r == NULL) {
CHROOT_OUT;
if (r == NULL) {
- reply_with_perror ("
mkdtemp:
%s", template);
+ reply_with_perror ("%s", template);
free (writable);
}
free (writable);
}