mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-02 00:16:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mon Jun 1 15:41:20 1998 Norbert Warmuth <k3190@fh-sw.de>

Browse Source 
* main.c (translate_url_to_new_syntax): translate the common
ftp url syntax to the syntax used by the new vfs code.

(_do_panel_cd): First translate the path if necessary. This makes
it possible to enter ftp://host on the commandline and in the
directory hotlist. We might need to move the translation code
to the vfs layer if there are other places where we want to enter
ftp://host.


Mon Jun  1 16:00:19 1998  Norbert Warmuth  <k3190@fh-sw.de>

* vfs/ftpfs.c (ftpfs_fill_names): use right character to seperate
prefix and username
This commit is contained in:
Norbert Warmuth 1998-06-01 14:34:43 +00:00
parent 5a5fad89f8
commit 3550827e81
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ChangeLog
View File

@ -1,3 +1,14 @@
Mon Jun 1 15:41:20 1998 Norbert Warmuth <k3190@fh-sw.de>
* main.c (translate_url_to_new_syntax): translate the common
ftp url syntax to the syntax used by the new vfs code.
(_do_panel_cd): First translate the path if necessary. This makes
it possible to enter ftp://host on the commandline and in the
directory hotlist. We might need to move the translation code
to the vfs layer if there are other places where we want to enter
ftp://host.
Mon Jun 1 12:33:08 1998 Alexander V. Lukyanov <lav@yars.free.net>
* configure.in: allowed to use `configure --with-included-gettext'

18
src/main.c
View File

@ -926,18 +926,32 @@ directory_history_add (WPanel * panel, char *s)
panel_update_marks (panel);
}
/* Translate ftp://user:password@host/directory to
#ftp:user:password@host/directory.
*/
static char *
translate_url_to_new_syntax (const char *p)
{
if (strncmp (p, "ftp://", 6) == 0)
return copy_strings ("#ftp:", p + 6, 0);
else
return strdup (p);
}
/* Changes the current panel directory */
int
_do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type)
{
char *directory, *olddir;
char temp [MC_MAXPATHLEN];
char *translated_url;
#ifdef USE_VFS
vfs *oldvfs;
vfsid oldvfsid;
struct vfs_stamping *parent;
#endif
olddir = strdup (panel->cwd);
translated_url = new_dir = translate_url_to_new_syntax (new_dir);
/* Convert *new_path to a suitable pathname, handle ~user */
@ -951,12 +965,14 @@ _do_panel_cd (WPanel *panel, char *new_dir, enum cd_enum cd_type)
}
}
directory = *new_dir ? new_dir : home_dir;
if (mc_chdir (directory) == -1){
strcpy (panel->cwd, olddir);
free (olddir);
free (translated_url);
return 0;
}
free (translated_url);
/* Success: save previous directory, shutdown status of previous dir */
strcpy (panel->lwd, olddir);

5
vfs/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jun 1 16:00:19 1998 Norbert Warmuth <k3190@fh-sw.de>
* ftpfs.c (ftpfs_fill_names): use right character to seperate
prefix and username
Mon Jun 1 14:19:20 1998 Bakeyev I. Timur <timur@comtat.kazan.ru>
* vfs.c (parse_ls_lga): allow a bit wider range of listings.

2
vfs/ftpfs.c
View File

@ -1008,7 +1008,7 @@ void ftpfs_fill_names (void (*func)(char *))
do {
if ((bucket = lptr->data) != 0){
path_name = copy_strings ("/#ftp.", quser (bucket),
path_name = copy_strings ("/#ftp:", quser (bucket),
"@", qhost (bucket),
qcdir(bucket), 0);
(*func)(path_name);