From fe579d66f376b1fed76017ee6af60fcef442cfd4 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 27 Aug 1998 18:51:20 +0000 Subject: [PATCH] extfs.c didn't compile because of error in extfs_open() sfs was not even mentioned in makefiles --- vfs/ChangeLog | 9 +++++++++ vfs/Make-mc.in | 11 +++++++---- vfs/Makefile.am | 2 +- vfs/extfs.c | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 498cc6647..b5fe5e1bb 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,12 @@ +Thu Aug 27 19:45:31 1998 Pavel Roskin + + * 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 * Added vfs_uid for use by libvfs.so users (rpc.nfsd) diff --git a/vfs/Make-mc.in b/vfs/Make-mc.in index 03844828c..b2c11fd69 100644 --- a/vfs/Make-mc.in +++ b/vfs/Make-mc.in @@ -21,9 +21,10 @@ AR = @AR@ # VFS code # 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 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@ 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 \ ulha.in uzip.in 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) # -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 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@ diff --git a/vfs/Makefile.am b/vfs/Makefile.am index e958b40b8..959cc624b 100644 --- a/vfs/Makefile.am +++ b/vfs/Makefile.am @@ -19,7 +19,7 @@ mad.h: mc-src/mad.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 \ -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 libvfs_la_LDFLAGS = -version-info 27:0:27 diff --git a/vfs/extfs.c b/vfs/extfs.c index 81508232b..317b26793 100644 --- a/vfs/extfs.c +++ b/vfs/extfs.c @@ -585,6 +585,7 @@ static void *extfs_open (char *file, int flags, int mode) struct extfs_pseudofile *extfs_info; struct extfs_archive *archive; char *q; + char *mc_extfsdir; struct extfs_entry *entry; int local_handle; 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, " ", q, " ", entry->inode->local_filename, 0); free (q); + free (mc_extfsdir); free (archive_name); if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, shell, cmd) && !do_create){ free (entry->inode->local_filename);