packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Port object listing func to use libglnx more + new style 

This did a `closedir` in the `goto out` section before, but it
turns out more nicely if we follow the usual pattern of doing
the `open(O_DIRECTORY)` in the callee function and handle `ENOENT`
there.

Closes: #809
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-04-25 11:37:16 -04:00 committed by Atomic Bot
parent e8efd1c8dc
commit 8d58ab1002
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/libostree/ostree-repo.c
View File

@ -2364,39 +2364,45 @@ ostree_repo_get_parent (OstreeRepo *self)
static gboolean static gboolean
list_loose_objects_at (OstreeRepo *self, list_loose_objects_at (OstreeRepo *self,
GHashTable *inout_objects, GHashTable *inout_objects,
const char *prefix,
int dfd, int dfd,
const char *prefix,
const char *commit_starting_with, const char *commit_starting_with,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE;
DIR *d = NULL;
struct dirent *dent;
GVariant *key, *value; GVariant *key, *value;
d = fdopendir (dfd); glnx_fd_close int target_dfd = glnx_opendirat_with_errno (dfd, prefix, FALSE);
if (!d) if (target_dfd < 0)
{ {
glnx_set_error_from_errno (error); /* Nothing to do if this dir doesn't exist */
goto out; if (errno == ENOENT)
return TRUE;
return glnx_throw_errno (error);
} }
g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
if (!glnx_dirfd_iterator_init_take_fd (target_dfd, &dfd_iter, error))
return FALSE;
while ((dent = readdir (d)) != NULL) while (TRUE)
{ {
const char *name = dent->d_name; struct dirent *dent;
const char *dot;
OstreeObjectType objtype;
char buf[OSTREE_SHA256_STRING_LEN+1];
if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
return FALSE;
if (dent == NULL)
break;
const char *name = dent->d_name;
if (strcmp (name, ".") == 0 || if (strcmp (name, ".") == 0 ||
strcmp (name, "..") == 0) strcmp (name, "..") == 0)
continue; continue;
dot = strrchr (name, '.'); const char *dot = strrchr (name, '.');
if (!dot) if (!dot)
continue; continue;
OstreeObjectType objtype;
if ((self->mode == OSTREE_REPO_MODE_ARCHIVE_Z2 if ((self->mode == OSTREE_REPO_MODE_ARCHIVE_Z2
&& strcmp (dot, ".filez") == 0) || && strcmp (dot, ".filez") == 0) ||
((_ostree_repo_mode_is_bare (self->mode)) ((_ostree_repo_mode_is_bare (self->mode))
@ -2414,6 +2420,8 @@ list_loose_objects_at (OstreeRepo *self,
if ((dot - name) != 62) if ((dot - name) != 62)
continue; continue;
char buf[OSTREE_SHA256_STRING_LEN+1];
memcpy (buf, prefix, 2); memcpy (buf, prefix, 2);
memcpy (buf + 2, name, 62); memcpy (buf + 2, name, 62);
buf[sizeof(buf)-1] = '\0'; buf[sizeof(buf)-1] = '\0';
@ -2440,11 +2448,7 @@ list_loose_objects_at (OstreeRepo *self,
g_variant_ref_sink (value)); g_variant_ref_sink (value));
} }
ret = TRUE; return TRUE;
out:
if (d)
(void) closedir (d);
return ret;
} }
static gboolean static gboolean
@ -2454,26 +2458,15 @@ list_loose_objects (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
guint c;
int dfd = -1;
static const gchar hexchars[] = "0123456789abcdef"; static const gchar hexchars[] = "0123456789abcdef";
for (c = 0; c < 256; c++) for (guint c = 0; c < 256; c++)
{ {
char buf[3]; char buf[3];
buf[0] = hexchars[c >> 4]; buf[0] = hexchars[c >> 4];
buf[1] = hexchars[c & 0xF]; buf[1] = hexchars[c & 0xF];
buf[2] = '\0'; buf[2] = '\0';
dfd = glnx_opendirat_with_errno (self->objects_dir_fd, buf, FALSE); if (!list_loose_objects_at (self, inout_objects, self->objects_dir_fd, buf,
if (dfd == -1)
{
if (errno == ENOENT)
continue;
else
return glnx_throw_errno (error);
}
/* Takes ownership of dfd */
if (!list_loose_objects_at (self, inout_objects, buf, dfd,
commit_starting_with, commit_starting_with,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;