X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-vacuum.c;h=832c327b3101d3e3b56740a48ab17396628e2083;hb=56e6c2abb8f18bba2bb9d96d66ac7e633349ddfb;hp=d141fe0ffb57800095704fee6b0e37dede6f7e5e;hpb=332076b45b8a78f018ade2dfdc7e4279a56d49cc;p=elogind.git

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index d141fe0ff..832c327b3 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -75,9 +75,8 @@ static void patch_realtime(
                 const struct stat *st,
                 unsigned long long *realtime) {
 
-        usec_t x;
-        uint64_t crtime;
         _cleanup_free_ const char *path = NULL;
+        usec_t x, crtime;
 
         /* The timestamp was determined by the file name, but let's
          * see if the file might actually be older than the file name
@@ -112,10 +111,8 @@ static void patch_realtime(
         if (!path)
                 return;
 
-        if (getxattr(path, "user.crtime_usec", &crtime, sizeof(crtime)) == sizeof(crtime)) {
-                crtime = le64toh(crtime);
-
-                if (crtime > 0 && crtime != (uint64_t) -1 && crtime < *realtime)
+        if (path_getcrtime(path, &crtime) >= 0) {
+                if (crtime < *realtime)
                         *realtime = crtime;
         }
 }
@@ -275,7 +272,7 @@ int journal_directory_vacuum(
                                 log_full(verbose ? LOG_INFO : LOG_DEBUG, "Deleted empty archived journal %s/%s (%s).", directory, p, format_bytes(sbytes, sizeof(sbytes), size));
                                 freed += size;
                         } else if (errno != ENOENT)
-                                log_warning("Failed to delete empty archived journal %s/%s: %m", directory, p);
+                                log_warning_errno(errno, "Failed to delete empty archived journal %s/%s: %m", directory, p);
 
                         free(p);
                         continue;
@@ -283,7 +280,11 @@ int journal_directory_vacuum(
 
                 patch_realtime(directory, p, &st, &realtime);
 
-                GREEDY_REALLOC(list, n_allocated, n_list + 1);
+                if (!GREEDY_REALLOC(list, n_allocated, n_list + 1)) {
+                        free(p);
+                        r = -ENOMEM;
+                        goto finish;
+                }
 
                 list[n_list].filename = p;
                 list[n_list].usage = 512UL * (uint64_t) st.st_blocks;
@@ -314,7 +315,7 @@ int journal_directory_vacuum(
                                 sum = 0;
 
                 } else if (errno != ENOENT)
-                        log_warning("Failed to delete archived journal %s/%s: %m", directory, list[i].filename);
+                        log_warning_errno(errno, "Failed to delete archived journal %s/%s: %m", directory, list[i].filename);
         }
 
         if (oldest_usec && i < n_list && (*oldest_usec == 0 || list[i].realtime < *oldest_usec))