BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / config / main.c

diff --git a/usr/src/usr.sbin/config/main.c b/usr/src/usr.sbin/config/main.c
index c03ba3b..fe1b21e 100644 (file)
--- a/usr/src/usr.sbin/config/main.c
+++ b/usr/src/usr.sbin/config/main.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.12 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)main.c     5.17 (Berkeley) 7/1/91";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -53,7 +67,7 @@ main(argc, argv)
        char *p;
 
        while ((ch = getopt(argc, argv, "gp")) != EOF)
        char *p;
 
        while ((ch = getopt(argc, argv, "gp")) != EOF)

-               switch((char)ch) {
+               switch (ch) {

                case 'g':
                        debugging++;
                        break;
                case 'g':
                        debugging++;
                        break;


@@ -108,6 +122,11 @@ usage:             fputs("usage: config [-gp] sysname\n", stderr);
                hpglue();
                break;
 
                hpglue();
                break;
 

+       case MACHINE_I386:
+               i386_ioconf();          /* Print ioconf.c */
+               vector();               /* Create vector.s */
+               break;
+

        default:
                printf("Specify machine type, e.g. ``machine vax''\n");
                exit(1);
        default:
                printf("Specify machine type, e.g. ``machine vax''\n");
                exit(1);


@@ -120,8 +139,7 @@ usage:              fputs("usage: config [-gp] sysname\n", stderr);
        {
        char xxx[80];
 
        {
        char xxx[80];
 

-       (void) symlink("../sys", path("sys"));
-       (void) sprintf(xxx, "../%s", machinename);
+       (void) sprintf(xxx, "../../%s/include", machinename);

        (void) symlink(xxx, path("machine"));
        }
        makefile();                     /* build Makefile */
        (void) symlink(xxx, path("machine"));
        }
        makefile();                     /* build Makefile */


@@ -166,6 +184,57 @@ get_word(fp)
        return (line);
 }
 
        return (line);
 }
 

+/*
+ * get_quoted_word
+ *     like get_word but will accept something in double or single quotes
+ *     (to allow embedded spaces).
+ */
+char *
+get_quoted_word(fp)
+       register FILE *fp;
+{
+       static char line[256];
+       register int ch;
+       register char *cp;
+
+       while ((ch = getc(fp)) != EOF)
+               if (ch != ' ' && ch != '\t')
+                       break;
+       if (ch == EOF)
+               return ((char *)EOF);
+       if (ch == '\n')
+               return (NULL);
+       cp = line;
+       if (ch == '"' || ch == '\'') {
+               register int quote = ch;
+
+               while ((ch = getc(fp)) != EOF) {
+                       if (ch == quote)
+                               break;
+                       if (ch == '\n') {
+                               *cp = 0;
+                               printf("config: missing quote reading `%s'\n",
+                                       line);
+                               exit(2);
+                       }
+                       *cp++ = ch;
+               }
+       } else {
+               *cp++ = ch;
+               while ((ch = getc(fp)) != EOF) {
+                       if (isspace(ch))
+                               break;
+                       *cp++ = ch;
+               }
+               if (ch != EOF)
+                       (void) ungetc(ch, fp);
+       }
+       *cp = 0;
+       if (ch == EOF)
+               return ((char *)EOF);
+       return (line);
+}
+

 /*
  * prepend the path to a filename
  */
 /*
  * prepend the path to a filename
  */


@@ -175,8 +244,10 @@ path(file)
 {
        register char *cp;
 
 {
        register char *cp;
 

-       cp = malloc((unsigned)(strlen(PREFIX)+strlen(file)+5));
-       (void) strcpy(cp, "../");
+#define        CDIR    "../../compile/"
+       cp = malloc((unsigned int)(sizeof(CDIR) + strlen(PREFIX) +
+           (file ? strlen(file) : 0) + 2));
+       (void) strcpy(cp, CDIR);

        (void) strcat(cp, PREFIX);
        if (file) {
                (void) strcat(cp, "/");
        (void) strcat(cp, PREFIX);
        if (file) {
                (void) strcat(cp, "/");