080 release

[elogind.git] / udev_libc_wrapper.c

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index df5451520662b58e463e85353cfa6bc77495cee5..02a1f8d016c2a7273e0d5e31f547964105d212d9 100644 (file)
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -27,21 +27,67 @@
 #include <fcntl.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 __OWN_USERDB_PARSER__
+#ifdef __OWN_STRLCPYCAT__
+size_t strlcpy(char *dst, const char *src, size_t size)
+{
+       size_t bytes = 0;
+       char *q = dst;
+       const char *p = src;
+       char ch;
+
+       while ((ch = *p++)) {
+               if (bytes+1 < size)
+                       *q++ = ch;
+               bytes++;
+       }
+
+       /* If size == 0 there is no space for a final null... */
+       if (size)
+               *q = '\0';
+
+       return bytes;
+}
 
+size_t strlcat(char *dst, const char *src, size_t size)
+{
+       size_t bytes = 0;
+       char *q = dst;
+       const char *p = src;
+       char ch;
+
+       while (bytes < size && *q) {
+               q++;
+               bytes++;
+       }
+       if (bytes == size)
+               return (bytes + strlen(src));
+
+       while ((ch = *p++)) {
+               if (bytes+1 < size)
+               *q++ = ch;
+               bytes++;
+       }
+
+       *q = '\0';
+       return bytes;
+}
+#endif /* __OWN_STRLCPYCAT__ */
+
+#ifndef __OWN_USERDB_PARSER__
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
@@ -53,7 +99,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;
 
@@ -67,7 +113,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;
 
@@ -95,10 +141,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;
@@ -107,11 +153,11 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
                bufline = &buf[cur];
                cur += count+1;
 
-               if (count >= LINE_SIZE)
+               if (count >= sizeof(line))
                        continue;
 
-               strncpy(line, bufline, count);
-               line[count] = '\0';
+               memcpy(line, bufline, count-1);
+               line[count-1] = '\0';
                pos = line;
 
                /* get name */
@@ -158,5 +204,4 @@ gid_t lookup_group(const char *group)
        id = get_id_by_name(group, GROUP_FILE);
        return (gid_t) id;
 }
-
 #endif /* __OWN_USERDB_PARSER__ */