mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* extfs.c (extfs_generate_entry): Initialize inode->last_in_subdir. 

(extfs_read_archive): Likewise. Remove unneeded test.
        Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286990

        * extfs/ulha.in (mc_lha_fs_list): Use $NF instead of $10 as filename
        for permission intention.
        Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286990
This commit is contained in:
Andrew V. Samoilov 2004-12-27 12:12:31 +00:00
parent d339190071
commit 278ae44436
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vfs/ChangeLog
View File

@ -1,3 +1,13 @@
2004-12-27 Andrew V. Samoilov <sav@bcs.zp.ua>
* extfs.c (extfs_generate_entry): Initialize inode->last_in_subdir.
(extfs_read_archive): Likewise. Remove unneeded test.
Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286990
* extfs/ulha.in (mc_lha_fs_list): Use $NF instead of $10 as filename
for permission intention.
Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286990
2004-12-10 Roland Illig <roland.illig@gmx.de>
* extfs/uzip.in: Fix handling of archive member pathnames starting

16
vfs/extfs.c
View File

@ -132,10 +132,9 @@ static void extfs_make_dots (struct entry *ent)
entry->dir = ent;
inode->local_filename = NULL;
inode->first_in_subdir = entry;
inode->last_in_subdir = entry;
inode->nlink++;
entry->next_in_dir = g_new (struct entry, 1);
entry=entry->next_in_dir;
entry = entry->next_in_dir;
entry->name = g_strdup ("..");
inode->last_in_subdir = entry;
entry->next_in_dir = NULL;
@ -170,7 +169,8 @@ static struct entry *extfs_generate_entry (struct archive *archive,
inode = g_new (struct inode, 1);
entry->inode = inode;
inode->local_filename = NULL;
inode->linkname = 0;
inode->linkname = NULL;
inode->last_in_subdir = NULL;
inode->inode = (archive->inode_counter)++;
inode->dev = archive->rdev;
inode->archive = archive;
@ -351,11 +351,9 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)
entry->name = g_strdup (p);
entry->next_in_dir = NULL;
entry->dir = pent;
if (pent != NULL) {
if (pent->inode->last_in_subdir) {
pent->inode->last_in_subdir->next_in_dir = entry;
pent->inode->last_in_subdir = entry;
}
if (pent->inode->last_in_subdir) {
pent->inode->last_in_subdir->next_in_dir = entry;
pent->inode->last_in_subdir = entry;
}
if (!S_ISLNK (hstat.st_mode) && current_link_name != NULL) {
pent =
@ -392,6 +390,8 @@ extfs_read_archive (int fstype, const char *name, struct archive **pparc)
inode->mtime = hstat.st_mtime;
inode->atime = hstat.st_atime;
inode->ctime = hstat.st_ctime;
inode->first_in_subdir = NULL;
inode->last_in_subdir = NULL;
if (current_link_name != NULL
&& S_ISLNK (hstat.st_mode)) {
inode->linkname = current_link_name;

2
vfs/extfs/ulha.in
View File

@ -46,7 +46,7 @@ mc_lha_fs_list()
# Print the line this way if there is no permission string
$1 ~ /^\[.*\]/ {
# Invent a generic permission
$1 = ($10 ~ /\/$/) ? "drwxr-xr-x":"-rwxr--r--";
$1 = ($NF ~ /\/$/) ? "drwxr-xr-x":"-rwxr--r--";
# Print it
printf "%s 1 %-8s %-8s %-8d %s %s %s %s\n",
$1, uid, gid, $2, $4, $5, $6, $7;