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

manually merged 118_port_number_in_shell_link

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT service 2009-01-31 19:29:15 +01:00
commit a1b47185c9
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -26,6 +26,11 @@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
2009-01-26 Mikhail S. Pobolovets <styx.mp@gmail.com>
* vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
2009-01-25 Ilia Maslakov <il.smind@gmail.com>
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:

33
vfs/fish.c
View File

@ -216,13 +216,22 @@ static int
fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
{
{
const char *argv[10];
char gbuf[10];
const char *argv[10]; /* All of 10 is used now */
const char *xsh = (SUP.flags == FISH_FLAG_RSH ? "rsh" : "ssh");
int i = 0;
argv[i++] = xsh;
if (SUP.flags == FISH_FLAG_COMPRESSED)
argv[i++] = "-C";
if (SUP.flags > FISH_FLAG_RSH)
{
argv[i++] = "-p";
g_snprintf (gbuf, sizeof (gbuf), "%d", SUP.flags);
argv[i++] = gbuf;
}
argv[i++] = "-l";
argv[i++] = SUP.user;
argv[i++] = SUP.host;
@ -320,7 +329,7 @@ fish_open_archive (struct vfs_class *me, struct vfs_s_super *super,
SUP.user = user;
SUP.flags = flags;
if (!strncmp (op, "rsh:", 4))
SUP.flags |= FISH_FLAG_RSH;
SUP.flags = FISH_FLAG_RSH;
SUP.cwdir = NULL;
if (password)
SUP.password = password;
@ -1056,22 +1065,28 @@ static void
fish_fill_names (struct vfs_class *me, fill_names_f func)
{
struct vfs_s_super *super = MEDATA->supers;
const char *flags;
char *name;
while (super){
switch (SUP.flags & (FISH_FLAG_RSH | FISH_FLAG_COMPRESSED)) {
char gbuf[10];
while (super)
{
const char *flags = "";
switch (SUP.flags)
{
case FISH_FLAG_RSH:
flags = ":r";
break;
case FISH_FLAG_COMPRESSED:
flags = ":C";
break;
case FISH_FLAG_RSH | FISH_FLAG_COMPRESSED:
flags = "";
break;
default:
flags = "";
if (SUP.flags > FISH_FLAG_RSH)
{
break;
g_snprintf (gbuf, sizeof (gbuf), ":%d", SUP.flags);
flags = gbuf;
}
break;
}