mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-27 10:12:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* xdirentry.h: Fix typos in field names.

Browse Source
This commit is contained in:
Pavel Roskin 2003-10-16 06:05:39 +00:00
parent a6754ce841
commit dcd2b9e8fc
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vfs/ChangeLog
View File

@ -1,5 +1,7 @@
2003-10-16 Pavel Roskin <proski@gnu.org>
* xdirentry.h: Fix typos in field names.
* xdirentry.h: Cleanup unused or write-only fields. Adjust all
dependencies.

6
vfs/cpio.c
View File

@ -426,7 +426,7 @@ static int cpio_create_entry(struct vfs_class *me, struct vfs_s_super *super, st
i.inumber = stat->st_ino;
i.device = stat->st_dev;
i.inode = NULL;
if((l = defer_find(super->u.arch.defered, &i)) != NULL) {
if((l = defer_find(super->u.arch.deferred, &i)) != NULL) {
inode = l->inode;
if(inode->st.st_size && stat->st_size && (inode->st.st_size != stat->st_size)) {
message_3s(1, MSG_ERROR, _("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"),
@ -474,8 +474,8 @@ static int cpio_create_entry(struct vfs_class *me, struct vfs_s_super *super, st
i->inumber = stat->st_ino;
i->device = stat->st_dev;
i->inode = inode;
i->next = super->u.arch.defered;
super->u.arch.defered = i;
i->next = super->u.arch.deferred;
super->u.arch.deferred = i;
}
}

12
vfs/ftpfs.c
View File

@ -1027,7 +1027,7 @@ linear_abort (struct vfs_class *me, struct vfs_s_fh *fh)
char buf[1024];
int dsock = FH_SOCK;
FH_SOCK = -1;
SUP.control_connection_buzy = 0;
SUP.ctl_connection_busy = 0;
print_vfs_message (_("ftpfs: aborting transfer."));
if (send (SUP.sock, ipbuf, sizeof (ipbuf), MSG_OOB) != sizeof (ipbuf)) {
@ -1466,7 +1466,7 @@ linear_start(struct vfs_class *me, struct vfs_s_fh *fh, int offset)
if (FH_SOCK == -1)
ERRNOR (EACCES, 0);
fh->linear = LS_LINEAR_OPEN;
FH_SUPER->u.ftp.control_connection_buzy = 1;
FH_SUPER->u.ftp.ctl_connection_busy = 1;
fh->u.ftp.append = 0;
return 1;
}
@ -1487,7 +1487,7 @@ linear_read (struct vfs_class *me, struct vfs_s_fh *fh, void *buf, int len)
linear_abort(me, fh);
if (!n) {
SUP.control_connection_buzy = 0;
SUP.ctl_connection_busy = 0;
close (FH_SOCK);
FH_SOCK = -1;
if ((get_reply (me, SUP.sock, NULL, 0) != COMPLETE))
@ -1611,7 +1611,7 @@ ftpfs_chdir_internal (struct vfs_class *me, struct vfs_s_super *super, char *rem
int r;
char *p;
if (!SUP.cwd_defered && is_same_dir (me, super, remote_path))
if (!SUP.cwd_deferred && is_same_dir (me, super, remote_path))
return COMPLETE;
p = translate_path (me, super, remote_path);
@ -1623,7 +1623,7 @@ ftpfs_chdir_internal (struct vfs_class *me, struct vfs_s_super *super, char *rem
} else {
g_free(SUP.cwdir);
SUP.cwdir = g_strdup (remote_path);
SUP.cwd_defered = 0;
SUP.cwd_deferred = 0;
}
return r;
}
@ -1660,7 +1660,7 @@ static int ftpfs_fh_open (struct vfs_class *me, struct vfs_s_fh *fh, int flags,
* to local temporary file and stored to ftp server
* by vfs_s_close later
*/
if (FH_SUPER->u.ftp.control_connection_buzy){
if (FH_SUPER->u.ftp.ctl_connection_busy) {
if (!fh->ino->localname){
int handle = mc_mkstemps (&fh->ino->localname, me->name, NULL);
if (handle == -1)

6
vfs/xdirentry.h
View File

@ -82,18 +82,18 @@ struct vfs_s_super {
int use_passive_connection;
int remote_is_amiga; /* No leading slash allowed for AmiTCP (Amiga) */
int isbinary;
int cwd_defered; /* current_directory was changed but CWD command hasn't
int cwd_deferred; /* current_directory was changed but CWD command hasn't
been sent yet */
int strict; /* ftp server doesn't understand
"LIST -la <path>"; use "CWD <path>"/
"LIST" instead */
int control_connection_buzy;
int ctl_connection_busy;
} ftp;
struct {
int fd;
struct stat st;
int type; /* Type of the archive */
struct defer_inode *defered; /* List of inodes for which another entries may appear */
struct defer_inode *deferred; /* List of inodes for which another entries may appear */
} arch;
} u;
};