date and time created 83/03/09 16:22:07 by ralph

[unix-history] / usr / src / old / make / main.c

diff --git a/usr/src/old/make/main.c b/usr/src/old/make/main.c
index 6c30a76..fa61838 100644 (file)
--- a/usr/src/old/make/main.c
+++ b/usr/src/old/make/main.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)main.c      4.2 (Berkeley) 82/04/20";
+static char *sccsid = "@(#)main.c      4.5 (Berkeley) 83/03/03";

 # include "defs"
 /*
 command make to update programs.
 # include "defs"
 /*
 command make to update programs.


@@ -47,6 +47,7 @@ char *prompt  = "";   /* other systems -- pick what you want */
 int nopdir     = 0;
 char junkname[20];
 char funny[128];
 int nopdir     = 0;
 char junkname[20];
 char funny[128];

+char   options[26 + 1] = { '-' };

 
 main(argc,argv)
 int argc;
 
 main(argc,argv)
 int argc;


@@ -60,6 +61,7 @@ char c, *s;
 static char onechar[2] = "X";
 #ifdef unix
 int intrupt();
 static char onechar[2] = "X";
 #ifdef unix
 int intrupt();

+char *op = options + 1;

 
 
 
 
 
 


@@ -86,68 +88,75 @@ for(i=1; i<argc; ++i)
 setvar("$","$");
 inarglist = 0;
 
 setvar("$","$");
 inarglist = 0;
 

-for(i=1; i<argc; ++i)
-    if(argv[i]!=0 && argv[i][0]=='-')
-       {
-       for(j=1 ; (c=argv[i][j])!='\0' ; ++j)  switch(c)
-               {
-               case 'd':
-                       dbgflag = YES;
-                       break;
-
-               case 'p':
-                       prtrflag = YES;
-                       break;
-
-               case 's':
-                       silflag = YES;
-                       break;
-
-               case 'i':
-                       ignerr = YES;
-                       break;
-
-               case 'S':
-                       keepgoing = NO;
-                       break;
-
-               case 'k':
-                       keepgoing = YES;
-                       break;
-
-               case 'n':
-                       noexflag = YES;
-                       break;
-
-               case 'r':
-                       noruleflag = YES;
-                       break;
-
-               case 't':
-                       touchflag = YES;
-                       break;
-
-               case 'q':
-                       questflag = YES;
-                       break;
-
-               case 'f':
-                       if(i >= argc-1)
-                         fatal("No description argument after -f flag");
-                       if( rddescf(argv[i+1]) )
+for (i=1; i<argc; ++i)
+       if (argv[i]!=0 && argv[i][0]=='-') {
+               for (j=1 ; (c=argv[i][j])!='\0' ; ++j) {
+                       *op++ = c;
+                       switch (c) {
+
+                       case 'd':
+                               dbgflag = YES;
+                               break;
+
+                       case 'p':
+                               prtrflag = YES;
+                               break;
+
+                       case 's':
+                               silflag = YES;
+                               break;
+
+                       case 'i':
+                               ignerr = YES;
+                               break;
+
+                       case 'S':
+                               keepgoing = NO;
+                               break;
+
+                       case 'k':
+                               keepgoing = YES;
+                               break;
+
+                       case 'n':
+                               noexflag = YES;
+                               break;
+
+                       case 'r':
+                               noruleflag = YES;
+                               break;
+
+                       case 't':
+                               touchflag = YES;
+                               break;
+
+                       case 'q':
+                               questflag = YES;
+                               break;
+
+                       case 'f':
+                               op--;           /* don't pass this one */
+                               if(i >= argc-1)
+                                 fatal("No description argument after -f flag");
+                               if( rddescf(argv[i+1]) )

                                fatal1("Cannot open %s", argv[i+1]);
                                fatal1("Cannot open %s", argv[i+1]);

-                       argv[i+1] = 0;
-                       ++descset;
-                       break;
+                               argv[i+1] = 0;
+                               ++descset;
+                               break;

 
 

-               default:
-                       onechar[0] = c; /* to make lint happy */
-                       fatal1("Unknown flag argument %s", onechar);
+                       default:
+                               onechar[0] = c; /* to make lint happy */
+                               fatal1("Unknown flag argument %s", onechar);
+                       }

                }
                }

-
-       argv[i] = 0;
+               argv[i] = 0;

        }
 
        }
 

+*op++ = '\0';
+if (strcmp(options, "-") == 0)
+       *options = '\0';
+setvar("MFLAGS", options);             /* MFLAGS=options to make */
+

 if( !descset )
 #ifdef unix
        if( rddescf("makefile") )  rddescf("Makefile");
 if( !descset )
 #ifdef unix
        if( rddescf("makefile") )  rddescf("Makefile");


@@ -199,7 +208,7 @@ if(nfargs == 0)
 exit(0);
 }
 
 exit(0);
 }
 

-
+#include <sys/stat.h>

 
 #ifdef unix
 intrupt()
 
 #ifdef unix
 intrupt()


@@ -207,9 +216,12 @@ intrupt()
 struct varblock *varptr();
 char *p;
 TIMETYPE exists();
 struct varblock *varptr();
 char *p;
 TIMETYPE exists();

+struct stat sbuf;

 
 if(okdel && !noexflag && !touchflag &&
 
 if(okdel && !noexflag && !touchflag &&

-       (p = varptr("@")->varval) && exists(p)>0 && !isprecious(p) )
+       (p = varptr("@")->varval) &&
+       (stat(p, &sbuf) >= 0 && (sbuf.st_mode&S_IFMT) == S_IFREG) &&
+       !isprecious(p) )

                {
                fprintf(stderr, "\n***  %s removed.", p);
                unlink(p);
                {
                fprintf(stderr, "\n***  %s removed.", p);
                unlink(p);