bytes++;
}
- *q = '\0';
+ /* If size == 0 there is no space for a final null... */
+ if (size)
+ *q = '\0';
+
return bytes;
}
pw = getpwnam(user);
if (pw == NULL)
- dbg("specified user unknown '%s'", user);
+ info("specified user unknown '%s'", user);
else
uid = pw->pw_uid;
gr = getgrnam(group);
if (gr == NULL)
- dbg("specified group unknown '%s'", group);
+ info("specified group unknown '%s'", group);
else
gid = gr->gr_gid;
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);
if (count >= sizeof(line))
continue;
- strlcpy(line, bufline, count);
+ memcpy(line, bufline, count-1);
+ line[count-1] = '\0';
pos = line;
/* get name */