diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 1b0222346..790685b55 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,9 @@ +2003-11-24 Andrew V. Samoilov + + * direntry.c (vfs_s_resolve_symlink): Eliminate + g_strdup_printf(). + (vfs_s_fullpath): Likewise. + 2003-11-21 Pavel Roskin * ftpfs.c (ftpfs_login_server): Explicit password should have diff --git a/vfs/direntry.c b/vfs/direntry.c index 306236bbe..c6806b358 100644 --- a/vfs/direntry.c +++ b/vfs/direntry.c @@ -217,7 +217,7 @@ vfs_s_resolve_symlink (struct vfs_class *me, struct vfs_s_entry *entry, /* make full path from relative */ if (*linkname != PATH_SEP) { char *fullpath = vfs_s_fullpath (me, entry->dir); - fullname = g_strdup_printf ("%s/%s", fullpath, linkname); + fullname = g_strconcat (fullpath, "/", linkname, NULL); linkname = fullname; g_free (fullpath); } @@ -522,7 +522,7 @@ vfs_s_fullpath (struct vfs_class *me, struct vfs_s_inode *ino) ino = ino->ent->dir; if (ino == ino->super->root) break; - newpath = g_strdup_printf ("%s/%s", ino->ent->name, path); + newpath = g_strconcat (ino->ent->name, "/", path, NULL); g_free (path); path = newpath; }