X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-util.c;h=51dd017467c6ea577825ceee35ceb1663d31cf0c;hp=3a67b0cd5d0f15a43c75221bc2750a003f1762b8;hb=672ff71911f2a42e6af030c3ef8830f51439b0d0;hpb=28460195c2ae90892bf556aff2b80705a8f37795

diff --git a/libudev/libudev-util.c b/libudev/libudev-util.c
index 3a67b0cd5..51dd01746 100644
--- a/libudev/libudev-util.c
+++ b/libudev/libudev-util.c
@@ -18,6 +18,7 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <time.h>
 #include <sys/stat.h>
 
 #include "libudev.h"
@@ -26,15 +27,16 @@
 static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *syspath, char *value, size_t size)
 {
 	char path[UTIL_PATH_SIZE];
+	char target[UTIL_PATH_SIZE];
 	ssize_t len;
 	const char *pos;
 
 	util_strscpyl(path, sizeof(path), syspath, "/", slink, NULL);
-	len = readlink(path, path, sizeof(path));
-	if (len <= 0 || len == (ssize_t)sizeof(path))
+	len = readlink(path, target, sizeof(target));
+	if (len <= 0 || len == (ssize_t)sizeof(target))
 		return -1;
-	path[len] = '\0';
-	pos = strrchr(path, '/');
+	target[len] = '\0';
+	pos = strrchr(target, '/');
 	if (pos == NULL)
 		return -1;
 	pos = &pos[1];
@@ -87,13 +89,13 @@ int util_log_priority(const char *priority)
 	int prio;
 
 	prio = strtol(priority, &endptr, 10);
-	if (endptr[0] == '\0')
+	if (endptr[0] == '\0' || isspace(endptr[0]))
 		return prio;
 	if (strncmp(priority, "err", 3) == 0)
 		return LOG_ERR;
-	if (strcmp(priority, "info") == 0)
+	if (strncmp(priority, "info", 4) == 0)
 		return LOG_INFO;
-	if (strcmp(priority, "debug") == 0)
+	if (strncmp(priority, "debug", 5) == 0)
 		return LOG_DEBUG;
 	return 0;
 }
@@ -552,3 +554,15 @@ uint64_t util_string_bloom64(const char *str)
 	bits |= 1LLU << ((hash >> 18) & 63);
 	return bits;
 }
+
+#define USEC_PER_SEC  1000000ULL
+#define NSEC_PER_USEC 1000ULL
+unsigned long long usec_monotonic(void)
+{
+	struct timespec ts;
+
+	if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
+		return 0;
+	return (unsigned long long) ts.tv_sec * USEC_PER_SEC +
+	       (unsigned long long) ts.tv_nsec / NSEC_PER_USEC;
+}