Changeset 168 for trunk/src/makedep/main.c

Timestamp:

Oct 13, 2004, 4:06:32 AM (21 years ago)

Author:

bird

Message:

Merged in mozilla changes and config.

File:

• trunk/src/makedep/main.c (modified) (7 diffs)

trunk/src/makedep/main.c

@@ -158 +158 @@
         char **undeflist = NULL;
         int numundefs = 0, i;
+        register char offset; /* mozilla */
 
         ProgramName = argv[0];
@@ -232 +233 @@
                         break;
                 case 'D':
+                        offset = 2; /* mozilla */
+Imaginary Buffer Line
                         if (argv[0][2] == '\0') {
                                 argv++;
                                 argc--;
-                        }
-                        for (p=argv[0] + 2; *p ; p++)
+                                offset = 0;
+                        }
+                        /* offset +1 here since first def letter
+                         * cannot be `=`
+                         */
+                        for (p = argv[0] + offset + 1; *p; p++) /* mozilla */
                                 if (*p == '=') {
                                         *p = ' ';
                                         break;
                                 }
-                        define(argv[0] + 2, &maininclist);
+                        define(argv[0] + offset, &maininclist); /* mozilla */
                         break;
                 case 'I':
@@ -260 +267 @@
                             undeflist = realloc(undeflist,
                                                 numundefs * sizeof(char *));
+                        offset = 2;  /* mozilla */
                         if (argv[0][2] == '\0') {
                                 argv++;
                                 argc--;
-                        }
-                        undeflist[numundefs - 1] = argv[0] + 2;
+                                offset = 0;  /* mozilla */
+                        }
+                        undeflist[numundefs - 1] = argv[0] + offset; /* mozilla */
                         break;
                 case 'Y':
@@ -510 +519 @@
  * eliminate \r chars from file
  */
-static int 
+static int
 elim_cr(char *buf, int sz)
 {
@@ -634 +643 @@
                         whitespace = TRUE;
                 }
-        
+
                 if (*p == '/' && (p+1) < eof && *(p+1) == '*') {
                         /* Consume C comments */
@@ -662 +671 @@
                                 }
                                 else if (*p == '?' && (p+3) < eof &&
-                                         *(p+1) == '?' && 
+                                         *(p+1) == '?' &&
                                          *(p+2) == '/' &&
                                          *(p+3) == '\n') {
@@ -698 +707 @@
                                 *(p++) = '\0';
                                 /* punt lines with just # (yacc generated) */
-                                for (cp = bol+1; 
+                                for (cp = bol+1;
                                      *cp && (*cp == ' ' || *cp == '\t'); cp++);
                                 if (*cp) goto done;