man pages: replace 'device-path' by 'devpath'

[elogind.git] / udev_libc_wrapper.c

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 23cb7b43168bc9ff7c3619bcf1440627f67f8b42..1711811e83f0483fadc94e8a46a39c0876f50285 100644 (file)
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -25,12 +25,10 @@
 #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"
 
 #ifdef __KLIBC__
 #define __OWN_USERDB_PARSER__
@@ -58,7 +56,10 @@ size_t strlcpy(char *dst, const char *src, size_t size)
                bytes++;
        }
 
-       *q = '\0';
+       /* If size == 0 there is no space for a final null... */
+       if (size)
+               *q = '\0';
+
        return bytes;
 }
 
@@ -99,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;
 
@@ -113,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;
 
@@ -141,7 +142,7 @@ 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("search '%s' in '%s'", uname, dbfile);
@@ -156,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 */