diff options
| author | rafan <rafan@FreeBSD.org> | 2007-06-05 15:35:05 +0000 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2007-06-05 15:35:05 +0000 |
| commit | 5cebee462ba89ea9ac6a1a3e73117c7ef72b72b2 (patch) | |
| tree | 717285d9cdf69d2a4578badee594d96904d60d71 /usr.bin | |
| parent | 1095f96bdaa1ad5dc69d3d22767cc0569e5c407f (diff) | |
| download | FreeBSD-src-5cebee462ba89ea9ac6a1a3e73117c7ef72b72b2.zip FreeBSD-src-5cebee462ba89ea9ac6a1a3e73117c7ef72b72b2.tar.gz | |
- Update for 2007/05/01 import
Approved by: delphij (mentor)
Nodded by: ru
Tested by: make universe
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/awk/b.c.diff | 6 | ||||
| -rw-r--r-- | usr.bin/awk/main.c.diff | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/awk/b.c.diff b/usr.bin/awk/b.c.diff index 2f6b222..525fcbc 100644 --- a/usr.bin/awk/b.c.diff +++ b/usr.bin/awk/b.c.diff @@ -32,7 +32,7 @@ diff -u -p -r1.1.1.8 b.c @@ -303,15 +315,18 @@ char *cclenter(const char *argp) /* add c2 = *p++; if (c2 == '\\') - c2 = quoted((char **) &p); + c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { bp--; @@ -44,8 +44,8 @@ diff -u -p -r1.1.1.8 b.c + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; - if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) - FATAL("out of space for character class [%.10s...] 2", p); + if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1")) + FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; diff --git a/usr.bin/awk/main.c.diff b/usr.bin/awk/main.c.diff index e69a42d..252cd5a 100644 --- a/usr.bin/awk/main.c.diff +++ b/usr.bin/awk/main.c.diff @@ -11,8 +11,8 @@ diff -u -p -r1.1.1.10 main.c THIS SOFTWARE. ****************************************************************/ --const char *version = "version 20050424"; -+const char *version = "version 20050424 (FreeBSD)"; +-const char *version = "version 20070501"; ++const char *version = "version 20070501 (FreeBSD)"; #define DEBUG #include <stdio.h> |
