mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

* direntry.c (vfs_s_resolve_symlink): Use g_snprintf() instead

Browse Source 
of non-portable snprintf().
Reported by Xu Qiang <Xu.Qiang@xssc.sgp.xerox.com>
This commit is contained in:
Pavel Roskin 2002-10-07 05:32:45 +00:00
parent 9acd93fe1e
commit 416008fc74
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vfs/ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-07 Pavel Roskin <proski@gnu.org>
* direntry.c (vfs_s_resolve_symlink): Use g_snprintf() instead
of non-portable snprintf().
Reported by Xu Qiang <Xu.Qiang@xssc.sgp.xerox.com>
2002-10-04 Pavel Roskin <proski@gnu.org>
* mcfs.c (mcfs_lseek): Explicity cast offset to int. This fixes

22
vfs/direntry.c
View File

@ -340,8 +340,6 @@ vfs_s_find_inode (vfs *me, vfs_s_inode *root, char *path, int follow, int flags)
return ent->ino;
}
/* Ouch - vfs_s_resolve symlink does not work for filesystems like ftp & fish:
you may not lookup with some other root! */
vfs_s_entry *
vfs_s_resolve_symlink (vfs *me, vfs_s_entry *entry, char *path, int follow)
{
@ -362,25 +360,29 @@ vfs_s_resolve_symlink (vfs *me, vfs_s_entry *entry, char *path, int follow)
ERRNOR (EFAULT, NULL);
if (MEDATA->find_entry == vfs_s_find_entry_linear) {
if (*linkname == PATH_SEP)
return (MEDATA->find_entry) (me, entry->dir->super->root, linkname, follow - 1, 0);
else { /* FIXME: this does not work */
char *fullpath = vfs_s_fullpath(me, entry->dir);
snprintf(buf, sizeof (buf), "%s/%s", fullpath, linkname);
if (*linkname == PATH_SEP)
return (MEDATA->find_entry) (me, entry->dir->super->root,
linkname, follow - 1, 0);
else {
char *fullpath = vfs_s_fullpath (me, entry->dir);
g_snprintf (buf, sizeof (buf), "%s/%s", fullpath, linkname);
g_free (fullpath);
return (MEDATA->find_entry) (me, entry->dir->super->root, buf, follow - 1, 0);
return (MEDATA->find_entry) (me, entry->dir->super->root, buf,
follow - 1, 0);
}
}
/* Convert absolute paths to relative ones */
if (*linkname == PATH_SEP) {
char *p, *q;
for (p = path, q = entry->ino->linkname; *p == *q; p++, q++);
while (*(--q) != PATH_SEP);
q++;
for (;; p++){
for (;; p++) {
p = strchr (p, PATH_SEP);
if (!p){
if (!p) {
strcat (buf, q);
break;
}