Add SPDX license identifiers to source files under the LGPL

[thirdparty/systemd.git] / src / hwdb / hwdb.c

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index a9539c812a5315a069684c1c68fa808a04413aec..4540260f9b869f4e195184810e0c50c75cb9e810 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -31,6 +32,7 @@
 #include "hwdb-util.h"
 #include "label.h"
 #include "mkdir.h"
+#include "path-util.h"
 #include "selinux-util.h"
 #include "strbuf.h"
 #include "string-util.h"
@@ -402,14 +404,14 @@ static int trie_store(struct trie *trie, const char *filename) {
         t.strings_off = sizeof(struct trie_header_f);
         trie_store_nodes_size(&t, trie->root);
 
-        r = fopen_temporary(filename , &t.f, &filename_tmp);
+        r = fopen_temporary(filename, &t.f, &filename_tmp);
         if (r < 0)
                 return r;
         fchmod(fileno(t.f), 0444);
 
         /* write nodes */
         if (fseeko(t.f, sizeof(struct trie_header_f), SEEK_SET) < 0)
-                goto error;
+                goto error_fclose;
 
         root_off = trie_store_nodes(&t, trie->root);
         h.nodes_root_off = htole64(root_off);
@@ -424,13 +426,20 @@ static int trie_store(struct trie *trie, const char *filename) {
         size = ftello(t.f);
         h.file_size = htole64(size);
         if (fseeko(t.f, 0, SEEK_SET) < 0)
-                goto error;
-
+                goto error_fclose;
         fwrite(&h, sizeof(struct trie_header_f), 1, t.f);
-        if (fclose(t.f) < 0 || rename(filename_tmp, filename) < 0) {
-                unlink_noerrno(filename_tmp);
-                return -errno;
-        }
+
+        if (ferror(t.f))
+                goto error_fclose;
+        if (fflush(t.f) < 0)
+                goto error_fclose;
+        if (fsync(fileno(t.f)) < 0)
+                goto error_fclose;
+        if (rename(filename_tmp, filename) < 0)
+                goto error_fclose;
+
+        /* write succeeded */
+        fclose(t.f);
 
         log_debug("=== trie on-disk ===");
         log_debug("size:             %8"PRIi64" bytes", size);
@@ -445,7 +454,7 @@ static int trie_store(struct trie *trie, const char *filename) {
         log_debug("strings start:    %8"PRIu64, t.strings_off);
         return 0;
 
- error:
+ error_fclose:
         r = -errno;
         fclose(t.f);
         unlink(filename_tmp);
@@ -645,7 +654,7 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
 
         trie->nodes_count++;
 
-        r = conf_files_list_strv(&files, ".hwdb", arg_root, conf_file_dirs);
+        r = conf_files_list_strv(&files, ".hwdb", arg_root, 0, conf_file_dirs);
         if (r < 0)
                 return log_error_errno(r, "Failed to enumerate hwdb files: %m");
 
@@ -670,7 +679,7 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
         log_debug("strings dedup'ed: %8zu bytes (%8zu)",
                   trie->strings->dedup_len, trie->strings->dedup_count);
 
-        hwdb_bin = strjoin(arg_root, "/", arg_hwdb_bin_dir, "/hwdb.bin");
+        hwdb_bin = path_join(arg_root, arg_hwdb_bin_dir, "hwdb.bin");
         if (!hwdb_bin)
                 return -ENOMEM;