volume_id: rename subdirectory

[elogind.git] / udev_libc_wrapper.c

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 0dafe4d077bb344bdd7dc95adf260f6d822742ca..1711811e83f0483fadc94e8a46a39c0876f50285 100644 (file)
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -25,22 +25,24 @@
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/types.h>
 
-#include "../udev_libc_wrapper.h"
-#include "../udev.h"
-#include "../udev_utils.h"
-#include "../logging.h"
+#include "udev.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 +51,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 +74,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 +86,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>
@@ -95,7 +100,7 @@ uid_t lookup_user(const char *user)
 
        pw = getpwnam(user);
        if (pw == NULL)
-               dbg("specified user unknown '%s'", user);
+               info("specified user unknown '%s'", user);
        else
                uid = pw->pw_uid;
 
@@ -109,7 +114,7 @@ gid_t lookup_group(const char *group)
 
        gr = getgrnam(group);
        if (gr == NULL)
-               dbg("specified group unknown '%s'", group);
+               info("specified group unknown '%s'", group);
        else
                gid = gr->gr_gid;
 
@@ -137,10 +142,10 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
        char *tail;
 
        if (file_map(dbfile, &buf, &bufsize) != 0) {
-               dbg("can't open '%s' as db file", dbfile);
+               err("can't open '%s' as db file: %s", dbfile, strerror(errno));
                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 +157,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 */