mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
- Update for 2007/05/01 import
Approved by: delphij (mentor) Nodded by: ru Tested by: make universe
This commit is contained in:
parent
a36454aac4
commit
202819e1e6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=170335
@ -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++;
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user