External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 15:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite virFileLinkPointsTo

Browse Source 
* src/util.c (SAME_INODE): Define.
(virFileLinkPointsTo): Rewrite to be more portable and more efficient.
This commit is contained in:
Jim Meyering 2008-08-12 17:38:08 +00:00
parent 8fdb2cffa5
commit 4ee755d641
2 changed files with 17 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Aug 12 19:37:23 CEST 2008 Jim Meyering <meyering@redhat.com>
rewrite virFileLinkPointsTo
* src/util.c (SAME_INODE): Define.
(virFileLinkPointsTo): Rewrite to be more portable and more efficient.
Tue Aug 12 13:28:09 CEST 2008 Daniel Veillard <veillard@redhat.com> Tue Aug 12 13:28:09 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/storage_backend_disk.c: make sure parted doesn't ask * src/storage_backend_disk.c: make sure parted doesn't ask
@ -32,7 +38,7 @@ Tue Aug 12 09:27:03 CEST 2008 Daniel Veillard <veillard@redhat.com>
* docs/formatdomain.html docs/formatdomain.html.in: documentation * docs/formatdomain.html docs/formatdomain.html.in: documentation
for the USB format option by Guido Günther for the USB format option by Guido Günther
Fri Aug 11 14:29:02 CEST 2008 Jim Meyering <meyering@redhat.com> Mon Aug 11 14:29:02 CEST 2008 Jim Meyering <meyering@redhat.com>
tests: append a newline to expected-output files lacking NL-at-EOF tests: append a newline to expected-output files lacking NL-at-EOF
* tests/qemuxml2argvtest.c (testCompareXMLToArgvFiles): Adjust the * tests/qemuxml2argvtest.c (testCompareXMLToArgvFiles): Adjust the

104
src/util.c
View File

@ -397,107 +397,23 @@ int virFileHasSuffix(const char *str,
return STREQ(str + len - suffixlen, suffix); return STREQ(str + len - suffixlen, suffix);
} }
#ifndef __MINGW32__ #define SAME_INODE(Stat_buf_1, Stat_buf_2) \
((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
&& (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
/* Return nonzero if checkLink and checkDest
refer to the same file. Otherwise, return 0. */
int virFileLinkPointsTo(const char *checkLink, int virFileLinkPointsTo(const char *checkLink,
const char *checkDest) const char *checkDest)
{ {
char dest[PATH_MAX]; struct stat src_sb;
char real[PATH_MAX]; struct stat dest_sb;
char checkReal[PATH_MAX];
int n;
/* read the link destination */ return (stat (checkLink, &src_sb) == 0
if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { && stat (checkDest, &dest_sb) == 0
switch (errno) { && SAME_INODE (src_sb, dest_sb));
case ENOENT:
case ENOTDIR:
return 0;
case EINVAL:
virLog("File '%s' is not a symlink\n",
checkLink);
return 0;
}
virLog("Failed to read symlink '%s': %s\n",
checkLink, strerror(errno));
return 0;
} else if (n >= PATH_MAX) {
virLog("Symlink '%s' contents too long to fit in buffer\n",
checkLink);
return 0;
}
dest[n] = '\0';
/* make absolute */
if (dest[0] != '/') {
char dir[PATH_MAX];
char tmp[PATH_MAX];
char *p;
strncpy(dir, checkLink, PATH_MAX);
dir[PATH_MAX-1] = '\0';
if (!(p = strrchr(dir, '/'))) {
virLog("Symlink path '%s' is not absolute\n", checkLink);
return 0;
}
if (p == dir) /* handle unlikely root dir case */
p++;
*p = '\0';
if (virFileBuildPath(dir, dest, NULL, tmp, PATH_MAX) < 0) {
virLog("Path '%s/%s' is too long\n", dir, dest);
return 0;
}
strncpy(dest, tmp, PATH_MAX);
dest[PATH_MAX-1] = '\0';
}
/* canonicalize both paths */
if (!realpath(dest, real)) {
virLog("Failed to expand path '%s' :%s\n", dest, strerror(errno));
strncpy(real, dest, PATH_MAX);
real[PATH_MAX-1] = '\0';
}
if (!realpath(checkDest, checkReal)) {
virLog("Failed to expand path '%s' :%s\n", checkDest, strerror(errno));
strncpy(checkReal, checkDest, PATH_MAX);
checkReal[PATH_MAX-1] = '\0';
}
/* compare */
if (STRNEQ(checkReal, real)) {
virLog("Link '%s' does not point to '%s', ignoring\n",
checkLink, checkReal);
return 0;
}
return 1;
} }
#else /* !__MINGW32__ */
/* Gnulib has an implementation of readlink which could be used
* to implement this, but it requires LGPLv3.
*/
int
virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED,
const char *checkDest ATTRIBUTE_UNUSED)
{
virLog (_("%s: not implemented\n"), __FUNCTION__);
return 0;
}
#endif /*! __MINGW32__ */
int virFileExists(const char *path) int virFileExists(const char *path)
{ {
struct stat st; struct stat st;