git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use safe_malloc and/or check returns from malloc (Jim Meyering).
[libguestfs.git]
/
daemon
/
file.c
diff --git
a/daemon/file.c
b/daemon/file.c
index
d8759f0
..
f910b94
100644
(file)
--- a/
daemon/file.c
+++ b/
daemon/file.c
@@
-18,8
+18,6
@@
#include <config.h>
#include <config.h>
-#define _GNU_SOURCE /* for futimens(2) and getline(3) */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-40,7
+38,7
@@
do_touch (const char *path)
ABS_PATH (path, -1);
CHROOT_IN;
ABS_PATH (path, -1);
CHROOT_IN;
- fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY
| O_NONBLOCK
, 0666);
+ fd = open (path, O_WRONLY | O_CREAT | O_NOCTTY, 0666);
CHROOT_OUT;
if (fd == -1) {
CHROOT_OUT;
if (fd == -1) {
@@
-293,7
+291,7
@@
do_write_file (const char *path, const char *content, int size)
size = strlen (content);
CHROOT_IN;
size = strlen (content);
CHROOT_IN;
- fd = open (path, O_WRONLY | O_
CREAT | O_NOCTTY | O_NONBLOCK
, 0666);
+ fd = open (path, O_WRONLY | O_
TRUNC | O_CREAT | O_NOCTTY
, 0666);
CHROOT_OUT;
if (fd == -1) {
CHROOT_OUT;
if (fd == -1) {
@@
-320,19
+318,24
@@
char *
do_file (const char *path)
{
char *out, *err;
do_file (const char *path)
{
char *out, *err;
- int r, len;
+ int r, len
, freeit = 0
;
char *buf;
char *buf;
- NEED_ROOT
(
NULL);
+ NEED_ROOT
_OR_IS_DEVICE (path,
NULL);
ABS_PATH (path, NULL);
ABS_PATH (path, NULL);
- len = strlen (path) + 9;
- buf = malloc (len);
- if (!buf) {
- reply_with_perror ("malloc");
- return NULL;
+ if (strncmp (path, "/dev/", 5) == 0)
+ buf = (char *) path;
+ else {
+ len = strlen (path) + 9;
+ buf = malloc (len);
+ if (!buf) {
+ reply_with_perror ("malloc");
+ return NULL;
+ }
+ snprintf (buf, len, "/sysroot%s", path);
+ freeit = 1;
}
}
- snprintf (buf, len, "/sysroot%s", path);
/* file(1) manpage claims "file returns 0 on success, and non-zero on
* error", but this is evidently not true. It always returns 0, in
/* file(1) manpage claims "file returns 0 on success, and non-zero on
* error", but this is evidently not true. It always returns 0, in
@@
-340,13
+343,13
@@
do_file (const char *path)
* first.
*/
if (access (buf, R_OK) == -1) {
* first.
*/
if (access (buf, R_OK) == -1) {
- free (buf);
+
if (freeit)
free (buf);
reply_with_perror ("access: %s", path);
return NULL;
}
r = command (&out, &err, "file", "-bsL", buf, NULL);
reply_with_perror ("access: %s", path);
return NULL;
}
r = command (&out, &err, "file", "-bsL", buf, NULL);
- free (buf);
+
if (freeit)
free (buf);
if (r == -1) {
free (out);
if (r == -1) {
free (out);