switch tools and volume_id from LGPL to GPLv2

[elogind.git] / udev_libc_wrapper.c

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 0dafe4d077bb344bdd7dc95adf260f6d822742ca..4e9f9f1fe87108625ae539fbf4823a8a1b061ed4 100644 (file)
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -27,20 +27,24 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include "../udev_libc_wrapper.h"
-#include "../udev.h"
-#include "../udev_utils.h"
-#include "../logging.h"
+#include "udev_libc_wrapper.h"
+#include "udev.h"
+#include "udev_utils.h"
+#include "logging.h"
 
 #ifdef __KLIBC__
 #define __OWN_USERDB_PARSER__
 #endif
 
+#ifdef __GLIBC__
+#define __OWN_STRLCPYCAT__
+#endif
+
 #ifdef USE_STATIC
 #define __OWN_USERDB_PARSER__
 #endif
 
-#ifndef strlcpy
+#ifdef __OWN_STRLCPYCAT__
 size_t strlcpy(char *dst, const char *src, size_t size)
 {
        size_t bytes = 0;
@@ -49,17 +53,18 @@ size_t strlcpy(char *dst, const char *src, size_t size)
        char ch;
 
        while ((ch = *p++)) {
-               if (bytes < size)
+               if (bytes+1 < size)
                        *q++ = ch;
                bytes++;
        }
 
-       *q = '\0';
+       /* If size == 0 there is no space for a final null... */
+       if (size)
+               *q = '\0';
+
        return bytes;
 }
-#endif
 
-#ifndef strlcat
 size_t strlcat(char *dst, const char *src, size_t size)
 {
        size_t bytes = 0;
@@ -71,9 +76,11 @@ size_t strlcat(char *dst, const char *src, size_t size)
                q++;
                bytes++;
        }
+       if (bytes == size)
+               return (bytes + strlen(src));
 
        while ((ch = *p++)) {
-               if (bytes < size)
+               if (bytes+1 < size)
                *q++ = ch;
                bytes++;
        }
@@ -81,7 +88,7 @@ size_t strlcat(char *dst, const char *src, size_t size)
        *q = '\0';
        return bytes;
 }
-#endif
+#endif /* __OWN_STRLCPYCAT__ */
 
 #ifndef __OWN_USERDB_PARSER__
 #include <sys/types.h>
@@ -140,7 +147,7 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
                dbg("can't open '%s' as db file", dbfile);
                return 0;
        }
-       dbg("reading '%s' as db file", dbfile);
+       dbg("search '%s' in '%s'", uname, dbfile);
 
        /* loop through the whole file */
        cur = 0;
@@ -152,7 +159,8 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
                if (count >= sizeof(line))
                        continue;
 
-               strlcpy(line, bufline, count);
+               memcpy(line, bufline, count-1);
+               line[count-1] = '\0';
                pos = line;
 
                /* get name */