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
/
readdir.c
diff --git
a/daemon/readdir.c
b/daemon/readdir.c
index
cea6fdd
..
876041e
100644
(file)
--- a/
daemon/readdir.c
+++ b/
daemon/readdir.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-28,7
+28,7
@@
#include "actions.h"
guestfs_int_dirent_list *
#include "actions.h"
guestfs_int_dirent_list *
-do_readdir (char *path)
+do_readdir (c
onst c
har *path)
{
guestfs_int_dirent_list *ret;
guestfs_int_dirent v;
{
guestfs_int_dirent_list *ret;
guestfs_int_dirent v;
@@
-36,9
+36,6
@@
do_readdir (char *path)
struct dirent *d;
int i;
struct dirent *d;
int i;
- NEED_ROOT (NULL);
- ABS_PATH (path, NULL);
-
ret = malloc (sizeof *ret);
if (ret == NULL) {
reply_with_perror ("malloc");
ret = malloc (sizeof *ret);
if (ret == NULL) {
reply_with_perror ("malloc");
@@
-63,11
+60,13
@@
do_readdir (char *path)
guestfs_int_dirent *p;
p = realloc (ret->guestfs_int_dirent_list_val,
guestfs_int_dirent *p;
p = realloc (ret->guestfs_int_dirent_list_val,
- sizeof (guestfs_int_dirent) * (i+1));
+
sizeof (guestfs_int_dirent) * (i+1));
v.name = strdup (d->d_name);
if (!p || !v.name) {
reply_with_perror ("allocate");
free (ret->guestfs_int_dirent_list_val);
v.name = strdup (d->d_name);
if (!p || !v.name) {
reply_with_perror ("allocate");
free (ret->guestfs_int_dirent_list_val);
+ free (p);
+ free (v.name);
free (ret);
closedir (dir);
return NULL;
free (ret);
closedir (dir);
return NULL;
@@
-75,6
+74,7
@@
do_readdir (char *path)
ret->guestfs_int_dirent_list_val = p;
v.ino = d->d_ino;
ret->guestfs_int_dirent_list_val = p;
v.ino = d->d_ino;
+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
switch (d->d_type) {
case DT_BLK: v.ftyp = 'b'; break;
case DT_CHR: v.ftyp = 'c'; break;
switch (d->d_type) {
case DT_BLK: v.ftyp = 'b'; break;
case DT_CHR: v.ftyp = 'c'; break;
@@
-86,6
+86,9
@@
do_readdir (char *path)
case DT_UNKNOWN: v.ftyp = 'u'; break;
default: v.ftyp = '?'; break;
}
case DT_UNKNOWN: v.ftyp = 'u'; break;
default: v.ftyp = '?'; break;
}
+#else
+ v.ftyp = 'u';
+#endif
ret->guestfs_int_dirent_list_val[i] = v;
ret->guestfs_int_dirent_list_val[i] = v;