X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-util.c;h=b55bf75bfcf0aa21da12cf2e1bed8c5c1cc39d5d;hb=77e68fa2f0bd018bab2621a31919bfaa6a6b0a35;hp=b1c113046ebeb8e4314269bc425b4eb1e5a0d5cd;hpb=cd8651982b497a8be369e0dbc24fe04ec5e83aaa;p=elogind.git

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index b1c113046..b55bf75bf 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -1,13 +1,21 @@
-/*
- * libudev - interface to udev device information
- *
- * Copyright (C) 2008-2011 Kay Sievers <kay.sievers@vrfy.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- */
+/***
+  This file is part of systemd.
+
+  Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -313,14 +321,32 @@ size_t util_strpcpy(char **dest, size_t size, const char *src)
                 if (size > 1)
                         *dest = mempcpy(*dest, src, size-1);
                 size = 0;
-                *dest[0] = '\0';
         } else {
                 if (len > 0) {
                         *dest = mempcpy(*dest, src, len);
                         size -= len;
                 }
-                *dest[0] = '\0';
         }
+        *dest[0] = '\0';
+        return size;
+}
+
+size_t util_strpcpyf(char **dest, size_t size, const char *src, ...)
+{
+        va_list va;
+        int i;
+
+        va_start(va, src);
+        i = vsnprintf(*dest, size, src, va);
+        if (i < (int)size) {
+                *dest += i;
+                size -= i;
+        } else {
+                *dest += size;
+                size = 0;
+        }
+        va_end(va);
+        *dest[0] = '\0';
         return size;
 }
 
@@ -335,7 +361,6 @@ size_t util_strpcpyl(char **dest, size_t size, const char *src, ...)
                 src = va_arg(va, char *);
         } while (src != NULL);
         va_end(va);
-
         return size;
 }
 
@@ -691,23 +716,6 @@ uint64_t util_string_bloom64(const char *str)
         return bits;
 }
 
-#define USEC_PER_SEC  1000000ULL
-#define NSEC_PER_USEC 1000ULL
-unsigned long long ts_usec(const struct timespec *ts)
-{
-        return (unsigned long long) ts->tv_sec * USEC_PER_SEC +
-               (unsigned long long) ts->tv_nsec / NSEC_PER_USEC;
-}
-
-unsigned long long now_usec(void)
-{
-        struct timespec ts;
-
-        if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
-                return 0;
-        return ts_usec(&ts);
-}
-
 ssize_t print_kmsg(const char *fmt, ...)
 {
         int fd;