From 62efc91020789d88fb4796a943801fadfa7f15c9 Mon Sep 17 00:00:00 2001
From: mar <mar>
Date: Thu, 10 Jan 1991 17:50:44 +0000
Subject: [PATCH] new version

---
 util/imake/Makefile  |  44 ++++++-----
 util/imake/ccimake.c |  21 ++++++
 util/imake/imake.c   | 169 +++++++++++++++++++++++++------------------
 3 files changed, 145 insertions(+), 89 deletions(-)
 create mode 100644 util/imake/ccimake.c

diff --git a/util/imake/Makefile b/util/imake/Makefile
index 22daa9be..4c46c67b 100644
--- a/util/imake/Makefile
+++ b/util/imake/Makefile
@@ -1,45 +1,51 @@
 #
-# WARNING! This is NOT an automatically generated Makefile!
-# This is hand-crafted as a bootstrap, may need editing for your system.
+#   WARNING    WARNING    WARNING    WARNING    WARNING    WARNING    WARNING
+#
+# This is NOT an automatically generated Makefile!  It is hand-crafted as a 
+# bootstrap, may need editing for your system.  The BOOTSTRAPCFLAGS variable
+# may be given at the top of the build tree for systems that do not define
+# any machine-specific preprocessor symbols.
+#
 
+BOOTSTRAPCFLAGS = 
+    CDEBUGFLAGS = -O
+         CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS)
           SHELL = /bin/sh
              RM = rm -f
            MAKE = make
          RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
 			tags TAGS make.log
-             LN = cp
-        DESTDIR = 
-         SRCDIR = /mit/kerberos/src
-        SOURCES = ${SRCDIR}/util/imake/imake.c ${SRCDIR}/util/imake/ccflags.c ${SRCDIR}/util/imake/Makefile
+          NPROC = 1
 
-all: imake
+imake::
+	@echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS)"
 
-imake: ccflags imake.c
-	$(CC) -o imake imake.c `./ccflags`
+imake:: ccimake imake.c
+	$(CC) -o imake $(CFLAGS) imake.c `./ccimake`
 
-ccflags: ccflags.c
-	$(CC) -o ccflags ccflags.c
+ccimake: ccimake.c
+	$(CC) -o ccimake $(CFLAGS) ccimake.c
 
 relink:
 	$(RM) imake
 	$(MAKE) $(MFLAGS) imake
 
 clean:
-	$(RM) ccflags imake
+	$(RM) ccimake imake
 	$(RM_CMD) \#*
 
 depend:
 
-Makefile:
+
+# for manual use
+
+Makefile: imake
+	imake -DNEWTOP=../
 
 tags:
 
 install:
 
-Makefiles:
+install.man:
 
-config: $(SOURCES)
-	-mkdir $(DESTDIR)/util/imake
-	for i in $(SOURCES); do \
-		$(RM) ${DESTDIR}/util/imake/`basename $$i`; \
-		$(LN) $$i ${DESTDIR}/util/imake/`basename $$i`; done
+Makefiles:
diff --git a/util/imake/ccimake.c b/util/imake/ccimake.c
new file mode 100644
index 00000000..6f13d64c
--- /dev/null
+++ b/util/imake/ccimake.c
@@ -0,0 +1,21 @@
+/*
+ * $XConsortium: ccimake.c,v 1.12 89/10/16 12:09:23 jim Exp $
+ * 
+ * Warning:  This file must be kept as simple as posible so that it can 
+ * compile without any special flags on all systems.  Do not touch it unless
+ * you *really* know what you're doing.  Make changes in imakemdep.h, not here.
+ */
+
+#define CCIMAKE			/* only get imake_ccflags definitions */
+#include "imakemdep.h"		/* things to set when porting imake */
+
+#ifndef imake_ccflags
+#define imake_ccflags "-O"
+#endif
+
+main()
+{
+	write(1, imake_ccflags, sizeof(imake_ccflags) - 1);
+	exit(0);
+}
+
diff --git a/util/imake/imake.c b/util/imake/imake.c
index 6127b70a..3ac234cc 100644
--- a/util/imake/imake.c
+++ b/util/imake/imake.c
@@ -1,3 +1,14 @@
+/*****************************************************************************\
+ *                                                                           *
+ *                                Porting Note                               *
+ *                                                                           *
+ * Add the value of BOOTSTRAPCFLAGS to the cpp_argv table so that it will be *
+ * passed to the template file.                                              *
+ *                                                                           *
+\*****************************************************************************/
+
+
+
 /*
  * 
  * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
@@ -14,7 +25,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  * 
- * $Header$
+ * $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $
  * $Locker$
  *
  * Author:
@@ -24,25 +35,25 @@
  *
  * imake: the include-make program.
  *
- * Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-v] [make flags]
+ * Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-e] [-v] [make flags]
  *
- * Imake takes a template makefile (Imake.template) and runs cpp on it
- * producing a temporary makefile in /usr/tmp.  It then runs make on
+ * Imake takes a template makefile (Imake.tmpl) and runs cpp on it
+ * producing a temporary makefile in /tmp.  It then runs make on
  * this pre-processed makefile.
  * Options:
  *		-D	define.  Same as cpp -D argument.
  *		-I	Include directory.  Same as cpp -I argument.
  *		-T	template.  Designate a template other
- * 			than Imake.template
- *		-s	show.  Show the produced makefile on the standard
+ * 			than Imake.tmpl
+ *		-s[F]	show.  Show the produced makefile on the standard
  *			output.  Make is not run is this case.  If a file
  *			argument is provided, the output is placed there.
+ *              -e[F]   execute instead of show; optionally name Makefile F
  *		-v	verbose.  Show the make command line executed.
  *
  * Environment variables:
  *		
- *		IMAKEINCLUDE	Include directory to use in addition to
- *				"." and "/usr/lib/local/imake.include".
+ *		IMAKEINCLUDE	Include directory to use in addition to "."
  *		IMAKECPP	Cpp to use instead of /lib/cpp
  *		IMAKEMAKE	make program to use other than what is
  *				found by searching the $PATH variable.
@@ -64,10 +75,10 @@
  *	Call this <imakefile>.  This gets added to the arguments for
  *	make as MAKEFILE=<imakefile>.
  *   2. Determine the name of the template from the command line (-T)
- *	or the default, Imake.template.  Call this <template>
+ *	or the default, Imake.tmpl.  Call this <template>
  *   3. Start up cpp an provide it with three lines of input:
- *		#define IMAKE_TEMPLATE		"<template>"
- *		#define INCLUDE_IMAKEFILE	"<imakefile>"
+ *		#define IMAKE_TEMPLATE		" <template> "
+ *		#define INCLUDE_IMAKEFILE	< <imakefile> >
  *		#include IMAKE_TEMPLATE
  *	Note that the define for INCLUDE_IMAKEFILE is intended for
  *	use in the template file.  This implies that the imake is
@@ -88,25 +99,23 @@
 #include	<stdio.h>
 #include	<ctype.h>
 #include	<sys/types.h>
-#include	<sys/file.h>
 #ifdef SYSV
+#ifndef macII			/* mac will get the stuff out of file.h */
 #include	<fcntl.h>
+#endif
 #else	/* !SYSV */
 #include	<sys/wait.h>
 #endif	/* !SYSV */
-#include	<sys/signal.h>
+#include	<sys/file.h>
+#include	<signal.h>
 #include	<sys/stat.h>
+#include "imakemdep.h"
+
 
-#ifdef SYSV
-#define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : \
-				(close(fd2), fcntl(fd1, F_DUPFD, fd2)))
-#endif	/* SYSV */
 #define	TRUE		1
 #define	FALSE		0
-#define	ARGUMENTS	50
 
-#if defined(sun) || defined(hpux)
-#define REDUCED_TO_ASCII_SPACE
+#ifdef FIXUP_CPP_WHITESPACE
 int	InRule = FALSE;
 #endif
 
@@ -115,43 +124,29 @@ int	InRule = FALSE;
  * space.  In addition, the escaped newline may be replaced with a
  * space instead of being deleted.  Blech.
  */
-#ifndef REDUCED_TO_ASCII_SPACE
+#ifndef FIXUP_CPP_WHITESPACE
 #define KludgeOutputLine(arg)
 #define KludgeResetRule()
 #endif
 
-typedef	u_char	boolean;
+typedef	unsigned char	boolean;
 
-#include <sys/param.h>
-#if BSD > 43
-char	*cpp = "/usr/bin/cpp";
-#else
-#ifdef	apollo
-char	*cpp = "/usr/lib/cpp";
-#else
-char	*cpp = "/lib/cpp";
-#endif
+#ifndef DEFAULT_CPP
+#define DEFAULT_CPP "/lib/cpp"
 #endif
 
-char	*tmpMakefile    = "/usr/tmp/tmp-make.XXXXXX";
-char	*tmpImakefile    = "/usr/tmp/tmp-imake.XXXXXX";
+char *cpp = DEFAULT_CPP;
+
+char	*tmpMakefile    = "/tmp/Imf.XXXXXX";
+char	*tmpImakefile    = "/tmp/IIf.XXXXXX";
 char	*make_argv[ ARGUMENTS ] = { "make" };
-char	*cpp_argv[ ARGUMENTS ] = {
-	"cpp",
-	"-I.",
-#ifdef unix
-	"-Uunix",
-#endif /* unix */
-#ifdef pegasus
-	"-Dpegasus",
-#endif /* pegasus */
-};
+
 int	make_argindex;
 int	cpp_argindex;
 char	*make = NULL;
 char	*Imakefile = NULL;
-char	*Makefile = NULL;
-char	*Template = "Imake.template";
+char	*Makefile = "Makefile";
+char	*Template = "Imake.tmpl";
 char	*program;
 char	*FindImakefile();
 char	*ReadLine();
@@ -159,7 +154,7 @@ char	*CleanCppInput();
 char	*strdup();
 
 boolean	verbose = FALSE;
-boolean	show = FALSE;
+boolean	show = TRUE;
 extern int	errno;
 extern char	*Emalloc();
 extern char	*realloc();
@@ -177,8 +172,6 @@ main(argc, argv)
 	init();
 	SetOpts(argc, argv);
 
-	AddCppArg("-I/usr/lib/local/imake.includes");
-
 	Imakefile = FindImakefile(Imakefile);
 	if (Makefile)
 		tmpMakefile = Makefile;
@@ -194,7 +187,7 @@ main(argc, argv)
 	if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
 		LogFatal("Cannot create temporary file %s.", tmpMakefile);
 
-	cppit(Imakefile, Template, tmpfd);
+	cppit(Imakefile, Template, tmpfd, tmpMakefile);
 
 	if (show) {
 		if (Makefile == NULL)
@@ -225,6 +218,11 @@ wrapup()
 	unlink(tmpImakefile);
 }
 
+#if SIGNALRETURNSINT
+int
+#else
+void
+#endif
 catch(sig)
 	int	sig;
 {
@@ -320,12 +318,15 @@ SetOpts(argc, argv)
 		    }
 		} else if (argv[0][1] == 's') {
 		    if (argv[0][2])
-			Makefile = argv[0]+2;
+			Makefile = (argv[0][2] == '-') ? NULL : argv[0]+2;
 		    else if (argc > 1 && argv[1][0] != '-') {
 			argc--, argv++;
 			Makefile = argv[0];
 		    }
 		    show = TRUE;
+		} else if (argv[0][1] == 'e') {
+		   Makefile = (argv[0][2] ? argv[0]+2 : NULL);
+		   show = FALSE;
 		} else if (argv[0][1] == 'T') {
 		    if (argv[0][2])
 			Template = argv[0]+2;
@@ -400,10 +401,11 @@ showargs(argv)
 	fprintf(stderr, "\n");
 }
 
-cppit(Imakefile, template, outfd)
+cppit(Imakefile, template, outfd, outfname)
 	char	*Imakefile;
 	char	*template;
 	FILE	*outfd;
+	char	*outfname;
 {
 	FILE	*pipeFile;
 	int	pid, pipefd[2];
@@ -423,7 +425,7 @@ cppit(Imakefile, template, outfd)
 	/*
 	 * Fork and exec cpp
 	 */
-	pid = vfork();
+	pid = fork();
 	if (pid < 0)
 		LogFatal("Cannot fork.", "");
 	if (pid) {	/* parent */
@@ -433,7 +435,7 @@ cppit(Imakefile, template, outfd)
 			LogFatalI("Cannot fdopen fd %d for output.", pipefd[1]);
 		fprintf(pipeFile, "#define IMAKE_TEMPLATE\t\"%s\"\n",
 			template);
-		fprintf(pipeFile, "#define INCLUDE_IMAKEFILE\t\"%s\"\n",
+		fprintf(pipeFile, "#define INCLUDE_IMAKEFILE\t<%s>\n",
 			cleanedImakefile);
 		fprintf(pipeFile, "#include IMAKE_TEMPLATE\n");
 		fclose(pipeFile);
@@ -451,7 +453,7 @@ cppit(Imakefile, template, outfd)
 				LogFatalI("Exit code %d.", status.w_retcode);
 #endif	/* !SYSV */
 		}
-		CleanCppOutput(outfd);
+		CleanCppOutput(outfd, outfname);
 	} else {	/* child... dup and exec cpp */
 		if (verbose)
 			showargs(cpp_argv);
@@ -475,7 +477,7 @@ makeit()
 	/*
 	 * Fork and exec make
 	 */
-	pid = vfork();
+	pid = fork();
 	if (pid < 0)
 		LogFatal("Cannot fork.", "");
 	if (pid) {	/* parent... simply wait */
@@ -575,13 +577,14 @@ char *CleanCppInput(Imakefile)
 	return(cleanedImakefile);
 }
 
-CleanCppOutput(tmpfd)
+CleanCppOutput(tmpfd, tmpfname)
 	FILE	*tmpfd;
+	char	*tmpfname;
 {
 	char	*input;
 	int	blankline = 0;
 
-	while(input = ReadLine(tmpfd)) {
+	while(input = ReadLine(tmpfd, tmpfname)) {
 		if (isempty(input)) {
 			if (blankline++)
 				continue;
@@ -594,6 +597,14 @@ CleanCppOutput(tmpfd)
 		putc('\n', tmpfd);
 	}
 	fflush(tmpfd);
+#ifdef NFS_STDOUT_BUG
+	/*
+	 * On some systems, NFS seems to leave a large number of nulls at
+	 * the end of the file.  Ralph Swick says that this kludge makes the
+	 * problem go away.
+	 */
+	ftruncate (fileno(tmpfd), (off_t)ftell(tmpfd));
+#endif
 }
 
 /*
@@ -637,8 +648,10 @@ isempty(line)
 	return (*line == '\0');
 }
 
-char *ReadLine(tmpfd)
+/*ARGSUSED*/
+char *ReadLine(tmpfd, tmpfname)
 	FILE	*tmpfd;
+	char	*tmpfname;
 {
 	static boolean	initialized = FALSE;
 	static char	*buf, *pline, *end;
@@ -660,17 +673,32 @@ char *ReadLine(tmpfd)
 		end = buf + st.st_size;
 		*end = '\0';
 		lseek(fileno(tmpfd), 0, 0);
+#ifdef SYSV
+		freopen(tmpfname, "w+", tmpfd);
+#else	/* !SYSV */
 		ftruncate(fileno(tmpfd), 0);
+#endif	/* !SYSV */
 		initialized = TRUE;
-#ifdef REDUCED_TO_ASCII_SPACE
-	fprintf(tmpfd, "#\n");
-	fprintf(tmpfd, "# Warning: the cpp used on this machine replaces\n");
-	fprintf(tmpfd, "# all newlines and multiple tabs/spaces in a macro\n");
-	fprintf(tmpfd, "# expansion with a single space.  Imake tries to\n");
-	fprintf(tmpfd, "# compensate for this, but is not always\n");
-	fprintf(tmpfd, "# successful.\n");
-	fprintf(tmpfd, "#\n");
-#endif /* REDUCED_TO_ASCII_SPACE */
+	    fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
+	    fprintf (tmpfd, "# %s\n",
+		"$XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $");
+
+#ifdef FIXUP_CPP_WHITESPACE
+	    {
+		static char *cpp_warning[] = {
+"#",
+"# The cpp used on this machine replaces all newlines and multiple tabs and",
+"# spaces in a macro expansion with a single space.  Imake tries to compensate",
+"# for this, but is not always successful.",
+"#",
+NULL };
+		char **cpp;
+
+		for (cpp = cpp_warning; *cpp; cpp++) {
+		    fprintf (tmpfd, "%s\n", *cpp);
+		}
+	    }
+#endif /* FIXUP_CPP_WHITESPACE */
 	}
 
 	for (p1 = pline; p1 < end; p1++) {
@@ -713,7 +741,7 @@ char *Emalloc(size)
 	return(p);
 }
 
-#ifdef REDUCED_TO_ASCII_SPACE
+#ifdef FIXUP_CPP_WHITESPACE
 KludgeOutputLine(pline)
 	char	**pline;
 {
@@ -726,7 +754,8 @@ KludgeOutputLine(pline)
 	    	break;
 	    case ' ':	/*May need a tab*/
 	    default:
-		while (*p) if (*p++ == ':') {
+		for (; *p; p++) if (p[0] == ':' && 
+				    p > *pline && p[-1] != '\\') {
 		    if (**pline == ' ')
 			(*pline)++;
 		    InRule = TRUE;
@@ -742,7 +771,7 @@ KludgeResetRule()
 {
 	InRule = FALSE;
 }
-#endif /* REDUCED_TO_ASCII_SPACE */
+#endif /* FIXUP_CPP_WHITESPACE */
 
 char *strdup(cp)
 	register char *cp;
-- 
2.45.2