diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-20 00:55:12 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-10-20 00:55:12 +0000 |
| commit | 8414ed88be8de5352141730c176d30301d6700b4 (patch) | |
| tree | 44a7f767c70131fb1d09f8a151860fee4e22ae5f /bin/sh/mkinit.c | |
| parent | 78d30b21a3fa6e2f7d7fb077246e1e015a2dafdf (diff) | |
Sync with NetBSD. Adds better POSIX compliance amongst others.
Diffstat (limited to 'bin/sh/mkinit.c')
| -rw-r--r-- | bin/sh/mkinit.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c index 9750b99813c..abb7e21f1e3 100644 --- a/bin/sh/mkinit.c +++ b/bin/sh/mkinit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkinit.c,v 1.4 1996/09/15 22:58:09 millert Exp $ */ +/* $OpenBSD: mkinit.c,v 1.5 1996/10/20 00:54:53 millert Exp $ */ /* $NetBSD: mkinit.c,v 1.14 1996/02/18 12:29:21 mycroft Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkinit.c 8.2 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: mkinit.c,v 1.4 1996/09/15 22:58:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: mkinit.c,v 1.5 1996/10/20 00:54:53 millert Exp $"; #endif #endif /* not lint */ @@ -218,6 +218,22 @@ readfile(fname) dodecl(line, fp); if (line[0] == '#' && gooddefine(line)) addstr(line, &defines); + if (line[0] == '#' && gooddefine(line)) { + char *cp; + char line2[1024]; + static const char undef[] = "#undef "; + + strcpy(line2, line); + memcpy(line2, undef, sizeof(undef) - 1); + cp = line2 + sizeof(undef) - 1; + while(*cp && (*cp == ' ' || *cp == '\t')) + cp++; + while(*cp && *cp != ' ' && *cp != '\t' && *cp != '\n') + cp++; + *cp++ = '\n'; *cp = '\0'; + addstr(line2, &defines); + addstr(line, &defines); + } } fclose(fp); } @@ -351,7 +367,7 @@ dodecl(line1, fp) if (! amiddecls) addchar('\n', &decls); q = NULL; - for (p = line1 + 6 ; *p != '\0' && *p != '=' && *p != '/' ; p++); + for (p = line1 + 6 ; *p && strchr("=/\n", *p) == NULL; p++); if (*p == '=') { /* eliminate initialization */ for (q = p ; *q && *q != ';' ; q++); if (*q == '\0') |