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

extfs.c didn't compile because of error in extfs_open() 

sfs was not even mentioned in makefiles
This commit is contained in:
Pavel Roskin 1998-08-27 18:51:20 +00:00
parent 034919825e
commit fe579d66f3
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vfs/ChangeLog
View File

@ -1,3 +1,12 @@
Thu Aug 27 19:45:31 1998 Pavel Roskin <pavel.roskin@ecsoft.co.uk>
* extfs.c: mc_extfsdir was not defined in extfs_open()
* Make-mc.in: sfs.c was not compiled, linked and copied out
extfs/sfs.ini was not installed and copied out
* Makefile.am: sfs.c was not linked to standalone VFS
Tue Aug 25 17:54:17 1998 Pavel Machek <pavel@ucw.cz> Tue Aug 25 17:54:17 1998 Pavel Machek <pavel@ucw.cz>
* Added vfs_uid for use by libvfs.so users (rpc.nfsd) * Added vfs_uid for use by libvfs.so users (rpc.nfsd)

11
vfs/Make-mc.in
View File

@ -21,9 +21,10 @@ AR = @AR@
# VFS code # VFS code
# #
NETFILES = tcputil.o ftpfs.o mcfs.o utilvfs.o NETFILES = tcputil.o ftpfs.o mcfs.o utilvfs.o
NONETFILES = local.o vfs.o tar.o names.o container.o extfs.o @undelfs_o@ NONETFILES = local.o vfs.o tar.o sfs.o names.o container.o extfs.o \
@undelfs_o@
VFSSRCS = local.c vfs.c mcfs.c tcputil.c tar.c names.c shared.c \ VFSSRCS = local.c vfs.c mcfs.c tcputil.c tar.c sfs.c names.c shared.c \
ftpfs.c container.c mcserv.c extfs.c undelfs.c utilvfs.c ftpfs.c container.c mcserv.c extfs.c undelfs.c utilvfs.c
VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \ VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \
@ -32,7 +33,7 @@ VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \
VFSOBJS = $(NONETFILES) @NETFILES@ VFSOBJS = $(NONETFILES) @NETFILES@
EXTFS_MISC = README extfs.ini EXTFS_MISC = README extfs.ini
EXTFS_CONST = a rpm hp48 mailfs patchfs EXTFS_CONST = a rpm hp48 mailfs patchfs sfs.ini
EXTFS_IN = deb.in lslR.in ucpio.in urar.in uzoo.in ftplist.in uar.in \ EXTFS_IN = deb.in lslR.in ucpio.in urar.in uzoo.in ftplist.in uar.in \
ulha.in uzip.in ulha.in uzip.in
EXTFS_OUT = deb lslR ucpio urar uzoo ftplist uar ulha uzip EXTFS_OUT = deb lslR ucpio urar uzoo ftplist uar ulha uzip
@ -43,7 +44,9 @@ EXTFSSTUFF = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFS_IN)
# Commands to build standalone version (.so) # Commands to build standalone version (.so)
# #
VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so tar.so names.so container.so extfs.so util-alone.so util.sor utilunix.sor VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so \
tar.so sfs.so names.so container.so extfs.so util-alone.so \
util.sor utilunix.sor
%.sor: ../src/%.c %.sor: ../src/%.c
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@

2
vfs/Makefile.am
View File

@ -19,7 +19,7 @@ mad.h: mc-src/mad.h
libvfs_la_SOURCES = callback.h container.c container.h extfs.c extfs.h \ libvfs_la_SOURCES = callback.h container.c container.h extfs.c extfs.h \
ftpfs.c ftpfs.h libvfs.c local.c mad.c mad.h mcfs.c mcfs.h mcserv.c \ ftpfs.c ftpfs.h libvfs.c local.c mad.c mad.h mcfs.c mcfs.h mcserv.c \
names.c names.h shared.c tar.c tar.h tcputil.c tcputil.h undelfs.c \ names.c names.h shared.c tar.c tar.h sfs.c tcputil.c tcputil.h undelfs.c \
undelfs.h util-alone.c util-alone.h utilvfs.c vfs.c vfs.h undelfs.h util-alone.c util-alone.h utilvfs.c vfs.c vfs.h
libvfs_la_LDFLAGS = -version-info 27:0:27 libvfs_la_LDFLAGS = -version-info 27:0:27

2
vfs/extfs.c
View File

@ -585,6 +585,7 @@ static void *extfs_open (char *file, int flags, int mode)
struct extfs_pseudofile *extfs_info; struct extfs_pseudofile *extfs_info;
struct extfs_archive *archive; struct extfs_archive *archive;
char *q; char *q;
char *mc_extfsdir;
struct extfs_entry *entry; struct extfs_entry *entry;
int local_handle; int local_handle;
const int do_create = (flags & O_ACCMODE) != O_RDONLY; const int do_create = (flags & O_ACCMODE) != O_RDONLY;
@ -615,6 +616,7 @@ static void *extfs_open (char *file, int flags, int mode)
archive_name, archive_name,
" ", q, " ", entry->inode->local_filename, 0); " ", q, " ", entry->inode->local_filename, 0);
free (q); free (q);
free (mc_extfsdir);
free (archive_name); free (archive_name);
if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, shell, cmd) && !do_create){ if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, shell, cmd) && !do_create){
free (entry->inode->local_filename); free (entry->inode->local_filename);