提交 941ccbc1 编写于 作者: J Ján Tomko

Add virDirOpenIfExists

Just like virDirOpen, but it returns 0 without reporting an error
on ENOENT.
上级 e81de04c
......@@ -1496,6 +1496,7 @@ virBuildPathInternal;
virDirClose;
virDirCreate;
virDirOpen;
virDirOpenIfExists;
virDirRead;
virFileAbsPath;
virFileAccessibleAs;
......
......@@ -2723,10 +2723,12 @@ virFileRemove(const char *path,
#endif /* WIN32 */
static int
virDirOpenInternal(DIR **dirp, const char *name)
virDirOpenInternal(DIR **dirp, const char *name, bool ignoreENOENT)
{
*dirp = opendir(name);
if (!*dirp) {
if (ignoreENOENT && errno == ENOENT)
return 0;
virReportSystemError(errno, _("cannot open directory '%s'"), name);
return -1;
}
......@@ -2744,7 +2746,22 @@ virDirOpenInternal(DIR **dirp, const char *name)
int
virDirOpen(DIR **dirp, const char *name)
{
return virDirOpenInternal(dirp, name);
return virDirOpenInternal(dirp, name, false);
}
/**
* virDirOpenIfExists
* @dirp: directory stream
* @name: path of the directory
*
* Returns 1 on success.
* If opendir returns ENOENT, 0 is returned without reporting an error.
* On other errors, -1 is returned and an error is reported.
*/
int
virDirOpenIfExists(DIR **dirp, const char *name)
{
return virDirOpenInternal(dirp, name, true);
}
/**
......
......@@ -232,6 +232,8 @@ int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid,
unsigned int flags) ATTRIBUTE_RETURN_CHECK;
int virDirOpen(DIR **dirp, const char *dirname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
int virDirOpenIfExists(DIR **dirp, const char *dirname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
void virDirClose(DIR **dirp)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册