git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
mknod.c
diff --git
a/daemon/mknod.c
b/daemon/mknod.c
index
6ff88ef
..
ee2d1ff
100644
(file)
--- a/
daemon/mknod.c
+++ b/
daemon/mknod.c
@@
-26,9
+26,24
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "
../src/
guestfs_protocol.h"
+#include "guestfs_protocol.h"
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
+
+#ifdef HAVE_MKNOD
+int
+optgroup_mknod_available (void)
+{
+ return 1;
+}
+#else
+int
+optgroup_mknod_available (void)
+{
+ return 0;
+}
+#endif
int
do_mknod (int mode, int devmajor, int devminor, const char *path)
int
do_mknod (int mode, int devmajor, int devminor, const char *path)
@@
-36,19
+51,23
@@
do_mknod (int mode, int devmajor, int devminor, const char *path)
#ifdef HAVE_MKNOD
int r;
#ifdef HAVE_MKNOD
int r;
+ if (mode < 0) {
+ reply_with_error ("%s: mode is negative", path);
+ return -1;
+ }
+
CHROOT_IN;
r = mknod (path, mode, makedev (devmajor, devminor));
CHROOT_OUT;
if (r == -1) {
CHROOT_IN;
r = mknod (path, mode, makedev (devmajor, devminor));
CHROOT_OUT;
if (r == -1) {
- reply_with_perror ("
mknod:
%s", path);
+ reply_with_perror ("%s", path);
return -1;
}
return 0;
#else
return -1;
}
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}