util: factor out reading file into preallocated buffer

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 48b28c486f7ab4316859923747c0c4f38c855bc3..c445d9faedf3fe9e045fe92e888c3309c96bec99 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1512,6 +1512,7 @@ virFileOpenTty;
 virFilePrintf;
 virFileReadAll;
 virFileReadAllQuiet;
+virFileReadBufQuiet;
 virFileReadHeaderFD;
 virFileReadLimFD;
 virFileRelLinkPointsTo;

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 730c08d6957c009db33663f53b5429ea7bef3f8c..4d7b510ce0e8bea199391ebaae07b6e28d815f00 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1401,6 +1401,30 @@ virFileReadAllQuiet(const char *path, int maxlen, char **buf)
     return len;
 }
 
+/* Read @file into preallocated buffer @buf of size @len.
+ * Return value is -errno in case of errors and size
+ * of data read (no trailing zero) in case of success.
+ * If there is more data then @len - 1 then data will be
+ * truncated. */
+int
+virFileReadBufQuiet(const char *file, char *buf, int len)
+{
+    int fd;
+    ssize_t sz;
+
+    fd = open(file, O_RDONLY);
+    if (fd < 0)
+        return -errno;
+
+    sz = saferead(fd, buf, len - 1);
+    VIR_FORCE_CLOSE(fd);
+    if (sz < 0)
+        return -errno;
+
+    buf[sz] = '\0';
+    return sz;
+}
+
 /* Truncate @path and write @str to it.  If @mode is 0, ensure that
    @path exists; otherwise, use @mode if @path must be created.
    Return 0 for success, nonzero for failure.

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 312f22674cf45426d7bc4d54295d6bc56b7b0042..dc62eab3816bbceb702b0292e88f8add47e137f8 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -131,6 +131,8 @@ int virFileReadAll(const char *path, int maxlen, char **buf)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 int virFileReadAllQuiet(const char *path, int maxlen, char **buf)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
+int virFileReadBufQuiet(const char *file, char *buf, int len)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int virFileWriteStr(const char *path, const char *str, mode_t mode)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;

diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index 16e57dba2bc77bf584a45aa602af1a6f997a24c0..3cbaae0b85093678eecbf7b96c5c1cc006429a20 100644 (file)
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -231,15 +231,8 @@ getDMISystemUUID(char *uuid, int len)
     };
 
     while (paths[i]) {
-        int fd = open(paths[i], O_RDONLY);
-        if (fd >= 0) {
-            if (saferead(fd, uuid, len - 1) == len - 1) {
-                uuid[len - 1] = '\0';
-                VIR_FORCE_CLOSE(fd);
-                return 0;
-            }
-            VIR_FORCE_CLOSE(fd);
-        }
+        if (virFileReadBufQuiet(paths[i], uuid, len) == len - 1)
+            return 0;
         i++;
     }