[2401] in Release_Engineering
patch for synctree for A/UX
daemon@ATHENA.MIT.EDU (vrt@ATHENA.MIT.EDU)
Tue Jul 10 22:13:45 1990
From: vrt@ATHENA.MIT.EDU
Date: Mon, 9 Jul 90 13:41:30 PDT
To: rel-eng@ATHENA.MIT.EDU
These are kludges...
it is preferable to build with gcc...
diff -rc /mit/synctree/src/Makefile src/Makefile
*** /mit/synctree/src/Makefile Mon Mar 26 03:44:36 1990
--- src/Makefile Mon Jul 9 15:24:19 1990
***************
*** 1,4
# Copyright (C) 1988 Tim Shepard All rights reserved.
FLAGS.=-Wf,-XNh1200
CFLAGS= -g -ma -DYYDEBUG -DLEXDEBUG
CFILES= reconcile.c rules.c glob_match.c bool_exp.c vtable.c err.c \
--- 1,5 -----
# Copyright (C) 1988 Tim Shepard All rights reserved.
+ CC=gcc
FLAGS.=-Wf,-XNh1200
CFLAG=-traditional -g
CFILES= reconcile.c rules.c glob_match.c bool_exp.c vtable.c err.c \
***************
*** 1,6
# Copyright (C) 1988 Tim Shepard All rights reserved.
FLAGS.=-Wf,-XNh1200
! CFLAGS= -g -ma -DYYDEBUG -DLEXDEBUG
CFILES= reconcile.c rules.c glob_match.c bool_exp.c vtable.c err.c \
util.c version.c gm.c regexp.c dates_dbm.c
--- 1,7 -----
# Copyright (C) 1988 Tim Shepard All rights reserved.
CC=gcc
FLAGS.=-Wf,-XNh1200
! CFLAG=-traditional -g
CFILES= reconcile.c rules.c glob_match.c bool_exp.c vtable.c err.c \
util.c version.c gm.c regexp.c dates_dbm.c
***************
*** 19,24
# for the decmips
reconcile1.mips: reconcile.c
${CC} ${CFLAGS} -Wf,-XNh1200 -c reconcile.c
gm.c: glob_match.c
rm -f gm.c
--- 20,27 -----
# for the decmips
reconcile1.mips: reconcile.c
${CC} ${CFLAGS} -Wf,-XNh1200 -c reconcile.c
+ reconcile1.mac: reconcile.c
+ ${CC} ${CFLAGS} -c reconcile.c
gm.c: glob_match.c
rm -f gm.c
Common subdirectories: /mit/synctree/src/RCS and src/RCS
Only in /mit/synctree/src: gm.c
Only in /mit/synctree/src: readrules.l.~1~
diff -rc /mit/synctree/src/reconcile.c src/reconcile.c
*** /mit/synctree/src/reconcile.c Wed Mar 21 19:24:41 1990
--- src/reconcile.c Mon Jul 9 15:46:32 1990
***************
*** 14,19
#include "reconcile.h"
#ifndef DEBUG
char *srcdir = "/server";
char *dstdir = ""; /* effectively "/" */
--- 14,25 -----
#include "reconcile.h"
+ #ifdef _AUX_SOURCE
+ #define vfork fork
+ #define alloca malloc
+ /* this is a kludge i know --vrt */
+ #endif
+
#ifndef DEBUG
char *srcdir = "/server";
char *dstdir = ""; /* effectively "/" */
***************
*** 79,85
}
#endif DEBUG
!
getrlimit(RLIMIT_DATA,&rl);
rl.rlim_cur = rl.rlim_max;
setrlimit(RLIMIT_DATA,&rl);
--- 85,91 -----
}
#endif DEBUG
! #ifndef _AUX_SOURCE
getrlimit(RLIMIT_DATA,&rl);
rl.rlim_cur = rl.rlim_max;
setrlimit(RLIMIT_DATA,&rl);
***************
*** 87,92
getrlimit(RLIMIT_STACK,&rl);
rl.rlim_cur = rl.rlim_max;
setrlimit(RLIMIT_STACK,&rl);
setlinebuf(stdout);
--- 93,99 -----
getrlimit(RLIMIT_STACK,&rl);
rl.rlim_cur = rl.rlim_max;
setrlimit(RLIMIT_STACK,&rl);
+ #endif
#ifndef _AUX_SOURCE
setlinebuf(stdout);
***************
*** 88,93
rl.rlim_cur = rl.rlim_max;
setrlimit(RLIMIT_STACK,&rl);
setlinebuf(stdout);
i = 0;
--- 95,101 -----
setrlimit(RLIMIT_STACK,&rl);
#endif
+ #ifndef _AUX_SOURCE
setlinebuf(stdout);
#else
setvbuf(stdout,NULL,_IOLBF,BUFSIZ);
***************
*** 89,94
setrlimit(RLIMIT_STACK,&rl);
setlinebuf(stdout);
i = 0;
--- 97,105 -----
#ifndef _AUX_SOURCE
setlinebuf(stdout);
+ #else
+ setvbuf(stdout,NULL,_IOLBF,BUFSIZ);
+ #endif
i = 0;
Only in src: regexp
diff -rc /mit/synctree/src/rules.c src/rules.c
*** /mit/synctree/src/rules.c Wed Mar 21 18:54:24 1990
--- src/rules.c Mon Jul 9 15:47:37 1990
***************
*** 3,8
#include "reconcile.h"
#include <strings.h>
#include <stdio.h>
#include <sys/exec.h>
extern char *date_db_name;
--- 3,9 -----
#include "reconcile.h"
#include <strings.h>
#include <stdio.h>
+ #ifndef _AUX_SOURCE
#include <sys/exec.h>
#else
#include <filehdr.h>
***************
*** 4,9
#include <strings.h>
#include <stdio.h>
#include <sys/exec.h>
extern char *date_db_name;
extern rule rules[];
--- 5,17 -----
#include <stdio.h>
#ifndef _AUX_SOURCE
#include <sys/exec.h>
+ #else
+ #include <filehdr.h>
+ #endif
+ #ifdef _AUX_SOURCE
+ #define alloca malloc
+ /* kludge */
+ #endif
extern char *date_db_name;
extern rule rules[];
***************
*** 104,109
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC && magic != Z0MAGIC)
#else
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC)
#endif
--- 112,118 -----
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC && magic != Z0MAGIC)
#else
+ #ifndef _AUX_SOURCE
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC)
#else /* AUX */
***************
*** 106,112
#else
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC)
! #endif
break;
}
}
--- 115,124 -----
#ifndef _AUX_SOURCE
if (magic != OMAGIC && magic != NMAGIC &&
magic != ZMAGIC)
! #else /* AUX */
! if (magic != M68TVMAGIC && magic != M68MAGIC && magic != MC68TVMAGIC && magic != MC68MAGIC && magic != M68NSMAGIC)
! #endif /* AUX */
! #endif /* ZOMAGIC */
break;
}
}
