From 8895615acaf06bb1c9658ad0fdfed1eba24b44dd Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 15 Apr 2012 19:35:48 +0400 Subject: [PATCH] Use new-style VFS prefixes. Signed-off-by: Andrew Borodin --- src/vfs/fish/fish.c | 4 ++-- src/vfs/ftpfs/ftpfs.c | 4 ++-- src/vfs/undelfs/undelfs.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/vfs/fish/fish.c b/src/vfs/fish/fish.c index f18d9ff53..5d1353d62 100644 --- a/src/vfs/fish/fish.c +++ b/src/vfs/fish/fish.c @@ -42,7 +42,7 @@ * Derived from ftpfs.c * Read README.fish for protocol specification. * - * Syntax of path is: \verbatim /#sh:user@host[:Cr]/path \endverbatim + * Syntax of path is: \verbatim sh://user@host[:Cr]/path \endverbatim * where C means you want compressed connection, * and r means you want to use rsh * @@ -546,7 +546,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) vfs_print_message (_("fish: Connected, home %s."), super->path_element->path); #if 0 super->name = - g_strconcat ("/#sh:", super->path_element->user, "@", super->path_element->host, "/", + g_strconcat ("sh://", super->path_element->user, "@", super->path_element->host, "/", (char *) NULL); #else super->name = g_strdup (PATH_SEP_STR); diff --git a/src/vfs/ftpfs/ftpfs.c b/src/vfs/ftpfs/ftpfs.c index 384a5387e..9e8d5ad3e 100644 --- a/src/vfs/ftpfs/ftpfs.c +++ b/src/vfs/ftpfs/ftpfs.c @@ -54,11 +54,11 @@ What to do with this? * NOTE: Usage of tildes is deprecated, consider: * \verbatim - cd /#ftp:pavel@hobit + cd ftp//:pavel@hobit cd ~ \endverbatim * And now: what do I want to do? Do I want to go to /home/pavel or to - * /#ftp:hobit/home/pavel? I think first has better sense... + * ftp://hobit/home/pavel? I think first has better sense... * \verbatim { diff --git a/src/vfs/undelfs/undelfs.c b/src/vfs/undelfs/undelfs.c index c72f316ba..f03492f1c 100644 --- a/src/vfs/undelfs/undelfs.c +++ b/src/vfs/undelfs/undelfs.c @@ -160,7 +160,7 @@ undelfs_get_path (const vfs_path_t * vpath, char **fsname, char **file) path_element = vfs_path_get_by_index (vpath, -1); /* To look like filesystem, we have virtual directories - /#undel:XXX, which have no subdirectories. XXX is replaced with + undel://XXX, which have no subdirectories. XXX is replaced with hda5, sdb8 etc, which is assumed to live under /dev. -- pavel@ucw.cz */ @@ -168,7 +168,7 @@ undelfs_get_path (const vfs_path_t * vpath, char **fsname, char **file) *fsname = NULL; - if (strncmp (dirname, "/#undel", 7)) + if (strncmp (dirname, "undel://", 8) != 0) return; dirname += 8; @@ -202,7 +202,6 @@ undelfs_get_path (const vfs_path_t * vpath, char **fsname, char **file) } *file = g_strdup (""); *fsname = g_strconcat ("/dev/", dirname, (char *) NULL); - return; } /* --------------------------------------------------------------------------------------------- */