|
DataMuseum.dkPresents historical artifacts from the history of: DKUUG/EUUG Conference tapes |
This is an automatic "excavation" of a thematic subset of
See our Wiki for more about DKUUG/EUUG Conference tapes Excavated with: AutoArchaeologist - Free & Open Source Software. |
top - metrics - downloadIndex: T p
Length: 72943 (0x11cef)
Types: TextFile
Names: »pepsy.patches«
└─⟦2d1937cfd⟧ Bits:30007241 EUUGD22: P.P 5.0
└─⟦041b9c0f8⟧ »EurOpenD22/isode/pepsy.system-6.0.Z«
└─⟦d49939f05⟧
└─⟦this⟧ »pepsy.patches«
Copyright 1989 CSIRO Division of Information Technology
Permission is granted to copy and modify this software as long as it
is not for profit. No guarrentees or warranties are provided for any
use of this software. So use at your OWN risk.
The software is openly available but is NOT in the public domain.
You are allowed and encouraged to take this software and build
commercial products. However, as a condition of use, you are required
to ``hold harmless'' all contributors.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that this notice and the reference to this notice appearing in
each software module be retained unaltered, and that the name of any
contributors shall not be used in advertising or publicity pertaining
to distribution of the software without specific written prior
permission. No contributor makes any representations about the
suitability of this software for any purpose. It is provided ``as is''
without express or implied warranty.
All contributors disclaim all warranties with regard to this
software, including all implied warranties of merchantibility and
fitness. In no event shall any contributor be liable for any special,
indirect or consequential damages or any damages whatsosever resulting
from loss of use, data or profits, whether in action of contract,
negligence or other tortious action, arising out of or in connection
with the use or performance of this software.
Contributors so far are only CSIRO Division of Information Technology.
This applies to the software of this release which consists of the files
listed in the README file. This includes new files and a files of changes to
the ISODE distribution.
*** /src/isode/isode-6.0/Makefile Fri Nov 24 18:14:42 1989
--- Makefile Sun Jan 21 14:00:10 1990
***************
*** 29,38 ****
# Here it is...
##################################################################
! DIRS = h compat dirent tsap ssap psap pepy psap2 \
! acsap rtsap rosap rosy support imisc
! OTHERS = dsap ftam ftam2 ftam-ftp ftp-ftam others psap2-lpp quipu \
! snmp vt
all:; @for i in $(DIRS); \
--- 29,37 ----
# Here it is...
##################################################################
! DIRS = h compat dirent tsap ssap psap pepy pepsy psap2 \
! acsap support# imisc
! OTHERS = ftam ftam2
all:; @for i in $(DIRS); \
*** /src/isode/isode-6.0/ftam/Makefile Fri Nov 24 18:46:01 1989
--- ftam/Makefile Thu Jan 18 09:27:07 1990
***************
*** 27,35 ****
.SUFFIXES: .py .c .o
! .py.c:; $(TOPDIR)pepy/xpepy -a PY_advise -m $(PYFLAGS) $<
!
LIBES = libftam.a $(TOPDIR)libisode.a
LLIBS = $(TOPDIR)llib-lisode
HFILES = $(HDIR)ftam.h \
--- 27,36 ----
.SUFFIXES: .py .c .o
! .py.c:; $(TOPDIR)posy/xpepy -a PY_advise -m $(PYFLAGS) $<
! ISODE = ..
! POSY = ../pepy
LIBES = libftam.a $(TOPDIR)libisode.a
LLIBS = $(TOPDIR)llib-lisode
HFILES = $(HDIR)ftam.h \
***************
*** 40,51 ****
FTAM-types.h
##################################################################
# Here it is...
##################################################################
all: libftam
! inst-all: documents # inst-libftam manuals
install: inst-all clean
lint: l-libftam
--- 41,54 ----
FTAM-types.h
+ # bin: FTAM_tables.o FADU_tables.o CONT_tables.o ACS_tables.o
+
##################################################################
# Here it is...
##################################################################
all: libftam
! inst-all: inst-libftam documents manuals
install: inst-all clean
lint: l-libftam
***************
*** 69,75 ****
ftamattr.o ftambits.o ftamchrg.o ftamconctl.o ftamdiag.o \
ftamfaduid.o ftampass.o ftamshare.o ftamlose.o ftamdocument.o \
ftamfdf.o \
! CONT-print.o FADU-print.o FTAM-print.o \
$(OSTRINGS)
HEADERS = CONT.ph CONT-types.h FADU.ph FADU-types.h \
FTAM.ph FTAM-types.h
--- 72,78 ----
ftamattr.o ftambits.o ftamchrg.o ftamconctl.o ftamdiag.o \
ftamfaduid.o ftampass.o ftamshare.o ftamlose.o ftamdocument.o \
ftamfdf.o \
! # CONT-print.o FADU-print.o FTAM-print.o \
$(OSTRINGS)
HEADERS = CONT.ph CONT-types.h FADU.ph FADU-types.h \
FTAM.ph FTAM-types.h
***************
*** 107,116 ****
libftam: libftam.a
-@rm -f $(TOPDIR)h/CONT-types.h \
$(TOPDIR)h/FADU-types.h \
! $(TOPDIR)h/FTAM-types.h
-@$(LN) CONT-types.h $(TOPDIR)h/CONT-types.h
-@$(LN) FADU-types.h $(TOPDIR)h/FADU-types.h
-@$(LN) FTAM-types.h $(TOPDIR)h/FTAM-types.h
libftam.a: ftamvrsn.o
-rm -f $@
--- 110,128 ----
libftam: libftam.a
-@rm -f $(TOPDIR)h/CONT-types.h \
$(TOPDIR)h/FADU-types.h \
! $(TOPDIR)h/FTAM-types.h \
! $(TOPDIR)h/CONT_*defs.h \
! $(TOPDIR)h/FADU_*defs.h \
! $(TOPDIR)h/FTAM_*defs.h
-@$(LN) CONT-types.h $(TOPDIR)h/CONT-types.h
+ -@$(LN) CONT_defs.h $(TOPDIR)h/CONT_defs.h
+ -@$(LN) CONT_pre_defs.h $(TOPDIR)h/CONT_pre_defs.h
-@$(LN) FADU-types.h $(TOPDIR)h/FADU-types.h
+ -@$(LN) FADU_defs.h $(TOPDIR)h/FADU_defs.h
+ -@$(LN) FADU_pre_defs.h $(TOPDIR)h/FADU_pre_defs.h
-@$(LN) FTAM-types.h $(TOPDIR)h/FTAM-types.h
+ -@$(LN) FTAM_defs.h $(TOPDIR)h/FTAM_defs.h
+ -@$(LN) FTAM_pre_defs.h $(TOPDIR)h/FTAM_pre_defs.h
libftam.a: ftamvrsn.o
-rm -f $@
***************
*** 122,166 ****
-@ls -l $@
-@echo "FTAM library built normally"
! CONT-O= CONT-[0-9]*.o
! CONT-C= CONT-[0-9]*.c
! CONT-O: CONT-C
! @$(MAKE) `/bin/ls $(CONT-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! CONT-C: CONT-types.py $(TOPDIR)pepy/xpepy
! -@rm -f $(CONT-C) $(CONT-O)
! $(TOPDIR)pepy/xpepy -a PY_advise -A -b CONT -m $(PYFLAGS) \
! CONT-types.py
! -@touch $@
! FADU-O = FADU-[0-9]*.o
! FADU-C = FADU-[0-9]*.c
! FADU-O: FADU-C
! @$(MAKE) `/bin/ls $(FADU-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! FADU-C: FADU-types.py $(TOPDIR)pepy/xpepy
! -@rm -f $(FADU-C) $(FADU-O)
! $(TOPDIR)pepy/xpepy -a PY_advise -A -b FADU -m $(PYFLAGS) \
! FADU-types.py
! -@touch $@
! FTAM-O= FTAM-[0-9]*.o
! FTAM-C= FTAM-[0-9]*.c
! FTAM-O: FTAM-C
! @$(MAKE) `/bin/ls $(FTAM-C) | sed 's/\.c$$/.o/'`
! -@touch $@
- FTAM-C: FTAM-types.py $(TOPDIR)pepy/xpepy
- -@rm -f $(FTAM-C) $(FTAM-O)
- $(TOPDIR)pepy/xpepy -a PY_advise -A -b FTAM -m $(PYFLAGS) \
- FTAM-types.py
- -@touch $@
ftamvrsn.c: $(OFILES) CONT-O FADU-O FTAM-O
@$(UTILDIR)version.sh ftam > $@
--- 134,209 ----
-@ls -l $@
-@echo "FTAM library built normally"
! FTAM_tables.o : FTAM_tables.c CONT-types.h FADU-types.h # ACS-types.h
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) FTAM_tables.c
! FADU_tables.o : FADU_tables.c FADU-types.h
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) FADU_tables.c
! ACS_tables.o : ACS_tables.c ACS-types.h
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) ACS_tables.c
! CONT_tables.o : CONT_tables.c CONT-types.h
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) CONT_tables.c
! FTAM_tables.c FTAM-types.h : ftam.py $(POSY)/posy
! $(POSY)/posy -A -m -h -f ftam.py >/dev/null
! FADU_tables.c FADU-types.h : fadu.py $(POSY)/posy
! $(POSY)/posy -A -m -h -f fadu.py >/dev/null
! CONT_tables.c CONT-types.h : cont.py $(POSY)/posy
! $(POSY)/posy -A -m -h -f cont.py >/dev/null
! ACS_tables.c ACS-types.h : acs.py $(POSY)/posy
! $(POSY)/posy -A -m -f acs.py >/dev/null
+ # CONT-O= CONT-[0-9]*.o
+ CONT-O= CONT_tables.o
+ #CONT-C= CONT-[0-9]*.c
+
+ # CONT-O: CONT-C
+ # @$(MAKE) `/bin/ls $(CONT-C) | sed 's/\.c$$/.o/'`
+ # -@touch $@
+ CONT-O: CONT_tables.o
+
+ # CONT-C: CONT-types.py $(TOPDIR)pepsy/pepy
+ # -@rm -f $(CONT-C) $(CONT-O)
+ # $(TOPDIR)pepsy/xpepy -a PY_advise -A -b CONT -m $(PYFLAGS) \
+ # CONT-types.py
+ # -@touch $@
+
+ # FADU-O = FADU-[0-9]*.o
+ FADU-O = FADU_tables.o
+ # FADU-C = FADU-[0-9]*.c
+
+ # FADU-O: FADU-C
+ # @$(MAKE) `/bin/ls $(FADU-C) | sed 's/\.c$$/.o/'`
+ # -@touch $@
+ FADU-O : FADU_tables.o
+
+ # FADU-C: FADU-types.py $(TOPDIR)pepsy/pepy
+ # -@rm -f $(FADU-C) $(FADU-O)
+ # $(TOPDIR)pepsy/pepy -a PY_advise -A -b FADU -m $(PYFLAGS) \
+ # FADU-types.py
+ # -@touch $@
+
+ FTAM-O = FTAM_tables.o
+ # FTAM-O= FTAM-[0-9]*.o
+ # FTAM-C= FTAM-[0-9]*.c
+
+ # FTAM-O: FTAM-C
+ ## @$(MAKE) `/bin/ls $(FTAM-C) | sed 's/\.c$$/.o/'`
+ ## -@touch $@
+ FTAM-O : FTAM_tables.o
+
+ #FTAM-C: FTAM-types.py $(TOPDIR)pepsy/pepy
+ # -@rm -f $(FTAM-C) $(FTAM-O)
+ # $(TOPDIR)pepsy/pepy -a PY_advise -A -b FTAM -m $(PYFLAGS) \
+ # FTAM-types.py
+ # -@touch $@
+
ftamvrsn.c: $(OFILES) CONT-O FADU-O FTAM-O
@$(UTILDIR)version.sh ftam > $@
***************
*** 199,227 ****
ftamdocument.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
ftamfdf.o: $(HXFILES)
! CONT-types.h CONT-types.py: cont.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o CONT-types.py $(POFLAGS) \
! cont.py
! CONT-print.c:cont.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ \
! $(PYFLAGS) cont.py
! FADU-types.h FADU-types.py: fadu.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o FADU-types.py $(POFLAGS) \
! fadu.py
! FADU-print.c: fadu.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ \
! $(PYFLAGS) fadu.py
! FTAM-types.h FTAM-types.py: ftam.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o FTAM-types.py $(POFLAGS) \
! ftam.py
! FTAM-print.c: ftam.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ \
! $(PYFLAGS) ftam.py
################################################################
--- 242,270 ----
ftamdocument.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
ftamfdf.o: $(HXFILES)
! #CONT-types.h CONT-types.py: cont.py $(TOPDIR)pepsy/posy
! # $(TOPDIR)pepsy/posy -f -h -m -o CONT-types.py $(POFLAGS) \
! # cont.py
! #CONT-print.c:cont.py $(TOPDIR)pepsy/pepy
! # $(TOPDIR)pepsy/pepy -a PY_advise -d -m -S PRINT -o $@ \
! # $(PYFLAGS) cont.py
! #FADU-types.h FADU-types.py: fadu.py $(TOPDIR)pepsy/posy
! # $(TOPDIR)pepsy/posy -f -h -m -o FADU-types.py $(POFLAGS) \
! # fadu.py
! #FADU-print.c: fadu.py $(TOPDIR)pepsy/pepy
! # $(TOPDIR)pepsy/pepy -a PY_advise -d -m -S PRINT -o $@ \
! # $(PYFLAGS) fadu.py
! #FTAM-types.h FTAM-types.py: ftam.py $(TOPDIR)pepsy/posy
! # $(TOPDIR)pepsy/posy -f -h -m -o FTAM-types.py $(POFLAGS) \
! # ftam.py
! #FTAM-print.c: ftam.py $(TOPDIR)pepsy/pepy
! # $(TOPDIR)pepsy/pepy -a PY_advise -d -m -S PRINT -o $@ \
! # $(PYFLAGS) ftam.py
################################################################
*** /src/isode/isode-6.0/ftam2/ftam-get.c Fri Jan 12 18:48:41 1990
--- ftam2/ftam-get.c Thu Jan 18 09:27:08 1990
***************
*** 356,363 ****
ftop -> ftop_mode = FA_PERM_READ;
ftop -> ftop_contents = vf -> vf_oid;
if (vf -> vf_parameter) {
! if ((*vf -> vf_encode) (¶m, 1, 0, NULLCP, vf -> vf_parameter)
! == NOTOK) {
advise (NULLCP, "unable to build document type parameter: %s",
PY_pepy);
return NOTOK;
--- 356,363 ----
ftop -> ftop_mode = FA_PERM_READ;
ftop -> ftop_contents = vf -> vf_oid;
if (vf -> vf_parameter) {
! if (enc_f(vf->vf_number, &_ZDOCS_mod, ¶m, 1, 0, NULLCP,
! vf -> vf_parameter) == NOTOK) {
advise (NULLCP, "unable to build document type parameter: %s",
PY_pepy);
return NOTOK;
***************
*** 405,415 ****
case VFS_UBF:
case VFS_UTF:
effector = 1;
! if (ftop -> ftop_parameter && myvf -> vf_decode) {
caddr_t parm = NULL;
! if ((*myvf -> vf_decode) (ftop -> ftop_parameter, 1,
! NULLIP, NULLVP, &parm)
== NOTOK)
advise (NULLCP,
"unable to parse document type parameter: %s",
--- 405,415 ----
case VFS_UBF:
case VFS_UTF:
effector = 1;
! if (ftop -> ftop_parameter && myvf -> vf_number >= 0) {
caddr_t parm = NULL;
! if (dec_f(myvf -> vf_number, &_ZDOCS_mod,
! ftop -> ftop_parameter, 1, NULLIP, NULLVP, &parm)
== NOTOK)
advise (NULLCP,
"unable to parse document type parameter: %s",
***************
*** 458,464 ****
break;
}
if (parm)
! (void) (*myvf -> vf_free) (parm);
}
if (debug)
advise (NULLCP, "effector=%d", effector);
--- 458,465 ----
break;
}
if (parm)
! fre_obj(parm, _ZDOCS_mod.md_dtab[myvf->vf_number],
! &_ZDOCS_mod);
}
if (debug)
advise (NULLCP, "effector=%d", effector);
***************
*** 714,725 ****
if (vf -> vf_oid
&& (vf -> vf_flags & VF_OK)
&& oid_cmp (vf -> vf_oid, fa -> fa_contents) == 0) {
! if (fa -> fa_parameter && vf -> vf_decode) {
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! (void) (*vf -> vf_free) (vf ->vf_parameter);
vf -> vf_parameter = NULL, vf -> vf_flags &= ~VF_PARM;
! if ((*vf -> vf_decode) (fa -> fa_parameter, 1, NULLIP,
! NULLVP, &vf -> vf_parameter)
== NOTOK) {
advise (NULLCP,
"unable to parse document type parameter: %s",
--- 715,728 ----
if (vf -> vf_oid
&& (vf -> vf_flags & VF_OK)
&& oid_cmp (vf -> vf_oid, fa -> fa_contents) == 0) {
! if (fa -> fa_parameter && vf -> vf_number >= 0) {
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! fre_obj(vf->vf_parameter,
! _ZDOCS_mod.md_dtab[vf->vf_number], &_ZDOCS_mod);
vf -> vf_parameter = NULL, vf -> vf_flags &= ~VF_PARM;
! if (dec_f(vf -> vf_number, &_ZDOCS_mod,
! fa -> fa_parameter, 1, NULLIP, NULLVP,
! &vf -> vf_parameter)
== NOTOK) {
advise (NULLCP,
"unable to parse document type parameter: %s",
*** /src/isode/isode-6.0/ftam2/ftam-put.c Fri Jan 12 13:35:46 1990
--- ftam2/ftam-put.c Thu Jan 18 09:27:09 1990
***************
*** 419,426 ****
param = NULLPE;
if (vf -> vf_parameter
! && (*vf -> vf_encode) (¶m, 1, 0, NULLCP, vf -> vf_parameter)
! == NOTOK) {
advise (NULLCP, "unable to build document type parameter: %s",
PY_pepy);
return NOTOK;
--- 419,426 ----
param = NULLPE;
if (vf -> vf_parameter
! && enc_f(vf -> vf_number, &_ZDOCS_mod, ¶m, 1, 0, NULLCP,
! vf -> vf_parameter) == NOTOK) {
advise (NULLCP, "unable to build document type parameter: %s",
PY_pepy);
return NOTOK;
***************
*** 549,559 ****
/* and fall... */
case VFS_UBF:
effector = 1;
! if (ftop -> ftop_parameter && myvf -> vf_decode) {
caddr_t parm = NULL;
! if ((*myvf -> vf_decode) (ftop -> ftop_parameter, 1,
! NULLIP, NULLVP, &parm)
== NOTOK)
advise (NULLCP,
"unable to parse document type parameter: %s",
--- 549,559 ----
/* and fall... */
case VFS_UBF:
effector = 1;
! if (ftop -> ftop_parameter && myvf -> vf_number >= 0) {
caddr_t parm = NULL;
! if (dec_f(myvf -> vf_number, &_ZDOCS_mod,
! ftop -> ftop_parameter, 1, NULLIP, NULLVP, &parm)
== NOTOK)
advise (NULLCP,
"unable to parse document type parameter: %s",
***************
*** 601,607 ****
break;
}
if (parm)
! (void) (*myvf -> vf_free) (parm);
}
if (debug)
advise (NULLCP, "effector=%d id=0x%x",
--- 601,608 ----
break;
}
if (parm)
! fre_obj(parm, _ZDOCS_mod.md_dtab[myvf->vf_number],
! &_ZDOCS_mod);
}
if (debug)
advise (NULLCP, "effector=%d id=0x%x",
*** /src/isode/isode-6.0/ftam2/ftamd-select.c Fri Nov 24 18:46:23 1989
--- ftam2/ftamd-select.c Thu Jan 18 09:27:10 1990
***************
*** 636,643 ****
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if ((*myvf -> vf_encode) (&rdparam, 1, 0, NULLCP,
! myvf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
if (rdparam)
--- 636,643 ----
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if (enc_f(myvf -> vf_number, &_ZDOCS_mod, &rdparam, 1, 0,
! NULLCP, myvf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
if (rdparam)
***************
*** 681,688 ****
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if ((*myvf -> vf_encode) (&rdparam, 1, 0, NULLCP,
! myvf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
if (rdparam)
--- 681,688 ----
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if (enc_f(myvf -> vf_number, &_ZDOCS_mod, &rdparam, 1, 0,
! NULLCP, myvf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
if (rdparam)
***************
*** 700,706 ****
}
if (ftop -> ftop_parameter) {
! if (!myvf -> vf_decode) {
(void) sprintf (dp -> ftd_data,
"unexpected document type parameter");
dp -> ftd_cc = strlen (dp -> ftd_data);
--- 700,706 ----
}
if (ftop -> ftop_parameter) {
! if (myvf -> vf_number < 0) {
(void) sprintf (dp -> ftd_data,
"unexpected document type parameter");
dp -> ftd_cc = strlen (dp -> ftd_data);
***************
*** 707,714 ****
goto bad_param;
}
myparam = NULL;
! if ((*myvf -> vf_decode) (ftop -> ftop_parameter, 1, NULLIP,
! NULLVP, &myparam) == NOTOK) {
(void) sprintf (dp -> ftd_data,
"unable to parse document type parameter: %s",
PY_pepy);
--- 707,714 ----
goto bad_param;
}
myparam = NULL;
! if (dec_f(myvf -> vf_number, &_ZDOCS_mod, ftop -> ftop_parameter,
! 1, NULLIP, NULLVP, &myparam) == NOTOK) {
(void) sprintf (dp -> ftd_data,
"unable to parse document type parameter: %s",
PY_pepy);
***************
*** 785,791 ****
myfd = NOTOK;
}
if (myvf && myparam) {
! (void) (*myvf -> vf_free) (myparam);
myparam = NULL;
}
}
--- 785,791 ----
myfd = NOTOK;
}
if (myvf && myparam) {
! fre_obj(myparam, _ZDOCS_mod.md_dtab[myvf->vf_number], &_ZDOCS_mod);
myparam = NULL;
}
}
***************
*** 1112,1123 ****
if (proposed
&& oid_cmp (proposed, vf -> vf_oid) == 0
&& parameter
! && vf -> vf_decode
&& vf -> vf_check) {
caddr_t p = NULL;
! if ((*vf -> vf_decode) (parameter, 1, NULLIP, NULLVP, &p)
! == NOTOK) {
advise (LLOG_NOTICE, NULLCP,
"unable to parse document type parameter: %s",
PY_pepy);
--- 1112,1123 ----
if (proposed
&& oid_cmp (proposed, vf -> vf_oid) == 0
&& parameter
! && vf -> vf_number >= 0
&& vf -> vf_check) {
caddr_t p = NULL;
! if (dec_f(vf -> vf_number, &_ZDOCS_mod, parameter, 1, NULLIP,
! NULLVP, &p) == NOTOK) {
advise (LLOG_NOTICE, NULLCP,
"unable to parse document type parameter: %s",
PY_pepy);
***************
*** 1129,1135 ****
dp -> ftd_data);
goto bad_param;
}
! (*vf -> vf_free) (p);
fa -> fa_parameter = parameter;
}
bad_param: ;
--- 1129,1136 ----
dp -> ftd_data);
goto bad_param;
}
! fre_obj(p, _ZDOCS_mod.md_dtab[vf->vf_number],
! &_ZDOCS_mod);
fa -> fa_parameter = parameter;
}
bad_param: ;
***************
*** 1138,1144 ****
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if ((*vf -> vf_encode) (&rdparam, 1, 0, NULLCP,
vf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
--- 1139,1145 ----
if (rdparam)
pe_free (rdparam), rdparam = NULLPE;
! if (enc_f(vf -> vf_number, &_ZDOCS_mod, &rdparam, 1, 0, NULLCP,
vf -> vf_parameter) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"unable to build parameter: %s", PY_pepy);
*** /src/isode/isode-6.0/ftam2/ftamsbr.c Fri Nov 24 18:46:25 1989
--- ftam2/ftamsbr.c Thu Jan 18 09:27:11 1990
***************
*** 224,230 ****
register struct type_DOCS_FTAM__3__Parameters *p3 = &p3s;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! (void) (*vf -> vf_free) (vf -> vf_parameter);
vf -> vf_parameter = (caddr_t) p3, vf -> vf_flags &= ~VF_PARM;
--- 224,230 ----
register struct type_DOCS_FTAM__3__Parameters *p3 = &p3s;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! fre_obj(vf->vf_parameter, _ZDOCS_mod.md_dtab[vf->vf_number], &_ZDOCS_mod);
vf -> vf_parameter = (caddr_t) p3, vf -> vf_flags &= ~VF_PARM;
***************
*** 282,288 ****
register struct type_DOCS_FTAM__1__Parameters *p1 = &p1s;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! (void) (*vf -> vf_free) (vf -> vf_parameter);
vf -> vf_parameter = (caddr_t) p1, vf -> vf_flags &= ~VF_PARM;
--- 282,289 ----
register struct type_DOCS_FTAM__1__Parameters *p1 = &p1s;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! fre_obj(vf->vf_parameter, _ZDOCS_mod.md_dtab[vf->vf_number],
! &_ZDOCS_mod);
vf -> vf_parameter = (caddr_t) p1, vf -> vf_flags &= ~VF_PARM;
***************
*** 365,371 ****
struct FTAMindication ftis;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! (void) (*vf -> vf_free) (vf -> vf_parameter);
vf -> vf_parameter = NULLCP, vf -> vf_flags &= ~VF_PARM;
--- 366,373 ----
struct FTAMindication ftis;
if (vf -> vf_parameter && (vf -> vf_flags & VF_PARM))
! fre_obj(vf->vf_parameter, _ZDOCS_mod.md_dtab[vf->vf_number],
! &_ZDOCS_mod);
vf -> vf_parameter = NULLCP, vf -> vf_flags &= ~VF_PARM;
*** /src/isode/isode-6.0/ftam2/ftamsbr.h Fri Nov 24 18:46:25 1989
--- ftam2/ftamsbr.h Thu Jan 18 09:27:12 1990
***************
*** 166,174 ****
--- 166,177 ----
< 0 parameter optional
== 0 parameter illegal */
IFP vf_check; /* .. check */
+ #if 0
IFP vf_encode; /* .. encode */
IFP vf_decode; /* .. decode */
IFP vf_free; /* .. free */
+ #endif
+ int vf_number; /* encode/decode index */
char *vf_text; /* textual description */
};
***************
*** 176,188 ****
--- 179,195 ----
struct vfsmap *st2vfs ();
+ #define WATCH(fnx, pe, rw)
+ #if 0
#define WATCH(fnx, pe, rw) \
vpdu (ftam_log, fnx, pe, rw ? "F-DATA.INDICATION" : "F-DATA.REQUEST", rw)
+ #endif
int binarypeek (), textpeek (), fdfpeek ();
int binarycheck (), textcheck ();
+ #if 0
int encode_DOCS_FTAM__1__Parameters (),
decode_DOCS_FTAM__1__Parameters (),
free_DOCS_FTAM__1__Parameters ();
***************
*** 192,197 ****
--- 199,205 ----
int encode_DOCS_NBS__9__Parameters (),
decode_DOCS_NBS__9__Parameters (),
free_DOCS_NBS__9__Parameters ();
+ #endif
/* \f
*/
*** /src/isode/isode-6.0/ftam2/ftamsystem.c Fri Nov 24 18:46:25 1989
--- ftam2/ftamsystem.c Sun Jan 21 12:53:40 1990
***************
*** 80,88 ****
"FTAM-3", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, binarypeek, 'b', VFS_XXX,
FA_ACC_UA,
-1, binarycheck,
! encode_DOCS_FTAM__3__Parameters,
! decode_DOCS_FTAM__3__Parameters,
! free_DOCS_FTAM__3__Parameters,
"unstructured binary file",
/* VFS_UTF */
--- 80,86 ----
"FTAM-3", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, binarypeek, 'b', VFS_XXX,
FA_ACC_UA,
-1, binarycheck,
! _ZFTAM_3_ParametersDOCS,
"unstructured binary file",
/* VFS_UTF */
***************
*** 89,97 ****
"FTAM-1", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, textpeek, 't', VFS_UBF,
FA_ACC_UA,
-1, textcheck,
! encode_DOCS_FTAM__1__Parameters,
! decode_DOCS_FTAM__1__Parameters,
! free_DOCS_FTAM__1__Parameters,
"unstructured text file",
/* VFS_FDF */
--- 87,93 ----
"FTAM-1", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, textpeek, 't', VFS_UBF,
FA_ACC_UA,
-1, textcheck,
! _ZFTAM_1_ParametersDOCS,
"unstructured text file",
/* VFS_FDF */
***************
*** 98,106 ****
"NBS-9", NULLOID, NULLCP, VF_NULL, 0, S_IFDIR, fdfpeek, 'd', VFS_XXX,
FA_ACC_UA,
1, NULLIFP,
! encode_DOCS_NBS__9__Parameters,
! decode_DOCS_NBS__9__Parameters,
! free_DOCS_NBS__9__Parameters,
"file directory file",
NULL
--- 94,100 ----
"NBS-9", NULLOID, NULLCP, VF_NULL, 0, S_IFDIR, fdfpeek, 'd', VFS_XXX,
FA_ACC_UA,
1, NULLIFP,
! _ZNBS_9_ParametersDOCS,
"file directory file",
NULL
*** /src/isode/isode-6.0/ftam2/ftamuser.c Fri Jan 12 13:35:55 1990
--- ftam2/ftamuser.c Thu Jan 18 09:27:13 1990
***************
*** 834,842 ****
"default", NULLOID, NULLCP, VF_NULL, 0, 0, NULLIFP, ' ', VFS_XXX,
0,
0, NULLIFP,
! NULLIFP,
! NULLIFP,
! NULLIFP,
NULLCP,
/* VFS_UBF */
--- 834,840 ----
"default", NULLOID, NULLCP, VF_NULL, 0, 0, NULLIFP, ' ', VFS_XXX,
0,
0, NULLIFP,
! -1,
NULLCP,
/* VFS_UBF */
***************
*** 843,851 ****
"FTAM-3", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, binarypeek, 'b', VFS_XXX,
FA_ACC_UA,
1, binarycheck,
! encode_DOCS_FTAM__3__Parameters,
! decode_DOCS_FTAM__3__Parameters,
! free_DOCS_FTAM__3__Parameters,
"unstructured binary file",
/* VFS_UTF */
--- 841,847 ----
"FTAM-3", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, binarypeek, 'b', VFS_XXX,
FA_ACC_UA,
1, binarycheck,
! _ZFTAM_3_ParametersDOCS,
"unstructured binary file",
/* VFS_UTF */
***************
*** 852,860 ****
"FTAM-1", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, textpeek, 't', VFS_UBF,
FA_ACC_UA,
1, textcheck,
! encode_DOCS_FTAM__1__Parameters,
! decode_DOCS_FTAM__1__Parameters,
! free_DOCS_FTAM__1__Parameters,
"unstructured text file",
/* VFS_FDF */
--- 848,854 ----
"FTAM-1", NULLOID, NULLCP, VF_WARN, 0, S_IFREG, textpeek, 't', VFS_UBF,
FA_ACC_UA,
1, textcheck,
! _ZFTAM_1_ParametersDOCS,
"unstructured text file",
/* VFS_FDF */
***************
*** 861,869 ****
"NBS-9", NULLOID, NULLCP, VF_NULL, 0, S_IFDIR, fdfpeek, 'd', VFS_XXX,
FA_ACC_UA,
0, NULLIFP,
! encode_DOCS_NBS__9__Parameters,
! decode_DOCS_NBS__9__Parameters,
! free_DOCS_NBS__9__Parameters,
"file directory file",
NULL
--- 855,861 ----
"NBS-9", NULLOID, NULLCP, VF_NULL, 0, S_IFDIR, fdfpeek, 'd', VFS_XXX,
FA_ACC_UA,
0, NULLIFP,
! _ZNBS_9_ParametersDOCS,
"file directory file",
NULL
*** /src/isode/isode-6.0/ftam2/Makefile Fri Nov 24 18:46:16 1989
--- ftam2/Makefile Thu Jan 18 09:27:14 1990
***************
*** 29,38 ****
.c.o:; $(CC) $(CFLAGS) -c $*.c
! .py.c:; $(TOPDIR)pepy/xpepy -a PY_advise -m $(PYFLAGS) $<
! LIBES = $(TOPDIR)libftam.a $(TOPDIR)libisode.a
LLIBS = $(TOPDIR)llib-lftam $(TOPDIR)llib-lisode
CFILES = ftamd.c ftamsystem.c ftamd-manage.c ftamd-select.c \
ftamd-trans.c \
--- 29,43 ----
.c.o:; $(CC) $(CFLAGS) -c $*.c
! ISODE = ..
! PEPSY = ../pepy/posy
! DOCS-O = DOCS_tables.o
! #.py.c:; $(TOPDIR)pepy/xpepy -a PY_advise -m $(PYFLAGS) $<
+ OPEPSY = ../libpepsy.a
+ FTAM = ../libftam.a
! LIBES = $(FTAM) $(OPEPSY) $(TOPDIR)libisode.a
LLIBS = $(TOPDIR)llib-lftam $(TOPDIR)llib-lisode
CFILES = ftamd.c ftamsystem.c ftamd-manage.c ftamd-select.c \
ftamd-trans.c \
***************
*** 60,68 ****
# ftamd
##################################################################
! inst-ftamd: $(SBINDIR)iso.ftam
! $(SBINDIR)iso.ftam: xftamd
-cp $@ ziso.ftam
-rm -f $@
cp xftamd $@
--- 65,73 ----
# ftamd
##################################################################
! inst-ftamd: $(ETCDIR)iso.ftam
! $(ETCDIR)iso.ftam: xftamd
-cp $@ ziso.ftam
-rm -f $@
cp xftamd $@
***************
*** 72,81 ****
ftamd: xftamd
xftamd: ftamd.o ftamsystem.o ftamd-manage.o ftamd-select.o \
! ftamd-trans.o ftamsbr.o DOCS-O DOCS-print.o $(LIBES)
! $(LDCC) $(LDFLAGS) -o $@ ftamd.o ftamsystem.o ftamd-manage.o \
ftamd-select.o ftamd-trans.o ftamsbr.o $(DOCS-O) \
! DOCS-print.o $(LIBES) $(LSOCKET)
l-ftamd: DOCS-C DOCS-print.c true
$(LINT) $(LFLAGS) ftamd.c ftamsystem.c ftamd-manage.c \
--- 77,86 ----
ftamd: xftamd
xftamd: ftamd.o ftamsystem.o ftamd-manage.o ftamd-select.o \
! ftamd-trans.o ftamsbr.o $(DOCS-O) $(LIBES)
! $(LDCC) -o $@ ftamd.o ftamsystem.o ftamd-manage.o \
ftamd-select.o ftamd-trans.o ftamsbr.o $(DOCS-O) \
! $(LIBES) $(LSOCKET)
l-ftamd: DOCS-C DOCS-print.c true
$(LINT) $(LFLAGS) ftamd.c ftamsystem.c ftamd-manage.c \
***************
*** 107,117 ****
xftam: ftam.o ftamuser.o ftam-assoc.o ftam-dir.o ftam-get.o \
ftam-glob.o ftam-ls.o ftam-mgmt.o ftam-put.o \
! ftamsbr.o DOCS-O DOCS-print.o $(LIBES)
! $(LDCC) $(LDFLAGS) -o $@ ftam.o ftamuser.o ftam-assoc.o \
ftam-dir.o ftam-get.o ftam-glob.o ftam-ls.o \
ftam-mgmt.o ftam-put.o ftamsbr.o $(DOCS-O) \
! DOCS-print.o $(LIBES) $(LSOCKET)
l-ftam: DOCS-C DOCS-print.c true
$(LINT) $(LFLAGS) ftam.c ftamuser.c ftam-assoc.c ftam-dir.c \
--- 112,122 ----
xftam: ftam.o ftamuser.o ftam-assoc.o ftam-dir.o ftam-get.o \
ftam-glob.o ftam-ls.o ftam-mgmt.o ftam-put.o \
! ftamsbr.o $(DOCS-O) $(LIBES)
! $(LDCC) -o $@ ftam.o ftamuser.o ftam-assoc.o \
ftam-dir.o ftam-get.o ftam-glob.o ftam-ls.o \
ftam-mgmt.o ftam-put.o ftamsbr.o $(DOCS-O) \
! ../pepsy/prnt.o $(LIBES) $(LSOCKET)
l-ftam: DOCS-C DOCS-print.c true
$(LINT) $(LFLAGS) ftam.c ftamuser.c ftam-assoc.c ftam-dir.c \
***************
*** 138,150 ****
ftamsbr.o: ftamsbr.h DOCS-types.h $(HFILES)
! DOCS-O = DOCS-[0-9]*.o
DOCS-C = DOCS-[0-9]*.c
! DOCS-O: DOCS-C
! @$(MAKE) `/bin/ls $(DOCS-C) | sed 's/\.c$$/.o/'`
! -@touch $@
DOCS-C: DOCS-types.py $(TOPDIR)pepy/xpepy
-@rm -f $(DOCS-C) $(DOCS-O)
$(TOPDIR)pepy/xpepy -a PY_advise -A -b DOCS -m $(PYFLAGS) \
--- 143,163 ----
ftamsbr.o: ftamsbr.h DOCS-types.h $(HFILES)
! DOCS-types.h DOCS_tables.c : docs.py $(PEPSY)
! $(PEPSY) -A -m -f docs.py > /dev/null
!
! DOCS_tables.o : DOCS_tables.c DOCS-types.h
! $(CC) -c -I../ftam -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) DOCS_tables.c
!
! #DOCS-O = DOCS-[0-9]*.o
DOCS-C = DOCS-[0-9]*.c
! DOCS-O: DOCS_tables.o
+ #DOCS-O: DOCS-C
+ # @$(MAKE) `/bin/ls $(DOCS-C) | sed 's/\.c$$/.o/'`
+ # -@touch $@
+
DOCS-C: DOCS-types.py $(TOPDIR)pepy/xpepy
-@rm -f $(DOCS-C) $(DOCS-O)
$(TOPDIR)pepy/xpepy -a PY_advise -A -b DOCS -m $(PYFLAGS) \
***************
*** 151,163 ****
DOCS-types.py
-@touch $@
! DOCS-types.h DOCS-types.py: docs.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o DOCS-types.py $(POFLAGS) \
! docs.py
! DOCS-print.c: docs.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ \
! $(PYFLAGS) docs.py
##################################################################
--- 164,176 ----
DOCS-types.py
-@touch $@
! #DOCS-types.h DOCS-types.py: docs.py $(TOPDIR)pepy/xposy
! # $(TOPDIR)pepy/xposy -f -h -m -o DOCS-types.py $(POFLAGS) \
! # docs.py
! #DOCS-print.c: docs.py $(TOPDIR)pepy/xpepy
! # $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ \
! # $(PYFLAGS) docs.py
##################################################################
*** /src/isode/isode-6.0/pepy/posy.c Fri Jan 12 13:37:14 1990
--- pepy/posy.c Thu Jan 18 09:27:21 1990
***************
*** 59,64 ****
--- 59,65 ----
#include <stdio.h>
#include <varargs.h>
#include "pepy.h"
+ #include "pass2.h"
#define SVAL(s) ((s) ? (s) : "")
***************
*** 67,72 ****
--- 68,74 ----
/* \f
DATA */
static int aflag = 0;
+ int Aflag = 0; /* Don't so all modes by default */
int Cflag = 0; /* posy */
int dflag = 0;
int Pflag = 0; /* pepy compat ... */
***************
*** 77,84 ****
static int fflag = 0;
static int linepos = 0;
static int mflag = 0;
! static int sflag = 0;
#define hflag (options[0])
#define Hflag (options[1])
#define h2flag (options[2])
--- 79,88 ----
static int fflag = 0;
static int linepos = 0;
static int mflag = 0;
! int sflag = 0;
+ int p_debug = 3;
+
#define hflag (options[0])
#define Hflag (options[1])
#define h2flag (options[2])
***************
*** 86,92 ****
static int options[NOPTIONS];
! static char *eval = NULLCP;
char *mymodule = "";
OID mymoduleid = NULLOID;
--- 90,96 ----
static int options[NOPTIONS];
! char *eval = NULLCP;
char *mymodule = "";
OID mymoduleid = NULLOID;
***************
*** 110,117 ****
static char *tags[] = {
"", "BOOLEAN", "INTEGER", "INTEGER", "BIT STRING", "BIT STRING",
"OCTET STRING", "NULL", "SEQUENCE", "SEQUENCE OF", "SEQUENCE", "SET",
! "SET OF", "SET", "CHOICE", "ANY", "OBJECT IDENTIFIER", "", "ENUMERATED",
! "REAL",
NULL
};
--- 114,120 ----
static char *tags[] = {
"", "BOOLEAN", "INTEGER", "INTEGER", "BIT STRING", "BIT STRING",
"OCTET STRING", "NULL", "SEQUENCE", "SEQUENCE OF", "SEQUENCE", "SET",
! "SET OF", "SET", "CHOICE", "ANY", "OBJECT IDENTIFIER", "",
NULL
};
***************
*** 148,161 ****
} symlist, *SY;
#define NULLSY ((SY) 0)
! static SY mysymbols = NULLSY;
char *gensym (), *modsym (), *array ();
MD lookup_module ();
SY new_symbol (), add_symbol ();
static double val2real ();
static void prime_default ();
YP lookup_type ();
/* \f
MAIN */
--- 151,166 ----
} symlist, *SY;
#define NULLSY ((SY) 0)
! SY mysymbols = NULLSY;
char *gensym (), *modsym (), *array ();
+ extern char *my_strcat(), *gfree();
MD lookup_module ();
SY new_symbol (), add_symbol ();
static double val2real ();
static void prime_default ();
+
YP lookup_type ();
/* \f
MAIN */
***************
*** 178,183 ****
--- 183,192 ----
for (argc--, argv++; argc > 0; argc--, argv++) {
cp = *argv;
+ if (strcmp (cp, "-A") == 0) {
+ Aflag++;
+ continue;
+ }
if (strcmp (cp, "-a") == 0) {
aflag++;
continue;
***************
*** 519,532 ****
fprintf (fdef, "#define\t_module_%s_defined_\n\n", modulename);
if (strcmp (mymodule, "UNIV")) {
! fprintf (fdef, "#include %s\n",
! mflag ? "\"psap.h\"" : "<isode/psap.h>");
if (mflag)
fprintf (fdef,"#ifndef\tPEPYPATH\n#define\tPEPYPATH\n#endif\n");
! fprintf (fdef, "#include %s\n",
! mflag ? "\"../pepy/UNIV-types.h\""
! : "<isode/pepy/UNIV-types.h>");
}
else {
fprintf (fdef, "#ifndef PEPYPATH\n#include <isode/psap.h>\n");
--- 528,540 ----
fprintf (fdef, "#define\t_module_%s_defined_\n\n", modulename);
if (strcmp (mymodule, "UNIV")) {
! fprintf (fdef, "#include %s\n",
! mflag ? PSAP_DOT_H : I_PSAP_DOT_H);
if (mflag)
fprintf (fdef,"#ifndef\tPEPYPATH\n#define\tPEPYPATH\n#endif\n");
! fprintf (fdef, "#include %s\n",
! mflag ? UNIV_TYPES_DOT_H : I_UNIV_TYPES_DOT_H);
}
else {
fprintf (fdef, "#ifndef PEPYPATH\n#include <isode/psap.h>\n");
***************
*** 533,538 ****
--- 541,560 ----
fprintf (fdef, "#else\n#include \"psap.h\"\n#endif\n");
}
+ /*
+ * Pepsy #includes
+ */
+ if (mflag) {
+ fprintf (fdef, "#include \"%s\"\n", INCFILE1);
+ fprintf (fdef, "#include \"%s\"\n", INCFILE2);
+ } else {
+ fprintf (fdef, "#include <isode/pepsy/%s>\n", INCFILE1);
+ fprintf (fdef, "#include <isode/pepsy/%s>\n", INCFILE2);
+ }
+
+ fprintf (fdef,"#include \"%s%s\"\n", mymodule, HFILE1);
+
+
fprintf (fdef, "\n\n");
if (fflag) {
***************
*** 576,581 ****
--- 598,606 ----
myyerror ("write error - %s", sys_errname (errno));
}
+ peri_pass2();
+
+ #if PEPY_GENERATE
if (Cflag == 0)
printf ("%%{\n#include <stdio.h>\n#include \"%s\"\n%%}\n", sysdef);
***************
*** 709,714 ****
--- 734,740 ----
}
printf ("\nEND\n");
+ #endif /* PEPY_GENERATE */
if (fflag) {
register int c;
***************
*** 937,943 ****
--- 963,972 ----
}
posy (yp, 1, 1, "parm", id, "parm", flg && h2flag);
fprintf (fdef, "};\n");
+ #if 0
fprintf (fdef, "int\t%s ();\n", modsym (mymodule, id, "free"));
+ #endif
+ fprintf (fdef, "#define\t%s(parm)\\\n\t%s\n", modsym (mymodule, id, "free"), gfree(mymodule, id, "parm"));
if (fflag) {
if (yp -> yp_code != YP_SEQTYPE &&
yp -> yp_code != YP_SETTYPE)
***************
*** 1623,1629 ****
/* \f
*/
! static posy (yp, top, level, id, val, var, arrayflg)
register YP yp;
int top,
level,
--- 1652,1658 ----
/* \f
*/
! posy (yp, top, level, id, val, var, arrayflg)
register YP yp;
int top,
level,
***************
*** 1647,1652 ****
--- 1676,1683 ----
(void) strcpy (bp = buf2, var);
bp += strlen (bp);
+ /* Preserve the name of the field */
+ yp->yp_varexp = new_string(yp -> yp_ptrname ? yp -> yp_ptrname : id);
switch (yp -> yp_code) {
case YP_BOOL:
***************
*** 1654,1660 ****
printag (yp, level + 4, NULLCP);
fprintf (fdef, "%*schar %s;\n", level * 4, "",
array(id, arrayflg));
- yp -> yp_varexp = new_string (buf2);
break;
case YP_INT:
--- 1685,1690 ----
***************
*** 1662,1670 ****
case YP_ENUMLIST:
if (aflag)
printag (yp, level + 4, NULLCP);
! fprintf (fdef, "%*sinteger %s;\n", level * 4, "",
array(id, arrayflg));
- yp -> yp_varexp = new_string (buf2);
if (yp -> yp_code == YP_INT)
break;
for (yv = yp -> yp_value; yv; yv = yv -> yv_next) {
--- 1692,1699 ----
case YP_ENUMLIST:
if (aflag)
printag (yp, level + 4, NULLCP);
! fprintf (fdef, "%*sint %s;\n", level * 4, "",
array(id, arrayflg));
if (yp -> yp_code == YP_INT)
break;
for (yv = yp -> yp_value; yv; yv = yv -> yv_next) {
***************
*** 1690,1696 ****
(level + 1) * 4, "", buf2,
(level + 2) * 4, "", buf2);
}
- yp -> yp_varexp = new_string (buf2);
if (yp -> yp_code != YP_BITLIST)
break;
i = -1;
--- 1719,1724 ----
***************
*** 1742,1748 ****
(level + 1) * 4, "", buf2,
(level + 2) * 4, "", buf2);
}
- yp -> yp_varexp = new_string (buf2);
break;
case YP_NULL:
--- 1770,1775 ----
***************
*** 1750,1757 ****
printag (yp, level + 4, NULLCP);
fprintf (fdef, "%*schar %s;\n", level * 4, "",
array(id, arrayflg));
- if (yp -> yp_flags & YP_OPTIONAL)
- yp -> yp_varexp = new_string (buf2);
break;
case YP_SEQ:
--- 1777,1782 ----
***************
*** 1770,1776 ****
(level + 1) * 4, "", buf2,
(level + 2) * 4, "", buf2);
}
- yp -> yp_varexp = new_string (buf2);
break;
case YP_SEQTYPE:
--- 1795,1800 ----
***************
*** 1811,1817 ****
if (dp)
(void) strcpy (dp, newid);
- yp -> yp_varexp = new_string (buf1);
if ((y = yp -> yp_type) -> yp_code == YP_IDEFINED && hflag) {
modsym_aux (y -> yp_identifier, cp = buf3);
if (h2flag) {
--- 1835,1840 ----
***************
*** 1971,1977 ****
}
if (dp)
(void) strcpy (dp, newid);
- yp -> yp_varexp = new_string (buf1);
for (y = yp -> yp_type, i = 0; y; y = y -> yp_next) {
if (y -> yp_flags & YP_OPTIONAL)
switch (y -> yp_code) {
--- 1994,1999 ----
***************
*** 2085,2091 ****
}
if (dp)
(void) strcpy (dp, newid);
- yp -> yp_varexp = new_string (buf1);
fprintf (fdef, "%*sint offset;\n", level * 4, "");
if (fflag)
fprintf (fact, "%*sswitch (%s -> offset) {\n",
--- 2107,2112 ----
***************
*** 2107,2112 ****
--- 2128,2135 ----
fprintf (fdef, "\n%*sunion {\n", level * 4, "");
level++;
for (y = yp -> yp_type; y; y = y -> yp_next) {
+ char *t;
+
if (y -> yp_flags & YP_ID)
modsym_aux (y -> yp_id, cp = buf1);
else
***************
*** 2118,2123 ****
--- 2141,2153 ----
}
(void) sprintf (bp, " -> un.%s", cp);
posy (y, 0, level, cp, "choice", buf2, 0);
+ /* prefix yp_varexp (field name) with un. so we will generate offsets that
+ * allow for the union all the CHOICE fields are imbedded in
+ */
+ t = y->yp_varexp;
+ y->yp_varexp = my_strcat("un.", t);
+ free(t);
+
*bp = NULL;
if (fflag) {
fprintf (fact, "%*sbreak;\n", level * 4, "");
***************
*** 2168,2179 ****
(level + 1) * 4, "", buf2,
(level + 2) * 4, "", buf2);
}
- yp -> yp_varexp = new_string (buf2);
break;
case YP_IDEFINED:
if (aflag)
printag (yp, level + 4, NULLCP);
fprintf (fdef, "%*sstruct %s *%s;\n", level * 4, "",
modsym (yp -> yp_module, yp -> yp_identifier, "type"),
array(id, arrayflg));
--- 2198,2221 ----
(level + 1) * 4, "", buf2,
(level + 2) * 4, "", buf2);
}
break;
case YP_IDEFINED:
if (aflag)
printag (yp, level + 4, NULLCP);
+ {
+ /* Predefined Universal Type */
+ struct univ_typ *p;
+ if ((p = univtyp(yp->yp_identifier))) {
+ fprintf (fdef, "%*s%s%s;\n", level * 4, "",
+ p->univ_data, array(id, arrayflg));
+ /*
+ if (fflag)
+ ferr(1, "posy:YP_IDEFINED:fflag not implemented\n");
+ */
+ break;
+ }
+ }
fprintf (fdef, "%*sstruct %s *%s;\n", level * 4, "",
modsym (yp -> yp_module, yp -> yp_identifier, "type"),
array(id, arrayflg));
***************
*** 2185,2191 ****
modsym (yp -> yp_module, yp -> yp_identifier, "free"),
buf2, (level + 2) * 4, "", buf2);
}
- yp -> yp_varexp = new_string (buf2);
break;
default:
--- 2227,2232 ----
***************
*** 2844,2850 ****
/* \f
MODULES */
! static MD lookup_module (module)
char *module;
{
register MD md;
--- 2885,2891 ----
/* \f
MODULES */
! MD lookup_module (module)
char *module;
{
register MD md;
***************
*** 3163,3169 ****
/* \f
*/
! static char *modsym (module, id, prefix)
register char *module,
*id;
char *prefix;
--- 3204,3210 ----
/* \f
*/
! char *modsym (module, id, prefix)
register char *module,
*id;
char *prefix;
*** /src/isode/isode-6.0/pepy/vprint.c Fri Nov 24 18:46:55 1989
--- pepy/vprint.c Thu Jan 18 09:27:41 1990
***************
*** 30,37 ****
#include <ctype.h>
#include <stdio.h>
#include <varargs.h>
! #include "psap.h"
! #include "logger.h"
int fprintf ();
--- 30,38 ----
#include <ctype.h>
#include <stdio.h>
#include <varargs.h>
! #include "../h/psap.h"
! #include "../h/logger.h"
! #include "UNIV-types.h"
int fprintf ();
***************
*** 54,61 ****
static char *vbp = NULL;
static char *vsp;
! static IFP vfnx = fprintf;
! static FILE *vfp = stdout;
static PS vps = NULLPS;
char *oct2str (), *newbuf ();
--- 55,62 ----
static char *vbp = NULL;
static char *vsp;
! IFP vfnx = fprintf;
! FILE *vfp = stdout;
static PS vps = NULLPS;
char *oct2str (), *newbuf ();
***************
*** 429,434 ****
--- 430,439 ----
/* \f
*/
+ #ifdef vunknown
+ #undef vunknown
+ #endif
+
vunknown (pe)
register PE pe;
{
***************
*** 629,637 ****
/* \f
VPDU */
! _vpdu (lp, fnx, pe, text, rw)
register LLog *lp;
! IFP fnx;
register PE pe;
char *text;
int rw;
--- 634,643 ----
/* \f
VPDU */
! _vpdu (lp, ind, mod, pe, text, rw)
register LLog *lp;
! int ind; /* index into tables */
! modtyp *mod; /* pointer to tables */
register PE pe;
char *text;
int rw;
***************
*** 653,659 ****
vlevel = didname = didvpush = didvpop = docomma = 0;
! (void) (*fnx) (pe, 1, NULLIP, NULLVP, NULLCP);
(void) ll_printf (lp, "-------\n");
--- 659,668 ----
vlevel = didname = didvpush = didvpop = docomma = 0;
! if (mod == NULL)
! (void) vunknown(pe, 1, NULLIP, NULLVP, NULLCP);
! else
! (void) prnt_f(ind, mod, pe, 1, NULLIP, NULLVP, NULLCP);
(void) ll_printf (lp, "-------\n");
*** /src/isode/isode-6.0/pepy/Makefile Fri Jan 12 13:37:04 1990
--- pepy/Makefile Sun Jan 21 12:57:41 1990
***************
*** 27,32 ****
--- 27,33 ----
#
###############################################################################
+
.SUFFIXES: .py .c .o
.py.c:; ./xpepy -a PY_advise -m $(PYFLAGS) $<
***************
*** 50,56 ****
# Here it is...
##################################################################
! all: pepy posy libpepy pepytest pp
inst-all: inst-pepy inst-posy inst-headers manuals # inst-libpepy
install: inst-all clean
tests: pepytest pp mpp salary hello_world bigpepytest true
--- 51,58 ----
# Here it is...
##################################################################
! #all: pepy posy libpepy pepytest pp
! all: posy libpepy
inst-all: inst-pepy inst-posy inst-headers manuals # inst-libpepy
install: inst-all clean
tests: pepytest pp mpp salary hello_world bigpepytest true
***************
*** 85,91 ****
xpepy: pepyvrsn.o $(PEPYLIBES)
$(LDCC) $(LDFLAGS) -o $@ pepy.o pepy_do.o pepy_undo.o \
yacc.o pepy_misc.o pepyvrsn.o $(PEPYLIBES) \
! $(LSOCKET) -lm
pepy.o: pepy.c pepy.h $(HFILES)
--- 87,93 ----
xpepy: pepyvrsn.o $(PEPYLIBES)
$(LDCC) $(LDFLAGS) -o $@ pepy.o pepy_do.o pepy_undo.o \
yacc.o pepy_misc.o pepyvrsn.o $(PEPYLIBES) \
! $(LSOCKET) -Bstatic -lm
pepy.o: pepy.c pepy.h $(HFILES)
***************
*** 107,113 ****
mv y.tab.c $@
yacc.y: yacc.y.gnrc
! $(UTILDIR)extract.sh PEPY < $? > $@
lex.c: lex.l
lex $(LEXFLAGS) lex.l
--- 109,115 ----
mv y.tab.c $@
yacc.y: yacc.y.gnrc
! $(UTILDIR)extract.sh PEPY NOSCTRL < $? > $@
lex.c: lex.l
lex $(LEXFLAGS) lex.l
***************
*** 137,152 ****
-@ls -gls $@
-@echo ""
! posy: xposy
! xposy: posy.o pepy_misc.o yacc.o pepyvrsn.o $(PEPYLIBES)
! $(LDCC) $(LDFLAGS) -o $@ posy.o pepy_misc.o yacc.o \
pepyvrsn.o $(PEPYLIBES) $(LSOCKET) -lm
posy.o: posy.c pepy.h $(HFILES)
! l-posy: yacc.c lex.c true
! $(LINT) $(LFLAGS) posy.c yacc.c pepy_misc.c \
pepyvrsn.c $(LLIBS)
--- 139,185 ----
-@ls -gls $@
-@echo ""
! #posy: xposy
! # Now uses peri's code as well
! posy: posy.o pepy_misc.o posy-yacc.o pepyvrsn.o \
! pass2.o etabs.o dtabs.o ptabs.o dfns.o mod.o $(PEPYLIBES)
! $(LDCC) $(LDFLAGS) -o $@ posy.o pepy_misc.o posy-yacc.o \
! pass2.o etabs.o dtabs.o ptabs.o dfns.o mod.o \
pepyvrsn.o $(PEPYLIBES) $(LSOCKET) -lm
+ saber_posyo: posy.o pepy_misc.o posy-yacc.o pepyvrsn.o \
+ pass2.o etabs.o dtabs.o dfns.o mod.o $(PEPYLIBES)
+ #load $(LDFLAGS) posy.o pepy_misc.o posy-yacc.o \
+ pass2.o etabs.o dtabs.o dfns.o mod.o \
+ pepyvrsn.o $(PEPYLIBES) $(LSOCKET) -lm
+
+
+ saber_posy: posy.c pepy_misc.c posy-yacc.o pepyvrsn.c \
+ pass2.c etabs.c dtabs.c dfns.c mod.c $(PEPYLIBES)
+ #load $(CFLAGS) posy.c pepy_misc.c posy-yacc.o \
+ pass2.c etabs.c dtabs.c dfns.c mod.c \
+ pepyvrsn.o $(PEPYLIBES) $(LSOCKET) -lm
+
+
+ POSY_SRC = posy.c pepy_misc.c posy-yacc.y pepyvrsn.c \
+ pass2.c etabs.c dtabs.c dfns.c mod.c
+
+ tags: $(POSY_SRC)
+ ctags $(POSY_SRC)
+
posy.o: posy.c pepy.h $(HFILES)
! posy-yacc.c: posy-yacc.y
! -@echo "expect 20 shift/reduce and 9 reduce/reduce conflicts"
! yacc $(YACCFLAGS) posy-yacc.y
! mv y.tab.c $@
!
! posy-yacc.y: yacc.y.gnrc
! $(UTILDIR)extract.sh PEPY SCTRL < $? > $@
!
! l-posy: posy-yacc.c lex.c true
! $(LINT) $(LFLAGS) posy.c posy-yacc.c pepy_misc.c \
pepyvrsn.c $(LLIBS)
***************
*** 189,224 ****
-@ls -l $@
-@echo "PEPY library built normally"
! UNIV-O = UPEPY-[0-9]*.o VPEPY-[0-9]*.o
! UNIV-C = UPEPY-[0-9]*.c VPEPY-[0-9]*.c
! UNIV-O: UPEPY-C VPEPY-C
! @$(MAKE) `/bin/ls $(UPEPY-C) $(VPEPY-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! UNIV-C: UPEPY-C VPEPY-C
! UPEPY-O = UPEPY-[0-9]*.o
! UPEPY-C = UPEPY-[0-9]*.c
! UPEPY-C: xpepy UNIV.py
! -@rm -f $(UPEPY-C) $(UPEPY-O)
! ./xpepy -a PY_advise -m -A -b UPEPY UNIV.py
! -@touch $@
! VPEPY-O = VPEPY-[0-9]*.o
! VPEPY-C = VPEPY-[0-9]*.c
! VPEPY-C: xpepy UNIV-types.py
! -@rm -f $(VPEPY-C) $(VPEPY-O)
! ./xpepy -a PY_advise -m -b VPEPY UNIV-types.py
! -@touch $@
! UNIV-types.h: UNIV.py xposy
! ./xposy -f -h -m -o UNIV-types.py UNIV.py
! UNIV-types.py: UNIV.py xposy
! ./xposy -f -h -m -o UNIV-types.py UNIV.py
l-libpepy: $(CFILES) UNIV-C true
$(LINT) $(LFLAGS) $(CFILES) $(UNIV-C) $(LLIBS)
--- 222,266 ----
-@ls -l $@
-@echo "PEPY library built normally"
! #UNIV-O = UPEPY-[0-9]*.o VPEPY-[0-9]*.o
! UNIV-O = UNIV_tables.o
! #UNIV-C = UPEPY-[0-9]*.c VPEPY-[0-9]*.c
! #UNIV-O: UPEPY-C VPEPY-C
! # @$(MAKE) `/bin/ls $(UPEPY-C) $(VPEPY-C) | sed 's/\.c$$/.o/'`
! # -@touch $@
! UNIV-O: UNIV_tables.o
! #UNIV-C: UPEPY-C VPEPY-C
! #UPEPY-O = UPEPY-[0-9]*.o
! #UPEPY-C = UPEPY-[0-9]*.c
! #UPEPY-C: xpepy UNIV.py
! # -@rm -f $(UPEPY-C) $(UPEPY-O)
! # ./xpepy -a PY_advise -m -A -b UPEPY UNIV.py
! # -@touch $@
! #VPEPY-O = VPEPY-[0-9]*.o
! #VPEPY-C = VPEPY-[0-9]*.c
! #VPEPY-C: xpepy UNIV-types.py
! # -@rm -f $(VPEPY-C) $(VPEPY-O)
! # ./xpepy -a PY_advise -m -b VPEPY UNIV-types.py
! # -@touch $@
! UNIV-types.h UNIV_tables.c: UNIV.py posy
! ./posy -f -h -m -A UNIV.py
! -@rm -f ../h/UNIV-types.h
! -@rm -f ../h/UNIV_defs.h
! -@rm -f ../h/UNIV_pre_defs.h
! $(LN) UNIV-types.h ../h/UNIV-types.h
! $(LN) UNIV_defs.h ../h/UNIV_defs.h
! $(LN) UNIV_pre_defs.h ../h/UNIV_pre_defs.h
+ #UNIV-types.py: UNIV.py posy
+ # ./posy -f -h -m -o UNIV-types.py UNIV.py
+
l-libpepy: $(CFILES) UNIV-C true
$(LINT) $(LFLAGS) $(CFILES) $(UNIV-C) $(LLIBS)
***************
*** 329,335 ****
# manual pages
################################################################
! MANUALS = pepy.1 posy.1 # libpepy.3
manuals:; @$(UTILDIR)inst-man.sh $(MANOPTS) $(MANUALS)
-@echo ""
--- 371,377 ----
# manual pages
################################################################
! MANUALS = pepy.1 posy.1 libpepy.3
manuals:; @$(UTILDIR)inst-man.sh $(MANOPTS) $(MANUALS)
-@echo ""
*** /src/isode/isode-6.0/h/psap.h Fri Jan 19 11:41:44 1990
--- h/psap.h Thu Jan 18 09:27:43 1990
***************
*** 549,560 ****
int vpushpp (), vpopp ();
#define vpdu(lp,fnx,pe,text,rw) \
{ \
! int fnx (); \
! \
! _vpdu ((lp), fnx, (pe), (text), (rw)); \
}
int _vpdu ();
--- 549,562 ----
int vpushpp (), vpopp ();
+ /* handle calls to the vunknown print routine */
+ #define vunknown_P 0, 0
+
#define vpdu(lp,fnx,pe,text,rw) \
{ \
! _vpdu ((lp), fnx/**/_P, (pe), (text), (rw)); \
}
+
int _vpdu ();
*** /src/isode/isode-6.0/h/rosy.h Fri Jan 19 11:41:45 1990
--- h/rosy.h Thu Jan 18 09:27:44 1990
***************
*** 35,40 ****
--- 35,42 ----
#include "rosap.h" /* definitions for RoS-USERs */
#endif
+ #include "../pepsy/pep.h"
+ #include "../pepsy/pepdefs.h"
/* \f
*/
struct RyOperation {
***************
*** 41,54 ****
char *ryo_name; /* operation name */
int ryo_op; /* operation code */
! IFP ryo_arg_encode; /* encodes argument */
! IFP ryo_arg_decode; /* decodes .. */
! IFP ryo_arg_free; /* frees .. */
int ryo_result; /* result possible */
! IFP ryo_res_encode; /* encodes result */
! IFP ryo_res_decode; /* decodes .. */
! IFP ryo_res_free; /* frees .. */
struct RyError **ryo_errors;/* errors possible */
};
--- 43,54 ----
char *ryo_name; /* operation name */
int ryo_op; /* operation code */
! modtyp *ryo_arg_mod; /* pointer to table for arguement type */
! int ryo_arg_index; /* index to entry in tables */
int ryo_result; /* result possible */
! modtyp *ryo_res_mod; /* pointer to table for result type */
! int ryo_res_index; /* index to entry in tables */
struct RyError **ryo_errors;/* errors possible */
};
***************
*** 60,68 ****
char *rye_name; /* error name */
int rye_err; /* error code */
! IFP rye_param_encode; /* encodes parameter */
! IFP rye_param_decode; /* decodes .. */
! IFP rye_param_free; /* frees .. */
};
struct RyError *finderrbyerr (), *finderrbyname ();
--- 60,67 ----
char *rye_name; /* error name */
int rye_err; /* error code */
! modtyp *rye_param_mod; /* pointer to table for result type */
! int rye_param_index; /* index to entry in tables */
};
struct RyError *finderrbyerr (), *finderrbyname ();
***************
*** 89,95 ****
struct RoSAPindication opb_event; /* resulting event */
caddr_t opb_out; /* event parameter */
! IFP opb_free; /* free routine for event parameter */
PE opb_pe; /* for Simon */
};
--- 88,95 ----
struct RoSAPindication opb_event; /* resulting event */
caddr_t opb_out; /* event parameter */
! modtyp *opb_free_mod; /* pointer to table for result type */
! int opb_free_index; /* index to entry in tables */
PE opb_pe; /* for Simon */
};
***************
*** 109,115 ****
struct RyOperation *dsb_ryo;/* entry in operation table */
! IFP dsb_vector; /* dispatch vector */
};
#define NULLDSB ((struct dspblk *) 0)
--- 109,115 ----
struct RyOperation *dsb_ryo;/* entry in operation table */
! IFP dsb_vector; /* dispatch vector */
};
#define NULLDSB ((struct dspblk *) 0)
*** /src/isode/isode-6.0/psap2/Makefile Fri Nov 24 18:47:05 1989
--- psap2/Makefile Thu Jan 18 09:27:44 1990
***************
*** 41,47 ****
##################################################################
all: libpsap2
! inst-all: # inst-libpsap2 manuals
install: inst-all clean
lint: l-libpsap2
--- 41,47 ----
##################################################################
all: libpsap2
! inst-all: inst-libpsap2 manuals
install: inst-all clean
lint: l-libpsap2
***************
*** 63,69 ****
psapminor2.o psapresync1.o psapresync2.o psapabort.o \
psapreport.o psaprelease1.o psaprelease2.o psapselect.o \
psaplose.o \
! PS-print.o \
$(OSTRINGS)
inst-libpsap2: $(LIBDIR)libpsap2.a $(LINTDIR)llib-lpsap2
--- 63,69 ----
psapminor2.o psapresync1.o psapresync2.o psapabort.o \
psapreport.o psaprelease1.o psaprelease2.o psapselect.o \
psaplose.o \
! # PS-print.o \
$(OSTRINGS)
inst-libpsap2: $(LIBDIR)libpsap2.a $(LINTDIR)llib-lpsap2
***************
*** 87,96 ****
libpsap2: libpsap2.a
! libpsap2.a: psap2vrsn.o
-rm -f $@
@$(UTILDIR)make-lib.sh $(SYSTEM) $(ARFLAGS) $@ $(OFILES) \
$(PS-O) psap2vrsn.o
-@rm -f $(TOPDIR)libpsap2.a $(TOPDIR)llib-lpsap2
-@$(LN) libpsap2.a $(TOPDIR)libpsap2.a
-@$(LN) llib-lpsap2 $(TOPDIR)llib-lpsap2
--- 87,99 ----
libpsap2: libpsap2.a
! PS-O = PS_tables.o
!
! libpsap2.a: psap2vrsn.o $(PS-O) $(OFILES)
-rm -f $@
@$(UTILDIR)make-lib.sh $(SYSTEM) $(ARFLAGS) $@ $(OFILES) \
$(PS-O) psap2vrsn.o
+ echo $(PS-O)
-@rm -f $(TOPDIR)libpsap2.a $(TOPDIR)llib-lpsap2
-@$(LN) libpsap2.a $(TOPDIR)libpsap2.a
-@$(LN) llib-lpsap2 $(TOPDIR)llib-lpsap2
***************
*** 97,109 ****
-@ls -l $@
-@echo "PSAP2 library built normally"
- PS-O = PS-[0-9]*.o
- PS-C = PS-[0-9]*.c
! PS-O: PS-C
! @$(MAKE) `/bin/ls $(PS-C) | sed 's/\.c$$/.o/'`
! -@touch $@
PS-C: PS-types.py $(TOPDIR)pepy/xpepy
-@rm -f $(PS-C) $(PS-O)
$(TOPDIR)pepy/xpepy -a PY_advise -A -b PS -m $(PYFLAGS) \
--- 100,126 ----
-@ls -l $@
-@echo "PSAP2 library built normally"
! ISODE = ..
! POSY = ../pepy
+ PS_tables.o : PS_tables.c
+ $(CC) -c -I../pepsy -I$(ISODE)/h PS_tables.c
+
+ PS_tables.c PS-types.h : ps.py $(POSY)/posy
+ $(POSY)/posy -A -h -m -f ps.py >/dev/null
+
+
+ # PS-O = PS-[0-9]*.o
+ # PS-C = PS-[0-9]*.c
+
+ # PS-O: PS-C
+ # @$(MAKE) `/bin/ls $(PS-C) | sed 's/\.c$$/.o/'`
+ # -@touch $@
+
+ PS-O: PS_tables.c
+
+
PS-C: PS-types.py $(TOPDIR)pepy/xpepy
-@rm -f $(PS-C) $(PS-O)
$(TOPDIR)pepy/xpepy -a PY_advise -A -b PS -m $(PYFLAGS) \
***************
*** 142,154 ****
psaplose.o: PS-types.h $(HDIR)ppkt.h $(HFILES) $(HDIR)tailor.h \
$(HDIR)logger.h
! PS-types.h: ps.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o PS-types.py $(POFLAGS) ps.py
! PS-types.py: ps.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o PS-types.py $(POFLAGS) ps.py
! PS-print.c: ps.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ $(PYFLAGS) ps.py
################################################################
--- 159,171 ----
psaplose.o: PS-types.h $(HDIR)ppkt.h $(HFILES) $(HDIR)tailor.h \
$(HDIR)logger.h
! #PS-types.h: ps.py $(TOPDIR)pepy/xposy
! # $(TOPDIR)pepy/xposy -f -h -m -o PS-types.py $(POFLAGS) ps.py
! #PS-types.py: ps.py $(TOPDIR)pepy/xposy
! # $(TOPDIR)pepy/xposy -f -h -m -o PS-types.py $(POFLAGS) ps.py
! #PS-print.c: ps.py $(TOPDIR)pepy/xpepy
! # $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ $(PYFLAGS) ps.py
################################################################
*** /src/isode/isode-6.0/acsap/acsapdse.c Fri Nov 24 18:14:55 1989
--- acsap/acsapdse.c Thu Jan 18 09:27:44 1990
***************
*** 31,36 ****
--- 31,37 ----
#include "psap.h"
#include "isoaddrs.h"
#include "tailor.h"
+ #include "DSE-types.h"
/* \f
DATA */
*** /src/isode/isode-6.0/acsap/acsapns.c Fri Jan 12 13:34:54 1990
--- acsap/acsapns.c Tue Jan 23 09:09:58 1990
***************
*** 47,52 ****
--- 47,53 ----
#include "tailor.h"
#include "dgram.h"
+ #include "NS-types.h"
#ifdef TCP
#include "internet.h"
#endif
*** /src/isode/isode-6.0/acsap/acsaptest.c Fri Nov 24 18:14:59 1989
--- acsap/acsaptest.c Thu Jan 18 09:27:45 1990
***************
*** 30,35 ****
--- 30,38 ----
#include "acpkt.h"
#include "isoservent.h"
#include "tailor.h"
+ #include "psap.h"
+ #include "DSE-types.h"
+ #include "UNIV-types.h"
#define NULLIE ((struct isoentity *) 0)
*** /src/isode/isode-6.0/acsap/Makefile Wed Dec 20 20:40:08 1989
--- acsap/Makefile Tue Jan 23 13:14:58 1990
***************
*** 33,43 ****
.SUFFIXES: .py .c .o
! .py.c:; $(TOPDIR)pepy/xpepy -a PY_advise -m $(PYFLAGS) $<
! LIBES = libacsap.a $(TOPDIR)libpepy.a $(TOPDIR)libpsap.a \
! $(TOPDIR)libtsap.a $(TOPDIR)libcompat.a
LLIBS = $(TOPDIR)llib-lpsap2 $(TOPDIR)llib-lpsap $(TOPDIR)llib-lcompat
HFILES = $(HDIR)acsap.h $(HDIR)psap2.h $(HDIR)psap.h \
$(HDIR)ssap.h $(HDIR)isoaddrs.h \
--- 33,43 ----
.SUFFIXES: .py .c .o
! .py.c:; pepy -a PY_advise -m $(PYFLAGS) $<
! LIBES = libacsap.a $(TOPDIR)libpepsy.a $(TOPDIR)libpepy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libtsap.a $(TOPDIR)libcompat.a
LLIBS = $(TOPDIR)llib-lpsap2 $(TOPDIR)llib-lpsap $(TOPDIR)llib-lcompat
HFILES = $(HDIR)acsap.h $(HDIR)psap2.h $(HDIR)psap.h \
$(HDIR)ssap.h $(HDIR)isoaddrs.h \
***************
*** 49,60 ****
##################################################################
all: libacsap acsaptest
! inst-all: # inst-libacsap manuals
install: inst-all clean
lint: l-libacsap l-acsaptest
! ################################################################
# libacsap
################################################################
--- 49,82 ----
##################################################################
all: libacsap acsaptest
! inst-all: inst-libacsap manuals
install: inst-all clean
lint: l-libacsap l-acsaptest
+ ISODE = ..
+ POSY = ../pepy
! ACS_tables.o : ACS_tables.c ACS-types.h
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) ACS_tables.c
!
!
! DSE_tables.o : DSE_tables.c
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) DSE_tables.c
!
! NS_tables.o : NS_tables.c
! $(CC) -c -I../../pepsy -I$(ISODE)/h -I$(ISODE) -I$(PEP) NS_tables.c
!
! ACS_tables.c ACS-types.h : acs.py $(POSY)/posy
! $(POSY)/posy -A -h -m acs.py >/dev/null
!
! DSE_tables.c DSE-types.h : dse.py $(POSY)/posy
! $(POSY)/posy -A -h -m dse.py >/dev/null
!
! NS_tables.c NS-types.h : ns.py $(POSY)/posy
! $(POSY)/posy -A -h -m ns.py >/dev/null
!
!
! ################################################################
# libacsap
################################################################
***************
*** 77,83 ****
oid2aei.o sprintaei.o \
is2paddr.o is2saddr.o is2taddr.o \
acserver1.o acserver2.o \
! ACS-print.o acsold.o vacsold.o $(OACSAP) \
$(OSTRINGS)
HEADERS = ACS.ph ACS-types.h
--- 99,105 ----
oid2aei.o sprintaei.o \
is2paddr.o is2saddr.o is2taddr.o \
acserver1.o acserver2.o \
! acsold.o vacsold.o $(OACSAP) \
$(OSTRINGS)
HEADERS = ACS.ph ACS-types.h
***************
*** 111,123 ****
-@echo ""
libacsap: libacsap.a
! -@rm -f $(TOPDIR)h/ACS-types.h
-@$(LN) ACS-types.h $(TOPDIR)h/ACS-types.h
! libacsap.a: acsapvrsn.o
-rm -f $@
@$(UTILDIR)make-lib.sh $(SYSTEM) $(ARFLAGS) $@ $(OFILES) \
! $(ACS-O) $(DSE-O) $(NS-O) $(RS-O) acsapvrsn.o
-@rm -f $(TOPDIR)libacsap.a $(TOPDIR)llib-lacsap
-@$(LN) libacsap.a $(TOPDIR)libacsap.a
-@$(LN) llib-lacsap $(TOPDIR)llib-lacsap
--- 133,150 ----
-@echo ""
libacsap: libacsap.a
! -@rm -f $(TOPDIR)h/ACS-types.h $(TOPDIR)h/ACS_defs.h \
! $(TOPDIR)h/ACS_pre_defs.h
-@$(LN) ACS-types.h $(TOPDIR)h/ACS-types.h
+ -@$(LN) ACS_defs.h $(TOPDIR)h/ACS_defs.h
+ -@$(LN) ACS_pre_defs.h $(TOPDIR)h/ACS_pre_defs.h
! # support routines
! LIB = dse-c.o dse2psap.o psap2dse.o ns-c.o
! libacsap.a: acsapvrsn.o $(LIB)
-rm -f $@
@$(UTILDIR)make-lib.sh $(SYSTEM) $(ARFLAGS) $@ $(OFILES) \
! $(ACS-O) $(DSE-O) $(NS-O) $(LIB) $(RS-O) acsapvrsn.o
-@rm -f $(TOPDIR)libacsap.a $(TOPDIR)llib-lacsap
-@$(LN) libacsap.a $(TOPDIR)libacsap.a
-@$(LN) llib-lacsap $(TOPDIR)llib-lacsap
***************
*** 127,166 ****
ACS-O = ACS-[0-9]*.o
ACS-C = ACS-[0-9]*.c
! ACS-O: ACS-C
! @$(MAKE) `/bin/ls $(ACS-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! ACS-C: ACS-types.py $(TOPDIR)pepy/xpepy
! -@rm -f $(ACS-C) $(ACS-O)
! $(TOPDIR)pepy/xpepy -a PY_advise -A -b ACS -m $(PYFLAGS) \
! ACS-types.py
! -@touch $@
! DSE-O = DSE-[0-9]*.o
DSE-C = DSE-[0-9]*.c
! DSE-O: DSE-C
! @$(MAKE) `/bin/ls $(DSE-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! DSE-C: dse.py $(TOPDIR)pepy/xpepy
! -@rm -f $(DSE-C) $(DSE-O)
! $(TOPDIR)pepy/xpepy -a PY_advise -A -b DSE -m $(PYFLAGS) dse.py
! -@touch $@
! NS-O = NS-[0-9]*.o
NS-C = NS-[0-9]*.c
! NS-O: NS-C
! @$(MAKE) `/bin/ls $(NS-C) | sed 's/\.c$$/.o/'`
! -@touch $@
! NS-C: ns.py $(TOPDIR)pepy/xpepy
! -@rm -f $(NS-C) $(NS-O)
! $(TOPDIR)pepy/xpepy -a PY_advise -A -b NS -m $(PYFLAGS) ns.py
! -@touch $@
acsapvrsn.c: $(OFILES) ACS-O DSE-O NS-O $(ACSAP-O)
@$(UTILDIR)version.sh acsap > $@
--- 154,205 ----
ACS-O = ACS-[0-9]*.o
ACS-C = ACS-[0-9]*.c
! #ACS-O: ACS-C
! # @$(MAKE) `/bin/ls $(ACS-C) | sed 's/\.c$$/.o/'`
! # -@touch $@
! ACS-O = ACS_tables.o
! ACS-O: ACS_tables.o
! # ACS-C: ACS-types.py $(TOPDIR)pepy/xpepy
! # -@rm -f $(ACS-C) $(ACS-O)
! # $(TOPDIR)pepy/xpepy -a PY_advise -A -b ACS -m $(PYFLAGS) \
! # ACS-types.py
! # -@touch $@
!
! #DSE-O = DSE-[0-9]*.o
DSE-C = DSE-[0-9]*.c
! #DSE-O: DSE-C
! # @$(MAKE) `/bin/ls $(DSE-C) | sed 's/\.c$$/.o/'`
! # -@touch $@
! DSE-O = DSE_tables.o
! DSE-O: DSE_tables.o
!
!
! #DSE-C: dse.py
! # -@rm -f $(DSE-C) $(DSE-O)
! # pepy -a PY_advise -A -b DSE -m $(PYFLAGS) dse.py
! # -@touch $@
!
! #NS-O = NS-[0-9]*.o
NS-C = NS-[0-9]*.c
! NS-O: NS_tables.o
! NS-O = NS_tables.o
+ #NS-O: NS-C
+ # @$(MAKE) `/bin/ls $(NS-C) | sed 's/\.c$$/.o/'`
+ # -@touch $@
+
+ #NS-C: ns.py
+ # -@rm -f $(NS-C) $(NS-O)
+ # pepy -a PY_advise -A -b NS -m $(PYFLAGS) ns.py
+ # -@touch $@
+
acsapvrsn.c: $(OFILES) ACS-O DSE-O NS-O $(ACSAP-O)
@$(UTILDIR)version.sh acsap > $@
***************
*** 192,205 ****
acsapaddr.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
acsapdse.o: $(HDIR)psap.h $(HDIR)manifest.h $(HDIR)general.h \
$(HDIR)config.h $(HDIR)isoaddrs.h $(HDIR)tailor.h \
! $(HDIR)logger.h
acsapns.o: $(HDIR)psap.h $(HDIR)manifest.h $(HDIR)general.h \
$(HDIR)config.h $(HDIR)isoaddrs.h $(HDIR)tailor.h \
! $(HDIR)logger.h \
! $(HDIR)dgram.h $(HDIR)internet.h
isoalias.o: $(HDIR)manifest.h $(HDIR)general.h $(HDIR)config.h \
$(HDIR)tailor.h $(HDIR)logger.h
! acsapstub.o: $(HFILES) $(HDIR)internet.h $(HDIR)tailor.h $(HDIR)logger.h
aetseq.o: $(HFILES)
isoentity.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
oid2aei.o: $(HFILES)
--- 231,243 ----
acsapaddr.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
acsapdse.o: $(HDIR)psap.h $(HDIR)manifest.h $(HDIR)general.h \
$(HDIR)config.h $(HDIR)isoaddrs.h $(HDIR)tailor.h \
! $(HDIR)logger.h DSE-types.h
acsapns.o: $(HDIR)psap.h $(HDIR)manifest.h $(HDIR)general.h \
$(HDIR)config.h $(HDIR)isoaddrs.h $(HDIR)tailor.h \
! $(HDIR)logger.h $(HDIR)dgram.h $(HDIR)internet.h NS-types.h
isoalias.o: $(HDIR)manifest.h $(HDIR)general.h $(HDIR)config.h \
$(HDIR)tailor.h $(HDIR)logger.h
! acsapstub.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
aetseq.o: $(HFILES)
isoentity.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
oid2aei.o: $(HFILES)
***************
*** 214,234 ****
aetdbm.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h aetdbm.c
$(CC) $(CFLAGS) -c $*.c
! ACS-types.h: acs.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o ACS-types.py $(POFLAGS) acs.py
! ACS-types.py: acs.py $(TOPDIR)pepy/xposy
! $(TOPDIR)pepy/xposy -f -h -m -o ACS-types.py $(POFLAGS) acs.py
! ACS-print.c: acs.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ $(PYFLAGS) acs.py
acsold.o: $(HDIR)acpkt.h $(HFILES)
acsold.o: acsold.c
! acsold.c: acsold.py $(TOPDIR)pepy/xpepy
vacsold.o: $(HDIR)acpkt.h $(HFILES)
vacsold.o: vacsold.c
! vacsold.c: acsold.py $(TOPDIR)pepy/xpepy
! $(TOPDIR)pepy/xpepy -a PY_advise -m -d -S PRINT -o $@ $(PYFLAGS) acsold.py
################################################################
--- 252,274 ----
aetdbm.o: $(HFILES) $(HDIR)tailor.h $(HDIR)logger.h aetdbm.c
$(CC) $(CFLAGS) -c $*.c
! #ACS-types.h: acs.py $(TOPDIR)pepy/xposy
! # $(TOPDIR)pepy/xposy -f -h -m -o ACS-types.py $(POFLAGS) acs.py
! #ACS-types.py: acs.py $(TOPDIR)pepy/xposy
! # $(TOPDIR)pepy/xposy -f -h -m -o ACS-types.py $(POFLAGS) acs.py
! #ACS-print.c: acs.py $(TOPDIR)pepy/xpepy
! # $(TOPDIR)pepy/xpepy -a PY_advise -d -m -S PRINT -o $@ $(PYFLAGS) acs.py
acsold.o: $(HDIR)acpkt.h $(HFILES)
acsold.o: acsold.c
! acsold.c: acsold.py
vacsold.o: $(HDIR)acpkt.h $(HFILES)
vacsold.o: vacsold.c
! vacsold.c: acsold.py
! pepy -a PY_advise -m -d -S PRINT -o $@ $(PYFLAGS) acsold.py
! ns-c.o: NS-types.h
! dse-c.o: DSE-types.h
################################################################
*** /src/isode/isode-6.0/support/tsapd.c Fri Nov 24 18:49:44 1989
--- support/tsapd.c Thu Jan 18 09:27:47 1990
***************
*** 376,385 ****
--- 376,389 ----
register struct SSAPstart *ss = &sss;
struct PSAPindication pis;
register struct PSAPabort *pa = &pis.pi_abort;
+ #ifdef RT
struct RtSAPindication rtis;
register struct RtSAPabort *rta = &rtis.rti_abort;
+ #endif
+ #ifdef RO
struct RoSAPindication rois;
register struct RoSAPpreject *rop = &rois.roi_preject;
+ #endif
if (strcmp (is -> is_provider, "ssap"))
return OK;
***************
*** 415,420 ****
--- 419,425 ----
return DONE;
}
+ #ifdef RT
if (strcmp (is -> is_entity, "rts") == 0) {
if (RtExec (ss, &rtis, buffer1, buffer2, NULLIFP, setperms) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
***************
*** 425,431 ****
rta -> rta_cc, rta -> rta_cc, rta -> rta_data);
}
}
! else {
if (RoExec (ss, &rois, buffer1, buffer2, NULLIFP, setperms) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"service not started at rosap: %s",
--- 430,439 ----
rta -> rta_cc, rta -> rta_cc, rta -> rta_data);
}
}
! else
! #endif
! #if RO
! {
if (RoExec (ss, &rois, buffer1, buffer2, NULLIFP, setperms) == NOTOK) {
advise (LLOG_EXCEPTIONS, NULLCP,
"service not started at rosap: %s",
***************
*** 435,440 ****
--- 443,449 ----
rop -> rop_cc, rop -> rop_cc, rop -> rop_data);
}
}
+ #endif
return DONE;
}
*** /src/isode/isode-6.0/support/Makefile Fri Nov 24 18:49:35 1989
--- support/Makefile Sun Jan 21 14:16:02 1990
***************
*** 28,39 ****
.c.o:; $(CC) $(CFLAGS) -c $*.c
! LIBES = $(TOPDIR)librosy.a $(TOPDIR)librosap.a $(TOPDIR)librtsap.a \
! $(TOPDIR)libacsap.a $(TOPDIR)libpsap2.a $(TOPDIR)libpepy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libssap.a $(TOPDIR)libtsap.a \
! $(TOPDIR)libdirent.a $(TOPDIR)libcompat.a $(TP4LIBES)
! LLIBS = $(TOPDIR)llib-lrosy $(TOPDIR)llib-lrosap $(TOPDIR)llib-lrtsap \
! $(TOPDIR)llib-lacsap $(TOPDIR)llib-lpsap2 \
$(TOPDIR)llib-lpsap $(TOPDIR)llib-lssap $(TOPDIR)llib-ltsap \
$(TOPDIR)llib-ldirent $(TOPDIR)llib-lcompat $(TP4LLIBS)
CFILES = tsapd.c isore.c isod.c isoc.c aetbuild.c dsabuild.c
--- 28,39 ----
.c.o:; $(CC) $(CFLAGS) -c $*.c
!
! LIBES = $(TOPDIR)libacsap.a $(TOPDIR)libpsap2.a $(TOPDIR)libpepy.a \
! $(TOPDIR)libpepsy.a $(TOPDIR)libpsap.a $(TOPDIR)libssap.a \
! $(TOPDIR)libtsap.a $(TOPDIR)libdirent.a $(TOPDIR)libcompat.a
! # $(TOPDIR)librosy.a $(TOPDIR)librosap.a $(TP4LIBES)
! LLIBS = $(TOPDIR)llib-lacsap $(TOPDIR)llib-lpsap2 \
$(TOPDIR)llib-lpsap $(TOPDIR)llib-lssap $(TOPDIR)llib-ltsap \
$(TOPDIR)llib-ldirent $(TOPDIR)llib-lcompat $(TP4LLIBS)
CFILES = tsapd.c isore.c isod.c isoc.c aetbuild.c dsabuild.c
***************
*** 47,54 ****
# Here it is...
##################################################################
! all: tsapd isore isod isoc isoaliases isoentities isomacros \
! isobjects isoservices $(AETDBM) libisode
inst-all: inst-tsapd inst-isore inst-isod inst-isoc inst-$(AETDBM) \
inst-libisode aliases entities macros objects services manuals
install: inst-all clean
--- 47,54 ----
# Here it is...
##################################################################
! #all: tsapd isore isod isoc $(AETDBM) libisode
! all: tsapd $(AETDBM) libisode
inst-all: inst-tsapd inst-isore inst-isod inst-isoc inst-$(AETDBM) \
inst-libisode aliases entities macros objects services manuals
install: inst-all clean
***************
*** 81,87 ****
tsapd: xtsapd
xtsapd: tsapd.o $(LIBES)
! $(LDCC) $(LDFLAGS) -o $@ tsapd.o $(LIBES) $(LSOCKET)
l-tsapd:; $(LINT) $(LFLAGS) tsapd.c $(LLIBS)
--- 81,88 ----
tsapd: xtsapd
xtsapd: tsapd.o $(LIBES)
! $(LDCC) -o $@ tsapd.o $(LIBES) $(LSOCKET)
! #$(LDCC) $(LDFLAGS) -o $@ tsapd.o $(LIBES) $(LSOCKET)
l-tsapd:; $(LINT) $(LFLAGS) tsapd.c $(LLIBS)
***************
*** 181,191 ****
aetbuild: xaetbuild
! xaetbuild: aetbuild.o $(TOPDIR)libacsap.a $(TOPDIR)libpepy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libcompat.a
$(LDCC) $(LDFLAGS) -o $@ aetbuild.o \
! $(TOPDIR)libacsap.a $(TOPDIR)libpepy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libcompat.a $(LSOCKET)
l-aetbuild:; $(LINT) $(LFLAGS) aetbuild.c \
$(TOPDIR)llib-lacsap $(TOPDIR)llib-lpsap \
--- 182,195 ----
aetbuild: xaetbuild
! xaetbuild: aetbuild.o $(TOPDIR)libacsap.a $(TOPDIR)libpepsy.a \
! $(TOPDIR)libpepy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libcompat.a
$(LDCC) $(LDFLAGS) -o $@ aetbuild.o \
! $(TOPDIR)libacsap.a \
! $(TOPDIR)libpepy.a $(TOPDIR)libpepsy.a \
! $(TOPDIR)libpsap.a $(TOPDIR)libcompat.a \
! $(LSOCKET)
l-aetbuild:; $(LINT) $(LFLAGS) aetbuild.c \
$(TOPDIR)llib-lacsap $(TOPDIR)llib-lpsap \
***************
*** 252,258 ****
-@ls -gls $@ $@.ln
-@echo ""
! libisode: libisode.a llib-lisode
libisode.a: isodevrsn.o
-rm -f $@ $(TOPDIR)libisode.a
--- 256,262 ----
-@ls -gls $@ $@.ln
-@echo ""
! libisode: libisode.a # llib-lisode
libisode.a: isodevrsn.o
-rm -f $@ $(TOPDIR)libisode.a