More BSD compatibility

diff --git a/read.c b/read.c
index 81aaa2362c6fabaa30844ae958f34d2a3e9de1d5..eb6f953f3b1d8368b5e47869f39232156446816c 100644 (file)
--- a/read.c
+++ b/read.c
@@ -155,11 +155,46 @@ static void remove_comment (char *line) {
 
 }
 
-static int include_makefile (const char *filename) {
+static int include_makefile (const char *filename, int bsd) {
 
     char *path, *new_name;
     unsigned long i;
     
+    if (bsd) {
+    
+        char ch = *filename++, *end;
+        
+        if (ch != '<' && ch != '"') {
+        
+            fprintf (stderr, "%s: *** .include filename must be delimited by '\"' or '<'. Stop.\n", program_name);
+            exit (EXIT_FAILURE);
+        
+        }
+        
+        if (ch == '<') {
+        
+            if (!(end = strrchr (filename, '>'))) {
+            
+                fprintf (stderr, "%s: *** unclosed .include filename. '>' expected. Stop.\n", program_name);
+                exit (EXIT_FAILURE);
+            
+            }
+        
+        } else if (ch == '"') {
+        
+            if (!(end = strrchr (filename, '"'))) {
+            
+                fprintf (stderr, "%s: *** unclosed .include filename. '\"' expected. Stop.\n", program_name);
+                exit (EXIT_FAILURE);
+            
+            }
+        
+        }
+        
+        *end = '\0';
+    
+    }
+    
     if (!read_makefile (filename)) {
         return 0;
     }
@@ -183,7 +218,7 @@ static int include_makefile (const char *filename) {
     }
     
     fprintf (stderr, "%s: *** failed to include '%s'. Stop.\n", program_name, filename);
-    return 1;
+    exit (EXIT_FAILURE);
 
 }
 
@@ -584,9 +619,18 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) {
         
         }
         
-        if (strncmp (p, "include", 7) == 0 && (isspace ((int) p[7]) || p[7] == '\0')) {
+        if (strncmp (p, ".include", 8) == 0 || strncmp (p, "include", 7) == 0) {
         
-            p += 7;
+            int bsd = 0;
+            
+            if (*p == '.') {
+            
+                bsd = 1;
+                p++;
+            
+            }
+            
+            p = skip_whitespace (p + 7);
             
             for (q = p + strlen (p); q > p && isspace ((int) q[-1]); q--) {
                 ;
@@ -614,7 +658,7 @@ static int read_lbuf (struct linebuf *lbuf, int set_default) {
                 saved_ch = *q;
                 *q = '\0';
                 
-                if ((ret = include_makefile (p))) {
+                if ((ret = include_makefile (p, bsd))) {
                     return ret;
                 }