Patch #: 23 Type: bug fix Priority: low Affects: sites trying to use SIZESERVER code Reported: Aloke Majumdar Archived: munnari.OZ.AU mac/cap.patches/cap60.patch023 Summary: fix stupidity in code and makefile File: cap60/applications/aufs/afpos.c File: cap60/applications/aufs/sizeserver.c File: cap60/applications/aufs/Makefile.m4 *** applications/aufs/afpos.c.orig Tue May 28 20:35:00 1991 --- applications/aufs/afpos.c Tue May 28 20:41:18 1991 *************** *** 1,7 **** /* ! * $Author: djh $ $Date: 1991/05/28 10:34:46 $ ! * $Header: /local/mulga/mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.7 1991/05/28 10:34:46 djh Exp djh $ ! * $Revision: 2.7 $ */ /* --- 1,7 ---- /* ! * $Author: djh $ $Date: 1991/05/28 10:41:05 $ ! * $Header: /local/mulga/mac/src/cap60/applications/aufs/RCS/afpos.c,v 2.8 1991/05/28 10:41:05 djh Exp djh $ ! * $Revision: 2.8 $ */ /* *************** *** 163,168 **** --- 163,169 ---- #include "afppasswd.h" /* in case we are using privates */ #include "afposncs.h" #include "afpgc.h" + #ifdef SIZESERVER #include #include *************** *** 322,327 **** --- 323,329 ---- private OSErr ItoEErr(); private int filemode(); private char *syserr(); + #ifdef SIZESERVER private void getvolsize(); #endif SIZESERVER *************** *** 2125,2130 **** --- 2127,2137 ---- } #ifdef SIZESERVER + + #ifndef SIZESERVER_PATH + #define SIZESERVER_PATH "/usr/local/cap/sizeserver" + #endif SIZESERVER_PATH + static jmp_buf gotpipe; private void *************** *** 2164,2170 **** dup2(socket[1], 0); close(socket[1]); } ! execl(SIZESERVER, SIZESERVER, 0); _exit(1); } close(socket[1]); --- 2171,2177 ---- dup2(socket[1], 0); close(socket[1]); } ! execl(SIZESERVER_PATH, "sizeserver", 0); _exit(1); } close(socket[1]); *** applications/aufs/sizeserver.c.orig Thu Mar 14 15:30:24 1991 --- applications/aufs/sizeserver.c Tue May 28 20:13:05 1991 *************** *** 5,18 **** #include #include #include ! #ifdef NeXT #include #include ! #else NeXT #include #include ! #endif NeXT ! #include #include "sizeserver.h" main() --- 5,23 ---- #include #include #include ! #include ! #include ! #include #include #include ! /* ! * files could be in ! * /usr/include/sys ! * #include #include ! * ! */ #include "sizeserver.h" main() *************** *** 76,80 **** } #else SIZESERVER ! int serv_dummy_for_ld; /* keep the loader and ranlib happy */ #endif SIZESERVER --- 81,89 ---- } #else SIZESERVER ! #include ! main() ! { ! printf("sizeserver: not compiled with -DSIZESERVER\n"); ! } #endif SIZESERVER *** applications/aufs/Makefile.m4.orig Thu Feb 28 23:44:21 1991 --- applications/aufs/Makefile.m4 Tue May 28 20:13:08 1991 *************** *** 45,64 **** afpmisc.c afpserver.c aufsicon.c abmisc2.c \ afpdt.c afpdid.c afposenum.c afpavl.c \ afposfi.c afpgc.c afppasswd.c afposlock.c aufsv.c \ ! afpudb.c afposncs.c afpspd.c sizeserver.c OBJS=afpos.o afpvols.o afpfile.o \ afpmisc.o afpserver.o aufsicon.o abmisc2.o \ afpdt.o afpdir.o afpfork.o afpdid.o afposenum.o afpavl.o \ afposfi.o afpgc.o afppasswd.o aufsv.o \ ! afpudb.o afposncs.o afpspd.o sizeserver.o SYMLINKS=att_getopt.c ! all: aufs aufs: aufs.o $(OBJS) $(CAPFILES) ${RENAME} $(GETOPT) ${CC} $(LFLAGS) -o aufs aufs.o $(OBJS) $(CAPFILES) ${RENAME} \ $(GETOPT) ${AFPLIB} ${CAPLIB} ${SLIB} newver: /bin/sh aufs_vers.sh `cat aufs_vers` aufs_vers aufsv.c make all --- 45,70 ---- afpmisc.c afpserver.c aufsicon.c abmisc2.c \ afpdt.c afpdid.c afposenum.c afpavl.c \ afposfi.c afpgc.c afppasswd.c afposlock.c aufsv.c \ ! afpudb.c afposncs.c afpspd.c OBJS=afpos.o afpvols.o afpfile.o \ afpmisc.o afpserver.o aufsicon.o abmisc2.o \ afpdt.o afpdir.o afpfork.o afpdid.o afposenum.o afpavl.o \ afposfi.o afpgc.o afppasswd.o aufsv.o \ ! afpudb.o afposncs.o afpspd.o SYMLINKS=att_getopt.c ! all: aufs sizeserver aufs: aufs.o $(OBJS) $(CAPFILES) ${RENAME} $(GETOPT) ${CC} $(LFLAGS) -o aufs aufs.o $(OBJS) $(CAPFILES) ${RENAME} \ $(GETOPT) ${AFPLIB} ${CAPLIB} ${SLIB} + sizeserver: sizeserver.o + ${CC} ${LFLAGS} -o sizeserver sizeserver.o ${SLIB} + + sizeserver.o: sizeserver.c sizeserver.h + ${CC} ${OSDEFS} ${CFLAGS} -c sizeserver.c + newver: /bin/sh aufs_vers.sh `cat aufs_vers` aufs_vers aufsv.c make all *************** *** 67,81 **** /bin/sh aufs_vers.sh `cat aufs_vers` useold aufsv.c clean: ! -rm -f *.o aufs ${SYMLINKS} lint: aufs.c $(SRCS) lint aufs.c $(SRCS) ! install: aufs -strip aufs ifdef([sysvinstall],[install -f $(DESTDIR) aufs], [${INSTALLER} aufs $(DESTDIR)]) dist: @cat todist --- 73,90 ---- /bin/sh aufs_vers.sh `cat aufs_vers` useold aufsv.c clean: ! -rm -f *.o aufs sizeserver ${SYMLINKS} lint: aufs.c $(SRCS) lint aufs.c $(SRCS) ! install: aufs sizeserver -strip aufs ifdef([sysvinstall],[install -f $(DESTDIR) aufs], [${INSTALLER} aufs $(DESTDIR)]) + -strip sizeserver + ifdef([sysvinstall],[install -f $(DESTDIR) sizeserver], + [${INSTALLER} sizeserver $(DESTDIR)]) dist: @cat todist *************** *** 155,158 **** afppasswd.o: afppasswd.c $I/netat/sysvcompat.h afppasswd.h afposncs.o: afposncs.c $I/netat/appletalk.h $I/netat/afp.h \ afposncs.h afps.h - sizeserver.o: sizeserver.c sizeserver.h --- 164,166 ---- *** README.orig Tue May 28 20:42:04 1991 --- README Tue May 28 20:42:13 1991 *************** *** 3,9 **** (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 22, May 1991 Introduction ------------ --- 3,9 ---- (For use with AppleTalk/Ethernet bridge) o RELEASE NOTES ! o CAP Distribution 6.0, Patch Level 23, May 1991 Introduction ------------