External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

enforce sane readdir usage

Browse Source 
Now that all clients have been adjusted, ensure that no future
misuse of readdir is introduced into the code base.

* cfg.mk (sc_prohibit_readdir): New rule.
* src/util/virfile.c (virDirRead): Exempt the wrapper.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-04-21 16:33:15 -06:00
parent a431523444
commit eae00fb59a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg.mk
View File

@ -421,6 +421,12 @@ sc_prohibit_gethostname:
halt='use virGetHostname, not gethostname' \ halt='use virGetHostname, not gethostname' \
$(_sc_search_regexp) $(_sc_search_regexp)
sc_prohibit_readdir:
@prohibit='\breaddir *\(' \
exclude='exempt from syntax-check' \
halt='use virDirRead, not readdir' \
$(_sc_search_regexp)
sc_prohibit_gettext_noop: sc_prohibit_gettext_noop:
@prohibit='gettext_noop *\(' \ @prohibit='gettext_noop *\(' \
halt='use N_, not gettext_noop' \ halt='use N_, not gettext_noop' \

2
src/util/virfile.c
View File

@ -2401,7 +2401,7 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED,
int virDirRead(DIR *dirp, struct dirent **ent, const char *name) int virDirRead(DIR *dirp, struct dirent **ent, const char *name)
{ {
errno = 0; errno = 0;
*ent = readdir(dirp); *ent = readdir(dirp); /* exempt from syntax-check */
if (!*ent && errno) { if (!*ent && errno) {
if (name) if (name)
virReportSystemError(errno, _("Unable to read directory '%s'"), virReportSystemError(errno, _("Unable to read directory '%s'"),