[5819] in Athena Bugs
OLC changes pmax/ultrix
daemon@ATHENA.MIT.EDU (John T Kohl)
Fri Aug 24 10:36:28 1990
Date: Fri, 24 Aug 90 10:36:06 -0400
From: John T Kohl <jtkohl@ATHENA.MIT.EDU>
To: bugs@ATHENA.MIT.EDU
Mostly bug fixes (null pointers, among others). patches should be obvious.
Some changes for different paths are intertwined with the bug fixes;
ignore those parts.
*** /tmp/,RCSt1007983 Fri Aug 24 10:25:26 1990
--- Imakefile Sun Aug 5 22:08:56 1990
***************
*** 1,12 ****
#
! # $Id: Imakefile,v 1.2 90/05/26 11:12:49 vanharen Exp $
! # $Source: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/RCS/Imakefile,v $
#
# Imakefile for top level directory.
#
#define IHaveSubdirs
! SUBDIRS=common clients server+ man # lib
RM=rm -f
MV=mv -f
--- 1,13 ----
#
! # $Id: Imakefile,v 1.3 90/08/06 12:08:51 jtkohl Exp $
! # $Source: /u1/athena/PANSS/applications/olc/src/RCS/Imakefile,v $
#
# Imakefile for top level directory.
#
#define IHaveSubdirs
! EXTRASUBS=lib
! SUBDIRS=common clients server+ man
RM=rm -f
MV=mv -f
***************
*** 26,28 ****
--- 27,33 ----
-$(RM) Makefile.bak ; $(MV) Makefile Makefile.bak
imake -Iconfig -DNEW_TOP=. -s Makefile
#endif
+
+ NamedTargetSubdirs(install,$(EXTRASUBS),"installing",DESTDIR='$(DESTDIR)',install)
+
+
*** /tmp/,RCSt1007998 Fri Aug 24 10:25:53 1990
--- parser/p_instance.c Mon Aug 6 01:48:15 1990
***************
*** 43,48 ****
--- 43,49 ----
while (*arguments != (char *) NULL)
{
arguments++;
+ if (!*arguments) break;
if(string_equiv(*arguments,"-instance", max(strlen(*arguments),2)) ||
string_equiv(*arguments,"-change", max(strlen(*arguments),2)))
*** /tmp/,RCSt1008019 Fri Aug 24 10:27:00 1990
--- clients/olc/Imakefile Sun Aug 5 22:03:53 1990
***************
*** 14,20 ****
NormalProgramTarget(olc,$(OBJS),$(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES))
! InstallLink(olc,olcr,$(DESTDIR)/usr/athena)
DependTarget()
LintTarget()
TagsTarget()
--- 14,27 ----
NormalProgramTarget(olc,$(OBJS),$(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES))
! #ifndef InstallLinkWithFlags
! #define InstallLinkWithFlags(program,link,dest,flags) @@\
! install:: program @@\
! $(INSTALL) -c $(INSTPGMFLAGS) flags program dest @@\
! (cd dest; $(RM) link; $(LN) program link)
! #endif /* InstallLink */
!
! InstallLinkWithFlags(olc,olcr,$(DESTDIR)$(BINDIR),-s)
DependTarget()
LintTarget()
TagsTarget()
*** /tmp/,RCSt1008019 Fri Aug 24 10:27:03 1990
--- clients/olc/olc.h Tue Jul 24 01:38:40 1990
***************
*** 5,18 ****
* Copyright (C) 1990 by the Massachusetts Institute of Technology.
* For copying and distribution information, see the file "mit-copyright.h".
*
! * $Source: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/clients/olc/RCS/olc.h,v $
! * $Id: olc.h,v 1.1 90/07/24 13:39:02 jtkohl Exp $
* $Author: jtkohl $
*/
-
- #ifndef lint
- static const char rcsid[] ="$Header: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/clients/olc/RCS/olc.h,v 1.1 90/07/24 13:39:02 jtkohl Exp $";
- #endif
#include <mit-copyright.h>
--- 5,14 ----
* Copyright (C) 1990 by the Massachusetts Institute of Technology.
* For copying and distribution information, see the file "mit-copyright.h".
*
! * $Source: /athena/PANSS/applications/olc/src/clients/olc/RCS/olc.h,v $
! * $Id: olc.h,v 1.5 90/05/26 12:03:44 vanharen Exp $
* $Author: jtkohl $
*/
#include <mit-copyright.h>
*** /tmp/,RCSt1008019 Fri Aug 24 10:27:07 1990
--- clients/olc/olc_stock.c Mon Aug 6 01:34:59 1990
***************
*** 63,69 ****
if (stat(MAGIC, &statbuf) < 0)
{
! call_program("/bin/athena/attach","olc-stock");
if (stat(MAGIC, &statbuf) < 0)
{
fprintf(stderr,"Unable to attach olc-stock file system.\n");
--- 63,69 ----
if (stat(MAGIC, &statbuf) < 0)
{
! call_program("attach","olc-stock");
if (stat(MAGIC, &statbuf) < 0)
{
fprintf(stderr,"Unable to attach olc-stock file system.\n");
*** /tmp/,RCSt1008038 Fri Aug 24 10:28:09 1990
--- clients/maude/maude.h Tue Jul 24 01:49:18 1990
***************
*** 5,18 ****
* Copyright (C) 1990 by the Massachusetts Institute of Technology.
* For copying and distribution information, see the file "mit-copyright.h".
*
! * $Source: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/clients/maude/RCS/maude.h,v $
! * $Id: maude.h,v 1.1 90/07/24 13:50:40 jtkohl Exp $
* $Author: jtkohl $
*/
- #ifndef lint
- static const char rcsid[] ="$Header: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/clients/maude/RCS/maude.h,v 1.1 90/07/24 13:50:40 jtkohl Exp $";
- #endif
#include <mit-copyright.h>
--- 5,15 ----
* Copyright (C) 1990 by the Massachusetts Institute of Technology.
* For copying and distribution information, see the file "mit-copyright.h".
*
! * $Source: /athena/PANSS/applications/olc/src/clients/maude/RCS/maude.h,v $
! * $Id: maude.h,v 1.1 90/05/26 12:13:02 vanharen Exp $
* $Author: jtkohl $
*/
#include <mit-copyright.h>
*** /tmp/,RCSt1008049 Fri Aug 24 10:28:53 1990
--- man/Imakefile Sun Aug 5 22:10:37 1990
***************
*** 1,8 ****
#
! # $Id: Imakefile,v 1.1 90/07/24 14:12:37 jtkohl Exp $
! # $Source: /hecate/u4/lockers/decworld/PANSS/applications/olc/src/man/RCS/Imakefile,v $
#
# Imakefile for top level directory.
#
! InstallMultipleDestFlags(install,olc.1 olcr.1 olc_answers.1,$(DESTDIR)/usr/man/man1,$(INSTMANFLAGS))
--- 1,10 ----
#
! # $Id: Imakefile,v 1.3 90/08/06 12:10:30 jtkohl Exp $
! # $Source: /u1/athena/PANSS/applications/olc/src/man/RCS/Imakefile,v $
#
# Imakefile for top level directory.
#
! InstallMultipleDestFlags(install,olc.1 olcr.1 olc_answers.1,$(DESTDIR)$(MANDIR)/man1,$(INSTMANFLAGS))
!
! depend::
*** /tmp/,RCSt1008065 Fri Aug 24 10:29:35 1990
--- lib/olc_help/Makefile Sun Aug 5 21:53:33 1990
***************
*** 1,17 ****
RM= /bin/rm -f
INSTALL= install -c -m 444
! SRCS= ?.nroff answers.nroff ask.nroff cancel.nroff comment.nroff \
! describe.nroff done.nroff forward.nroff grab.nroff \
! help.nroff instance.nroff list.nroff mail.nroff motd.nroff \
! off.nroff olc.nroff on.nroff quit.nroff replay.nroff send.nroff \
! show.nroff status.nroff stock.nroff topic.nroff who.nroff
! OBJS= ?.help answers.help ask.help cancel.help comment.help \
! describe.help done.help forward.help grab.help \
! help.help instance.help list.help mail.help motd.help \
! off.help olc.help on.help quit.help replay.help send.help \
! show.help status.help stock.help topic.help who.help
all: $(OBJS)
--- 1,13 ----
RM= /bin/rm -f
INSTALL= install -c -m 444
! SRCS= ?.nroff answers.nroff ask.nroff cancel.nroff done.nroff help.nroff \
! motd.nroff olc.nroff quit.nroff replay.nroff send.nroff show.nroff \
! status.nroff topic.nroff who.nroff
! OBJS= ?.help answers.help ask.help cancel.help done.help help.help \
! motd.help olc.help quit.help replay.help send.help show.help \
! status.help topic.help who.help
all: $(OBJS)
*** /tmp/,RCSt1008096 Fri Aug 24 10:30:50 1990
--- config/ultrix.cf Wed Aug 1 03:13:51 1990
***************
*** 5,10 ****
--- 5,11 ----
#define ProfiledLibraryTarget(name,objs)
#ifdef MipsArchitecture
+ #define ConstDef -Dconst=
#define ArCmd ar r
#if 0 /* although -g doesn't work, gcc is less buggy on this code... */
#undef HaveGcc
*** /tmp/,RCSt1008096 Fri Aug 24 10:30:52 1990
--- config/site.def Sun Aug 5 22:04:47 1990
***************
*** 89,94 ****
--- 89,98 ----
#define TestDef
#endif
+ #ifndef ConstDef
+ #define ConstDef
+ #endif
+
/* Define these to use $(LIBSUFFIX) or not, absolute pathnames or not,
depending on what you have installed. */
***************
*** 99,102 ****
-lcurses$(LIBSUFFIX)
/* #define StandardDefines ZephyrDef HesiodDef KerberosDef AthenaDef TestDef */
! #define StandardDefines ZephyrDef HesiodDef KerberosDef TestDef
--- 103,111 ----
-lcurses$(LIBSUFFIX)
/* #define StandardDefines ZephyrDef HesiodDef KerberosDef AthenaDef TestDef */
! #define StandardDefines ConstDef ZephyrDef HesiodDef KerberosDef TestDef
! LDFLAGS= -L/usr/athena/lib
! BINDIR=/usr/athena/bin
! MANDIR=/usr/athena/man
! DAEMDIR=/usr/athena/etc
! ETCDIR=/usr/athena/etc
*** /tmp/,RCSt1008131 Fri Aug 24 10:32:18 1990
--- server+/Imakefile Sun Aug 5 22:04:12 1990
***************
*** 50,52 ****
--- 50,53 ----
TagsTarget()
AllTarget(olcd)
+ InstallProgramWithFlags(olcd,${DESTDIR}${DAEMDIR}/olcd,-s)
*** /tmp/,RCSt1008131 Fri Aug 24 10:32:27 1990
--- server+/data_utils.c Mon Aug 6 01:29:06 1990
***************
*** 894,900 ****
k = knuckle->user->knuckles;
! for(i=0; i<= knuckle->user->no_knuckles; i++)
if(((*(k+i))->instance == instance) && is_active((*(k+i))))
return(SUCCESS);
return(FAILURE);
--- 894,900 ----
k = knuckle->user->knuckles;
! for(i=0; i< knuckle->user->no_knuckles; i++)
if(((*(k+i))->instance == instance) && is_active((*(k+i))))
return(SUCCESS);
return(FAILURE);
*** /tmp/,RCSt1008131 Fri Aug 24 10:32:38 1990
--- server+/notify.c Sun Aug 5 20:46:13 1990
***************
*** 571,576 ****
--- 571,582 ----
extern char *sys_errlist[];
extern int errno;
static char time_buf[20];
+
+ #ifdef mips
+ int errno; /* declared in same file as perror in libc,
+ so we must declare it here to avoid
+ multiple defs & linker lossage */
+ #endif
void
#if __STDC__
*** /tmp/,RCSt1008131 Fri Aug 24 10:32:43 1990
--- server+/syslog.c Tue Jul 24 01:56:56 1990
***************
*** 111,118 ****
--- 111,123 ----
#endif
{
static int initialized = 0;
+ #ifdef LOG_CONS
if (!initialized)
openlog ("olc", LOG_CONS | LOG_PID, SYSLOG_LEVEL);
+ #else
+ if (!initialized)
+ openlog ("olc", LOG_PID);
+ #endif
syslog (level, text);
}
