Changeset 2240
- Timestamp:
- Jul 10, 2005, 11:12:06 AM (20 years ago)
- Location:
- trunk/src
- Files:
-
- 2 added
- 3 deleted
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/emx/ChangeLog.LIBC
-
Property cvs2svn:cvs-rev
changed from
1.102
to1.103
r2239 r2240 2 2 3 3 TODO: open replace on RAMFS fails with error 32! 4 5 2005-07-10: knut st. osmundsen <bird-gccos2-spam@anduin.net> 6 - libc: 7 o Replaced BSD regex with the new GLIBC implementation. 4 8 5 9 2005-07-06: knut st. osmundsen <bird-gccos2-spam@anduin.net> -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/include/limits.h
-
Property cvs2svn:cvs-rev
changed from
1.3
to1.4
r2239 r2240 1 /* limits.h,v 1. 3 2004/09/14 22:27:34bird Exp */1 /* limits.h,v 1.4 2005/07/10 09:09:53 bird Exp */ 2 2 /** @file 3 3 * FreeBSD 5.1 … … 73 73 #define EXPR_NEST_MAX 32 /* max expressions nested in expr(1) */ 74 74 #define LINE_MAX 2048 /* max bytes in an input line */ 75 #define RE_DUP_MAX 255 /* max RE's in interval notation*/75 #define RE_DUP_MAX 0x7fff /* max RE's in interval notation */ /* bird: was 255, glibc regexp. */ 76 76 77 77 #define _POSIX2_BC_BASE_MAX 99 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/include/regex.h
-
Property cvs2svn:cvs-rev
changed from
1.4
to1.5
r2239 r2240 1 /* regex.h,v 1.2 2004/09/14 22:27:35 bird Exp */ 2 /** @file 3 * FreeBSD 5.3 4 * @changed bird: Added REG_NOMATCH. 1 /* Definitions for data structures and routines for the regular 2 expression library. 3 Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003 4 Free Software Foundation, Inc. 5 This file is part of the GNU C Library. 6 7 The GNU C Library is free software; you can redistribute it and/or 8 modify it under the terms of the GNU Lesser General Public 9 License as published by the Free Software Foundation; either 10 version 2.1 of the License, or (at your option) any later version. 11 12 The GNU C Library is distributed in the hope that it will be useful, 13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 Lesser General Public License for more details. 16 17 You should have received a copy of the GNU Lesser General Public 18 License along with the GNU C Library; if not, write to the Free 19 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 20 02111-1307 USA. */ 21 22 #ifndef _REGEX_H 23 #define _REGEX_H 1 24 25 #include <sys/types.h> 26 27 /* Allow the use in C++ code. */ 28 #ifdef __cplusplus 29 extern "C" { 30 #endif 31 32 /* POSIX says that <sys/types.h> must be included (by the caller) before 33 <regex.h>. */ 34 35 #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS 36 /* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it 37 should be there. */ 38 # include <stddef.h> 39 #endif 40 41 /* The following two types have to be signed and unsigned integer type 42 wide enough to hold a value of a pointer. For most ANSI compilers 43 ptrdiff_t and size_t should be likely OK. Still size of these two 44 types is 2 for Microsoft C. Ugh... */ 45 typedef long int s_reg_t; 46 typedef unsigned long int active_reg_t; 47 48 /* The following bits are used to determine the regexp syntax we 49 recognize. The set/not-set meanings are chosen so that Emacs syntax 50 remains the value 0. The bits are given in alphabetical order, and 51 the definitions shifted by one from the previous bit; thus, when we 52 add or remove a bit, only one other definition need change. */ 53 typedef unsigned long int reg_syntax_t; 54 55 /* If this bit is not set, then \ inside a bracket expression is literal. 56 If set, then such a \ quotes the following character. */ 57 #define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1) 58 59 /* If this bit is not set, then + and ? are operators, and \+ and \? are 60 literals. 61 If set, then \+ and \? are operators and + and ? are literals. */ 62 #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) 63 64 /* If this bit is set, then character classes are supported. They are: 65 [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], 66 [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. 67 If not set, then character classes are not supported. */ 68 #define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) 69 70 /* If this bit is set, then ^ and $ are always anchors (outside bracket 71 expressions, of course). 72 If this bit is not set, then it depends: 73 ^ is an anchor if it is at the beginning of a regular 74 expression or after an open-group or an alternation operator; 75 $ is an anchor if it is at the end of a regular expression, or 76 before a close-group or an alternation operator. 77 78 This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because 79 POSIX draft 11.2 says that * etc. in leading positions is undefined. 80 We already implemented a previous draft which made those constructs 81 invalid, though, so we haven't changed the code back. */ 82 #define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) 83 84 /* If this bit is set, then special characters are always special 85 regardless of where they are in the pattern. 86 If this bit is not set, then special characters are special only in 87 some contexts; otherwise they are ordinary. Specifically, 88 * + ? and intervals are only special when not after the beginning, 89 open-group, or alternation operator. */ 90 #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) 91 92 /* If this bit is set, then *, +, ?, and { cannot be first in an re or 93 immediately after an alternation or begin-group operator. */ 94 #define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) 95 96 /* If this bit is set, then . matches newline. 97 If not set, then it doesn't. */ 98 #define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) 99 100 /* If this bit is set, then . doesn't match NUL. 101 If not set, then it does. */ 102 #define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) 103 104 /* If this bit is set, nonmatching lists [^...] do not match newline. 105 If not set, they do. */ 106 #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) 107 108 /* If this bit is set, either \{...\} or {...} defines an 109 interval, depending on RE_NO_BK_BRACES. 110 If not set, \{, \}, {, and } are literals. */ 111 #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) 112 113 /* If this bit is set, +, ? and | aren't recognized as operators. 114 If not set, they are. */ 115 #define RE_LIMITED_OPS (RE_INTERVALS << 1) 116 117 /* If this bit is set, newline is an alternation operator. 118 If not set, newline is literal. */ 119 #define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) 120 121 /* If this bit is set, then `{...}' defines an interval, and \{ and \} 122 are literals. 123 If not set, then `\{...\}' defines an interval. */ 124 #define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) 125 126 /* If this bit is set, (...) defines a group, and \( and \) are literals. 127 If not set, \(...\) defines a group, and ( and ) are literals. */ 128 #define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) 129 130 /* If this bit is set, then \<digit> matches <digit>. 131 If not set, then \<digit> is a back-reference. */ 132 #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) 133 134 /* If this bit is set, then | is an alternation operator, and \| is literal. 135 If not set, then \| is an alternation operator, and | is literal. */ 136 #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) 137 138 /* If this bit is set, then an ending range point collating higher 139 than the starting range point, as in [z-a], is invalid. 140 If not set, then when ending range point collates higher than the 141 starting range point, the range is ignored. */ 142 #define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) 143 144 /* If this bit is set, then an unmatched ) is ordinary. 145 If not set, then an unmatched ) is invalid. */ 146 #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) 147 148 /* If this bit is set, succeed as soon as we match the whole pattern, 149 without further backtracking. */ 150 #define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) 151 152 /* If this bit is set, do not process the GNU regex operators. 153 If not set, then the GNU regex operators are recognized. */ 154 #define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1) 155 156 /* If this bit is set, turn on internal regex debugging. 157 If not set, and debugging was on, turn it off. 158 This only works if regex.c is compiled -DDEBUG. 159 We define this bit always, so that all that's needed to turn on 160 debugging is to recompile regex.c; the calling code can always have 161 this bit set, and it won't affect anything in the normal case. */ 162 #define RE_DEBUG (RE_NO_GNU_OPS << 1) 163 164 /* If this bit is set, a syntactically invalid interval is treated as 165 a string of ordinary characters. For example, the ERE 'a{1' is 166 treated as 'a\{1'. */ 167 #define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1) 168 169 /* If this bit is set, then ignore case when matching. 170 If not set, then case is significant. */ 171 #define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) 172 173 /* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only 174 for ^, because it is difficult to scan the regex backwards to find 175 whether ^ should be special. */ 176 #define RE_CARET_ANCHORS_HERE (RE_ICASE << 1) 177 178 /* If this bit is set, then \{ cannot be first in an bre or 179 immediately after an alternation or begin-group operator. */ 180 #define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1) 181 182 /* If this bit is set, then no_sub will be set to 1 during 183 re_compile_pattern. */ 184 #define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1) 185 186 /* This global variable defines the particular regexp syntax to use (for 187 some interfaces). When a regexp is compiled, the syntax used is 188 stored in the pattern buffer, so changing this does not affect 189 already-compiled regexps. */ 190 extern reg_syntax_t re_syntax_options; 191 192 193 /* Define combinations of the above bits for the standard possibilities. 194 (The [[[ comments delimit what gets put into the Texinfo file, so 195 don't delete them!) */ 196 /* [[[begin syntaxes]]] */ 197 #define RE_SYNTAX_EMACS 0 198 199 #define RE_SYNTAX_AWK \ 200 (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ 201 | RE_NO_BK_PARENS | RE_NO_BK_REFS \ 202 | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ 203 | RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \ 204 | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS) 205 206 #define RE_SYNTAX_GNU_AWK \ 207 ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG) \ 208 & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS \ 209 | RE_CONTEXT_INVALID_OPS )) 210 211 #define RE_SYNTAX_POSIX_AWK \ 212 (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ 213 | RE_INTERVALS | RE_NO_GNU_OPS) 214 215 #define RE_SYNTAX_GREP \ 216 (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ 217 | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ 218 | RE_NEWLINE_ALT) 219 220 #define RE_SYNTAX_EGREP \ 221 (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ 222 | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ 223 | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ 224 | RE_NO_BK_VBAR) 225 226 #define RE_SYNTAX_POSIX_EGREP \ 227 (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \ 228 | RE_INVALID_INTERVAL_ORD) 229 230 /* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ 231 #define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC 232 233 #define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC 234 235 /* Syntax bits common to both basic and extended POSIX regex syntax. */ 236 #define _RE_SYNTAX_POSIX_COMMON \ 237 (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ 238 | RE_INTERVALS | RE_NO_EMPTY_RANGES) 239 240 #define RE_SYNTAX_POSIX_BASIC \ 241 (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP) 242 243 /* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes 244 RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this 245 isn't minimal, since other operators, such as \`, aren't disabled. */ 246 #define RE_SYNTAX_POSIX_MINIMAL_BASIC \ 247 (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) 248 249 #define RE_SYNTAX_POSIX_EXTENDED \ 250 (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ 251 | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ 252 | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ 253 | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD) 254 255 /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is 256 removed and RE_NO_BK_REFS is added. */ 257 #define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ 258 (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ 259 | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ 260 | RE_NO_BK_PARENS | RE_NO_BK_REFS \ 261 | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) 262 /* [[[end syntaxes]]] */ 263 264 265 /* Maximum number of duplicates an interval can allow. Some systems 266 (erroneously) define this in other header files, but we want our 267 value, so remove any previous define. */ 268 #ifdef RE_DUP_MAX 269 # undef RE_DUP_MAX 270 #endif 271 /* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */ 272 #define RE_DUP_MAX (0x7fff) 273 274 275 /* POSIX `cflags' bits (i.e., information for `regcomp'). */ 276 277 /* If this bit is set, then use extended regular expression syntax. 278 If not set, then use basic regular expression syntax. */ 279 #define REG_EXTENDED 1 280 281 /* If this bit is set, then ignore case when matching. 282 If not set, then case is significant. */ 283 #define REG_ICASE (REG_EXTENDED << 1) 284 285 /* If this bit is set, then anchors do not match at newline 286 characters in the string. 287 If not set, then anchors do match at newlines. */ 288 #define REG_NEWLINE (REG_ICASE << 1) 289 290 /* If this bit is set, then report only success or fail in regexec. 291 If not set, then returns differ between not matching and errors. */ 292 #define REG_NOSUB (REG_NEWLINE << 1) 293 294 295 /* POSIX `eflags' bits (i.e., information for regexec). */ 296 297 /* If this bit is set, then the beginning-of-line operator doesn't match 298 the beginning of the string (presumably because it's not the 299 beginning of a line). 300 If not set, then the beginning-of-line operator does match the 301 beginning of the string. */ 302 #define REG_NOTBOL 1 303 304 /* Like REG_NOTBOL, except for the end-of-line. */ 305 #define REG_NOTEOL (1 << 1) 306 307 /* Use PMATCH[0] to delimit the start and end of the search in the 308 buffer. */ 309 #define REG_STARTEND (1 << 2) 310 311 312 /* If any error codes are removed, changed, or added, update the 313 `re_error_msg' table in regex.c. */ 314 typedef enum 315 { 316 #ifdef _XOPEN_SOURCE 317 REG_ENOSYS = -1, /* This will never happen for this implementation. */ 318 #endif 319 320 REG_NOERROR = 0, /* Success. */ 321 REG_NOMATCH, /* Didn't find a match (for regexec). */ 322 323 /* POSIX regcomp return error codes. (In the order listed in the 324 standard.) */ 325 REG_BADPAT, /* Invalid pattern. */ 326 REG_ECOLLATE, /* Inalid collating element. */ 327 REG_ECTYPE, /* Invalid character class name. */ 328 REG_EESCAPE, /* Trailing backslash. */ 329 REG_ESUBREG, /* Invalid back reference. */ 330 REG_EBRACK, /* Unmatched left bracket. */ 331 REG_EPAREN, /* Parenthesis imbalance. */ 332 REG_EBRACE, /* Unmatched \{. */ 333 REG_BADBR, /* Invalid contents of \{\}. */ 334 REG_ERANGE, /* Invalid range end. */ 335 REG_ESPACE, /* Ran out of memory. */ 336 REG_BADRPT, /* No preceding re for repetition op. */ 337 338 /* Error codes we've added. */ 339 REG_EEND, /* Premature end. */ 340 REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ 341 REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ 342 } reg_errcode_t; 343 344 345 /* This data structure represents a compiled pattern. Before calling 346 the pattern compiler, the fields `buffer', `allocated', `fastmap', 347 `translate', and `no_sub' can be set. After the pattern has been 348 compiled, the `re_nsub' field is available. All other fields are 349 private to the regex routines. */ 350 351 #ifndef RE_TRANSLATE_TYPE 352 # define RE_TRANSLATE_TYPE char * 353 #endif 354 355 struct re_pattern_buffer 356 { 357 /* [[[begin pattern_buffer]]] */ 358 /* Space that holds the compiled pattern. It is declared as 359 `unsigned char *' because its elements are 360 sometimes used as array indexes. */ 361 unsigned char *buffer; 362 363 /* Number of bytes to which `buffer' points. */ 364 unsigned long int allocated; 365 366 /* Number of bytes actually used in `buffer'. */ 367 unsigned long int used; 368 369 /* Syntax setting with which the pattern was compiled. */ 370 reg_syntax_t syntax; 371 372 /* Pointer to a fastmap, if any, otherwise zero. re_search uses 373 the fastmap, if there is one, to skip over impossible 374 starting points for matches. */ 375 char *fastmap; 376 377 /* Either a translate table to apply to all characters before 378 comparing them, or zero for no translation. The translation 379 is applied to a pattern when it is compiled and to a string 380 when it is matched. */ 381 RE_TRANSLATE_TYPE translate; 382 383 /* Number of subexpressions found by the compiler. */ 384 size_t re_nsub; 385 386 /* Zero if this pattern cannot match the empty string, one else. 387 Well, in truth it's used only in `re_search_2', to see 388 whether or not we should use the fastmap, so we don't set 389 this absolutely perfectly; see `re_compile_fastmap' (the 390 `duplicate' case). */ 391 unsigned can_be_null : 1; 392 393 /* If REGS_UNALLOCATED, allocate space in the `regs' structure 394 for `max (RE_NREGS, re_nsub + 1)' groups. 395 If REGS_REALLOCATE, reallocate space if necessary. 396 If REGS_FIXED, use what's there. */ 397 #define REGS_UNALLOCATED 0 398 #define REGS_REALLOCATE 1 399 #define REGS_FIXED 2 400 unsigned regs_allocated : 2; 401 402 /* Set to zero when `regex_compile' compiles a pattern; set to one 403 by `re_compile_fastmap' if it updates the fastmap. */ 404 unsigned fastmap_accurate : 1; 405 406 /* If set, `re_match_2' does not return information about 407 subexpressions. */ 408 unsigned no_sub : 1; 409 410 /* If set, a beginning-of-line anchor doesn't match at the 411 beginning of the string. */ 412 unsigned not_bol : 1; 413 414 /* Similarly for an end-of-line anchor. */ 415 unsigned not_eol : 1; 416 417 /* If true, an anchor at a newline matches. */ 418 unsigned newline_anchor : 1; 419 420 /* [[[end pattern_buffer]]] */ 421 }; 422 423 typedef struct re_pattern_buffer regex_t; 424 425 426 /* Type for byte offsets within the string. POSIX mandates this. */ 427 typedef int regoff_t; 428 429 430 /* This is the structure we store register match data in. See 431 regex.texinfo for a full description of what registers match. */ 432 struct re_registers 433 { 434 unsigned num_regs; 435 regoff_t *start; 436 regoff_t *end; 437 }; 438 439 440 /* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, 441 `re_match_2' returns information about at least this many registers 442 the first time a `regs' structure is passed. */ 443 #ifndef RE_NREGS 444 # define RE_NREGS 30 445 #endif 446 447 448 /* POSIX specification for registers. Aside from the different names than 449 `re_registers', POSIX uses an array of structures, instead of a 450 structure of arrays. */ 451 typedef struct 452 { 453 regoff_t rm_so; /* Byte offset from string's start to substring's start. */ 454 regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ 455 } regmatch_t; 456 457 458 /* Declarations for routines. */ 459 460 /* To avoid duplicating every routine declaration -- once with a 461 prototype (if we are ANSI), and once without (if we aren't) -- we 462 use the following macro to declare argument types. This 463 unfortunately clutters up the declarations a bit, but I think it's 464 worth it. */ 465 466 #if __STDC__ 467 468 # define _RE_ARGS(args) args 469 470 #else /* not __STDC__ */ 471 472 # define _RE_ARGS(args) () 473 #error "asdf" 474 475 #endif /* not __STDC__ */ 476 477 /* Sets the current default syntax to SYNTAX, and return the old syntax. 478 You can also simply assign to the `re_syntax_options' variable. */ 479 extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax)); 480 481 /* Compile the regular expression PATTERN, with length LENGTH 482 and syntax given by the global `re_syntax_options', into the buffer 483 BUFFER. Return NULL if successful, and an error string if not. */ 484 extern const char *re_compile_pattern 485 _RE_ARGS ((const char *pattern, size_t length, 486 struct re_pattern_buffer *buffer)); 487 488 489 /* Compile a fastmap for the compiled pattern in BUFFER; used to 490 accelerate searches. Return 0 if successful and -2 if was an 491 internal error. */ 492 extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer)); 493 494 495 /* Search in the string STRING (with length LENGTH) for the pattern 496 compiled into BUFFER. Start searching at position START, for RANGE 497 characters. Return the starting position of the match, -1 for no 498 match, or -2 for an internal error. Also return register 499 information in REGS (if REGS and BUFFER->no_sub are nonzero). */ 500 extern int re_search 501 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, 502 int length, int start, int range, struct re_registers *regs)); 503 504 505 /* Like `re_search', but search in the concatenation of STRING1 and 506 STRING2. Also, stop searching at index START + STOP. */ 507 extern int re_search_2 508 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, 509 int length1, const char *string2, int length2, 510 int start, int range, struct re_registers *regs, int stop)); 511 512 513 /* Like `re_search', but return how many characters in STRING the regexp 514 in BUFFER matched, starting at position START. */ 515 extern int re_match 516 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string, 517 int length, int start, struct re_registers *regs)); 518 519 520 /* Relates to `re_match' as `re_search_2' relates to `re_search'. */ 521 extern int re_match_2 522 _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1, 523 int length1, const char *string2, int length2, 524 int start, struct re_registers *regs, int stop)); 525 526 527 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and 528 ENDS. Subsequent matches using BUFFER and REGS will use this memory 529 for recording register information. STARTS and ENDS must be 530 allocated with malloc, and must each be at least `NUM_REGS * sizeof 531 (regoff_t)' bytes long. 532 533 If NUM_REGS == 0, then subsequent matches should allocate their own 534 register data. 535 536 Unless this function is called, the first search or match using 537 PATTERN_BUFFER will allocate its own register data, without 538 freeing the old data. */ 539 extern void re_set_registers 540 _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, 541 unsigned num_regs, regoff_t *starts, regoff_t *ends)); 542 543 #if defined _REGEX_RE_COMP || defined _LIBC 544 # ifndef _CRAY 545 /* 4.2 bsd compatibility. */ 546 extern char *re_comp _RE_ARGS ((const char *)); 547 extern int re_exec _RE_ARGS ((const char *)); 548 # endif 549 #endif 550 551 /* GCC 2.95 and later have "__restrict"; C99 compilers have 552 "restrict", and "configure" may have defined "restrict". */ 553 #ifndef __restrict 554 # if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) 555 # if defined restrict || 199901L <= __STDC_VERSION__ 556 # define __restrict restrict 557 # else 558 # define __restrict 559 # endif 560 # endif 561 #endif 562 /* gcc 3.1 and up support the [restrict] syntax. */ 563 #ifndef __restrict_arr 564 # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) 565 # define __restrict_arr __restrict 566 # else 567 # define __restrict_arr 568 # endif 569 #endif 570 571 /* POSIX compatibility. */ 572 extern int regcomp _RE_ARGS ((regex_t *__restrict __preg, 573 const char *__restrict __pattern, 574 int __cflags)); 575 576 extern int regexec _RE_ARGS ((const regex_t *__restrict __preg, 577 const char *__restrict __string, size_t __nmatch, 578 regmatch_t __pmatch[__restrict_arr], 579 int __eflags)); 580 581 extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg, 582 char *__errbuf, size_t __errbuf_size)); 583 584 extern void regfree _RE_ARGS ((regex_t *__preg)); 585 586 587 #ifdef __cplusplus 588 } 589 #endif /* C++ */ 590 591 #endif /* regex.h */ 592 593 594 /* 595 Local variables: 596 make-backup-files: t 597 version-control: t 598 trim-versions-without-asking: nil 599 End: 5 600 */ 6 /*-7 * Copyright (c) 1992 Henry Spencer.8 * Copyright (c) 1992, 19939 * The Regents of the University of California. All rights reserved.10 *11 * This code is derived from software contributed to Berkeley by12 * Henry Spencer of the University of Toronto.13 *14 * Redistribution and use in source and binary forms, with or without15 * modification, are permitted provided that the following conditions16 * are met:17 * 1. Redistributions of source code must retain the above copyright18 * notice, this list of conditions and the following disclaimer.19 * 2. Redistributions in binary form must reproduce the above copyright20 * notice, this list of conditions and the following disclaimer in the21 * documentation and/or other materials provided with the distribution.22 * 3. All advertising materials mentioning features or use of this software23 * must display the following acknowledgement:24 * This product includes software developed by the University of25 * California, Berkeley and its contributors.26 * 4. Neither the name of the University nor the names of its contributors27 * may be used to endorse or promote products derived from this software28 * without specific prior written permission.29 *30 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND31 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE32 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE33 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE34 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL35 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS36 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)37 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT38 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY39 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF40 * SUCH DAMAGE.41 *42 * @(#)regex.h 8.2 (Berkeley) 1/3/9443 * $FreeBSD: src/include/regex.h,v 1.11 2004/07/12 06:07:26 tjr Exp $44 */45 46 #ifndef _REGEX_H_47 #define _REGEX_H_48 49 #include <sys/cdefs.h>50 #include <sys/_types.h>51 52 /* types */53 typedef __off_t regoff_t;54 55 #if !defined(_SIZE_T_DECLARED) && !defined(_SIZE_T) /* bird: emx */56 typedef __size_t size_t;57 #define _SIZE_T_DECLARED58 #define _SIZE_T /* bird: emx */59 #endif60 61 typedef struct {62 int re_magic;63 size_t re_nsub; /* number of parenthesized subexpressions */64 __const char *re_endp; /* end pointer for REG_PEND */65 struct re_guts *re_g; /* none of your business :-) */66 } regex_t;67 68 typedef struct {69 regoff_t rm_so; /* start of match */70 regoff_t rm_eo; /* end of match */71 } regmatch_t;72 73 /* regcomp() flags */74 #define REG_BASIC 000075 #define REG_EXTENDED 000176 #define REG_ICASE 000277 #define REG_NOSUB 000478 #define REG_NEWLINE 001079 #define REG_NOSPEC 002080 #define REG_PEND 004081 #define REG_DUMP 020082 83 /* regerror() flags */84 #define REG_ENOSYS (-1)85 #if !defined(REG_NOMATCH) && __USE_GNU /* bird */86 #define REG_NOERROR 0 /* bird */87 #endif /* bird */88 #define REG_NOMATCH 189 #define REG_BADPAT 290 #define REG_ECOLLATE 391 #define REG_ECTYPE 492 #define REG_EESCAPE 593 #define REG_ESUBREG 694 #define REG_EBRACK 795 #define REG_EPAREN 896 #define REG_EBRACE 997 #define REG_BADBR 1098 #define REG_ERANGE 1199 #define REG_ESPACE 12100 #define REG_BADRPT 13101 #define REG_EMPTY 14102 #define REG_ASSERT 15103 #define REG_INVARG 16104 #define REG_ILLSEQ 17105 #define REG_ATOI 255 /* convert name to number (!) */106 #define REG_ITOA 0400 /* convert number to name (!) */107 108 /* regexec() flags */109 #define REG_NOTBOL 00001110 #define REG_NOTEOL 00002111 #define REG_STARTEND 00004112 #define REG_TRACE 00400 /* tracing of execution */113 #define REG_LARGE 01000 /* force large representation */114 #define REG_BACKR 02000 /* force use of backref code */115 116 __BEGIN_DECLS117 int regcomp(regex_t * __restrict, const char * __restrict, int);118 size_t regerror(int, const regex_t * __restrict, char * __restrict, size_t);119 /*120 * XXX forth parameter should be `regmatch_t [__restrict]', but isn't because121 * of a bug in GCC 3.2 (when -std=c99 is specified) which perceives this as a122 * syntax error.123 */124 int regexec(const regex_t * __restrict, const char * __restrict, size_t,125 regmatch_t * __restrict, int);126 void regfree(regex_t *);127 __END_DECLS128 129 #endif /* !_REGEX_H_ */ -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/include/config.h
-
Property cvs2svn:cvs-rev
changed from
1.5
to1.6
r2239 r2240 63 63 #define HAVE_LANGINFO_CODESET 1 64 64 #define HAVE_SETLOCALE 1 65 #define HAVE_LOCALE_H 1 65 66 #define HAVE_LC_MESSAGES 1 66 67 #define HAVE_LOCALE_NULL 1 68 #define HAVE_WCHAR_H 1 69 #define HAVE_WCTYPE_H 1 70 #define HAVE_ISBLANK 1 71 #define HAVE_WCRTOMB 1 72 #define HAVE_MBRTOWC 1 73 #define HAVE_WCSCOLL 0 67 74 68 75 #define STRERROR_R_CHAR_P 0 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/include/libc-alias-glibc.h
-
Property cvs2svn:cvs-rev
changed from
1.4
to1.5
r2239 r2240 571 571 #define __lgamma_r _STD(lgamma_r) 572 572 573 #define mempcpy __mempcpy 573 574 #endif -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/posix.smak
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 1 libc.TSRC += $(wildcard src/lib/lgpl/posix/*.c) 1 libc.TSRC += $(filter-out $(addprefix src/lib/lgpl/posix/,regcomp.c regexec.c regex_internal.c), \ 2 $(wildcard src/lib/lgpl/posix/*.c)) -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/regcomp.c
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 242 242 243 243 const char * 244 re_compile_pattern(pattern, length, bufp)244 _STD(re_compile_pattern) (pattern, length, bufp) 245 245 const char *pattern; 246 246 size_t length; … … 264 264 } 265 265 #ifdef _LIBC 266 weak_alias (__re_compile_pattern, re_compile_pattern) 266 /* w e a k _alias (__re_compile_pattern, re_compile_pattern)*/ 267 267 #endif 268 268 … … 272 272 /* This has no initializer because initialized variables in Emacs 273 273 become read-only after dumping. */ 274 reg_syntax_t re_syntax_options;274 reg_syntax_t _STD(re_syntax_options); 275 275 276 276 … … 283 283 284 284 reg_syntax_t 285 re_set_syntax(syntax)285 _STD(re_set_syntax) (syntax) 286 286 reg_syntax_t syntax; 287 287 { … … 292 292 } 293 293 #ifdef _LIBC 294 weak_alias (__re_set_syntax, re_set_syntax) 294 /* w e a k _ a l i a s (__re_set_syntax, re_set_syntax) */ 295 295 #endif 296 296 297 297 int 298 re_compile_fastmap(bufp)298 _STD(re_compile_fastmap) (bufp) 299 299 struct re_pattern_buffer *bufp; 300 300 { … … 314 314 } 315 315 #ifdef _LIBC 316 weak_alias (__re_compile_fastmap, re_compile_fastmap) 316 /* w e a k _ a l i a s (__re_compile_fastmap, re_compile_fastmap) */ 317 317 #endif 318 318 … … 419 419 if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) 420 420 != (size_t) -1) 421 421 re_set_fastmap (fastmap, 0, *(unsigned char *) buf); 422 422 } 423 423 } … … 476 476 477 477 int 478 regcomp(preg, pattern, cflags)478 _STD(regcomp) (preg, pattern, cflags) 479 479 regex_t *__restrict preg; 480 480 const char *__restrict pattern; … … 531 531 } 532 532 #ifdef _LIBC 533 weak_alias (__regcomp, regcomp) 533 /* w e a k _ a l i a s (__regcomp, regcomp) */ 534 534 #endif 535 535 … … 538 538 539 539 size_t 540 regerror(errcode, preg, errbuf, errbuf_size)540 _STD(regerror) (errcode, preg, errbuf, errbuf_size) 541 541 int errcode; 542 542 const regex_t *preg; … … 578 578 } 579 579 #ifdef _LIBC 580 weak_alias (__regerror, regerror) 580 /* w e a k _ a l i a s (__regerror, regerror) */ 581 581 #endif 582 582 … … 650 650 651 651 void 652 regfree(preg)652 _STD(regfree) (preg) 653 653 regex_t *preg; 654 654 { … … 666 666 } 667 667 #ifdef _LIBC 668 weak_alias (__regfree, regfree) 668 /* w e a k_alias (__regfree, regfree) */ 669 669 #endif 670 670 … … 673 673 them unless specifically requested. */ 674 674 675 #if defined _REGEX_RE_COMP || defined _LIBC 675 #if defined _REGEX_RE_COMP || defined _LIBC || defined __INNOTEK_LIBC__ 676 676 677 677 /* BSD has one and only one pattern buffer. */ … … 685 685 weak_function 686 686 # endif 687 re_comp(s)687 _STD(re_comp) (s) 688 688 const char *s; 689 689 { … … 924 924 for (j = 0; j < UINT_BITS; ++j, ++ch) 925 925 { 926 w char_t wch = __btowc (ch);926 wint_t wch = __btowc (ch); 927 927 if (wch != WEOF) 928 928 dfa->sb_char[i] |= 1 << j; 929 # ifndef _LIBC 929 # ifndef _LIBC && !defined __INNOTEK_LIBC__ 930 930 if (isascii (ch) && wch != (wchar_t) ch) 931 931 dfa->map_notascii = 1; … … 2693 2693 # ifdef RE_ENABLE_I18N 2694 2694 { 2695 w char_t wc, start_wc, end_wc;2695 wint_t wc, start_wc, end_wc; 2696 2696 wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; 2697 2697 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/regex.c
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 22 22 #include "config.h" 23 23 #endif 24 25 #define RE_ENABLE_I18N 1 26 27 /* BSD 4.2, not delcared in the header */ 28 char * re_comp (const char *); 29 int re_exec (const char *); 30 24 31 25 32 #ifdef _AIX … … 89 96 90 97 /* Binary backward compatibility. */ 91 #if _LIBC98 #if defined _LIBC && _LIBC 92 99 # include <shlib-compat.h> 93 100 # if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3) -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/regex_internal.c
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 625 625 pstr->valid_len -= offset; 626 626 pstr->valid_raw_len -= offset; 627 #if DEBUG627 #ifdef DEBUG //bird 628 628 assert (pstr->valid_len > 0); 629 629 #endif … … 1346 1346 re_token_t token; 1347 1347 { 1348 #ifdef RE_ENABLE_I18N //bird 1348 1349 int type = token.type; 1350 #endif 1349 1351 if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0)) 1350 1352 { -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/regex_internal.h
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 40 40 # include <wctype.h> 41 41 #endif /* HAVE_WCTYPE_H || _LIBC */ 42 #if defined _LIBC 42 #if defined _LIBC || defined __INNOTEK_LIBC__ 43 43 # include <bits/libc-lock.h> 44 44 #else … … 64 64 65 65 /* This is for other GNU distributions with internationalized messages. */ 66 #if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC66 #if !defined(__INNOTEK_LIBC__) && (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC 67 67 # include <libintl.h> 68 68 # ifdef _LIBC … … 81 81 #endif 82 82 83 #ifndef __INNOTEK_LIBC__ 83 84 #if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC 84 85 # define RE_ENABLE_I18N 86 #endif 85 87 #endif 86 88 … … 368 370 369 371 #ifndef _LIBC 370 # if def __i386__372 # if defined __i386__ && !defined __INNOTEK_LIBC__ 371 373 # define internal_function __attribute ((regparm (3), stdcall)) 372 374 # else -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/lgpl/posix/regexec.c
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 212 212 213 213 int 214 regexec(preg, string, nmatch, pmatch, eflags)214 _STD(regexec) (preg, string, nmatch, pmatch, eflags) 215 215 const regex_t *__restrict preg; 216 216 const char *__restrict string; … … 298 298 299 299 int 300 re_match(bufp, string, length, start, regs)300 _STD(re_match) (bufp, string, length, start, regs) 301 301 struct re_pattern_buffer *bufp; 302 302 const char *string; … … 307 307 } 308 308 #ifdef _LIBC 309 weak_alias (__re_match, re_match) 309 /* w e a k _alias (__re_match, re_match) */ 310 310 #endif 311 311 312 312 int 313 re_search(bufp, string, length, start, range, regs)313 _STD(re_search) (bufp, string, length, start, range, regs) 314 314 struct re_pattern_buffer *bufp; 315 315 const char *string; … … 320 320 } 321 321 #ifdef _LIBC 322 weak_alias (__re_search, re_search) 322 /* w e a k _alias (__re_search, re_search) */ 323 323 #endif 324 324 325 325 int 326 re_match_2(bufp, string1, length1, string2, length2, start, regs, stop)326 _STD(re_match_2) (bufp, string1, length1, string2, length2, start, regs, stop) 327 327 struct re_pattern_buffer *bufp; 328 328 const char *string1, *string2; … … 334 334 } 335 335 #ifdef _LIBC 336 weak_alias (__re_match_2, re_match_2) 336 /* w e a k _alias (__re_match_2, re_match_2)*/ 337 337 #endif 338 338 339 339 int 340 re_search_2(bufp, string1, length1, string2, length2, start, range, regs, stop)340 _STD(re_search_2) (bufp, string1, length1, string2, length2, start, range, regs, stop) 341 341 struct re_pattern_buffer *bufp; 342 342 const char *string1, *string2; … … 348 348 } 349 349 #ifdef _LIBC 350 weak_alias (__re_search_2, re_search_2) 350 /* w e a k _alias (__re_search_2, re_search_2) */ 351 351 #endif 352 352 … … 556 556 557 557 void 558 re_set_registers(bufp, regs, num_regs, starts, ends)558 _STD(re_set_registers) (bufp, regs, num_regs, starts, ends) 559 559 struct re_pattern_buffer *bufp; 560 560 struct re_registers *regs; … … 577 577 } 578 578 #ifdef _LIBC 579 weak_alias (__re_set_registers, re_set_registers) 579 /* w e a k_alias (__re_set_registers, re_set_registers) */ 580 580 #endif 581 581 … … 584 584 them unless specifically requested. */ 585 585 586 #if defined _REGEX_RE_COMP || defined _LIBC 586 #if defined _REGEX_RE_COMP || defined _LIBC || __INNOTEK_LIBC__ 587 587 int 588 588 # ifdef _LIBC 589 589 weak_function 590 590 # endif 591 re_exec(s)591 _STD(re_exec) (s) 592 592 const char *s; 593 593 { … … 2292 2292 2293 2293 /* Update the state_log if we need */ 2294 re_dfastate_t *2294 static re_dfastate_t * 2295 2295 merge_state_with_log (err, mctx, next_state) 2296 2296 reg_errcode_t *err; … … 3034 3034 int result; 3035 3035 int cur_idx; 3036 #ifdef RE_ENABLE_I18N 3036 3037 reg_errcode_t err; 3038 #endif 3037 3039 re_node_set union_set; 3038 3040 re_node_set_init_empty (&union_set); -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/libc.def
-
Property cvs2svn:cvs-rev
changed from
1.133
to1.134
r2239 r2240 75 75 "__nl_msg_cat_cntr" @53 76 76 "__nl_domain_bindings" @54 77 77 "__std_re_syntax_options" @55 78 78 79 79 "__mcount" @99 ; this is a stub in all but the profiling build. … … 1239 1239 "__std_random" @1252 1240 1240 "_reallocf" @1253 1241 "_ regcomp" @12541242 "_ regerror" @12551243 "_ regexec" @12561244 "_ regfree" @12571241 "__std_regcomp" @1254 1242 "__std_regerror" @1255 1243 "__std_regexec" @1256 1244 "__std_regfree" @1257 1245 1245 "_setgrent" @1258 1246 1246 "_setgroupent" @1259 … … 1928 1928 "__std_getsid" @1927 1929 1929 "__std_setlinebuf" @1928 1930 1930 ; regex (glibc) 1931 "___re_error_msgid" @1929 1932 "___re_error_msgid_idx" @1930 1933 "__std_re_comp" @1931 1934 "__std_re_compile_fastmap" @1932 1935 "__std_re_compile_pattern" @1933 1936 "__std_re_exec" @1934 1937 "__std_re_match" @1935 1938 "__std_re_match_2" @1936 1939 "__std_re_search" @1937 1940 "__std_re_search_2" @1938 1941 "__std_re_set_registers" @1939 1942 "__std_re_set_syntax" @1940 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/libc.smak
-
Property cvs2svn:cvs-rev
changed from
1.74
to1.75
r2239 r2240 467 467 # libc06b5 468 468 $.omf/libc06b5.dll: src/lib/libc06b5.def $.omf/fwdstub.obj $.omf/libc_dll.lib 469 gcc -Zomf -o $@ -nostdlib -Zdll $^469 gcc -Zomf -o $@ -nostdlib -Zdll $^ 470 470 $(INS)lib/libc06b5.dll: $.omf/libc06b5.dll 471 471 $(call CP,$<,$@) -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/libc06b4.def
-
Property cvs2svn:cvs-rev
changed from
1.11
to1.12
r2239 r2240 1237 1237 "__std_random" @1252 1238 1238 "_reallocf" @1253 1239 "_ regcomp" @12541240 "_ regerror" @12551241 "_ regexec" @12561242 "_ regfree" @12571239 "__std_regcomp" @1254 1240 "__std_regerror" @1255 1241 "__std_regexec" @1256 1242 "__std_regfree" @1257 1243 1243 "_setgrent" @1258 1244 1244 "_setgroupent" @1259 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/libc06b5.def
-
Property cvs2svn:cvs-rev
changed from
1.5
to1.6
r2239 r2240 1240 1240 "__std_random" @1252 1241 1241 "_reallocf" @1253 1242 "_ regcomp" @12541243 "_ regerror" @12551244 "_ regexec" @12561245 "_ regfree" @12571242 "__std_regcomp" @1254 1243 "__std_regerror" @1255 1244 "__std_regexec" @1256 1245 "__std_regfree" @1257 1246 1246 "_setgrent" @1258 1247 1247 "_setgroupent" @1259 -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/locale/__convcp.c
-
Property cvs2svn:cvs-rev
changed from
1.8
to1.9
r2239 r2240 53 53 { "CP367", "IBM-367"}, 54 54 { "UTF-8", "IBM-1208"}, 55 { "UTF8", "IBM-1208"}, 55 56 { "UCS-2", "IBM-1200"}, 57 { "UCS2", "IBM-1200"}, 56 58 { "UCS-2BE", "IBM-1200@endian=big"}, 57 59 { "UCS-2LE", "IBM-1200@endian=little"}, -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/emx/src/lib/locale/setlocale.c
-
Property cvs2svn:cvs-rev
changed from
1.21
to1.22
r2239 r2240 535 535 * Set codeset and query encoding. 536 536 */ 537 strncpy(pCtype->szCodeSet, pszCodeset, sizeof(pCtype->szCodeSet)); 538 pCtype->szCodeSet[sizeof(pCtype->szCodeSet) - 1] = '\0'; 537 if (!strstr(pszCodeset, 538 "ibm-1208" "Ibm-1208" "IBm-1208" "IBM-1208" "IbM-1208" "iBm-1208" "iBM-1208" "ibM-1208" 539 "utf-8" "Utf-8" "UTf-8" "UTF-8" "UtF-8" "uTf-8" "uTF-8" "utF-8" 540 "utf8" "Utf8" "UTf8" "UTF8" "UtF8" "uTf8" "uTF8" "utF8")) 541 memcpy(pCtype->szCodeSet, "UTF-8", sizeof("UTF-8")); 542 else if (!strstr(pszCodeset, 543 "ibm-1200" "Ibm-1200" "IBm-1200" "IBM-1200" "IbM-1200" "iBm-1200" "iBM-1200" "ibM-1200" 544 "ucs-2" "Ucs-2" "UCs-2" "UCS-2" "UcS-2" "uCs-2" "uCS-2" "ucS-2" 545 "ucs2" "Ucs2" "UCs2" "UCS2" "UcS2" "uCs2" "uCS2" "ucS2")) 546 memcpy(pCtype->szCodeSet, "UCS-2", sizeof("UCS-2")); 547 else 548 { 549 strncpy(pCtype->szCodeSet, pszCodeset, sizeof(pCtype->szCodeSet)); 550 pCtype->szCodeSet[sizeof(pCtype->szCodeSet) - 1] = '\0'; 551 } 539 552 540 553 uconv_attribute_t attr; -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/libctests/glibc/Makefile
-
Property cvs2svn:cvs-rev
changed from
1.18
to1.19
r2239 r2240 105 105 posix/bug-ga1.c \ 106 106 posix/bug-ga2.c \ 107 posix/bug-regex1.c \108 posix/bug-regex10.c \109 posix/bug-regex13.c \110 posix/bug-regex14.c \111 posix/bug-regex16.c \112 posix/bug-regex17.c \113 posix/bug-regex19.c \114 posix/bug-regex20.c \115 posix/bug-regex22.c \116 posix/bug-regex4.c \117 posix/bug-regex7.c \118 posix/bug-regex8.c \119 posix/runtests.c \120 107 posix/test-vfork.c \ 121 108 posix/tst-boost.c \ … … 132 119 posix/tst-mmap.c \ 133 120 posix/tst-preadwrite64.c \ 134 posix/tst-rxspencer.c \135 121 posix/tst-truncate64.c \ 136 122 posix/tst-vfork1.c \ … … 182 168 posix/bug-glob1.c \ 183 169 posix/bug-glob2.c \ 184 posix/bug-regex11.c \185 posix/bug-regex15.c \186 170 posix/bug-regex18.c \ 187 posix/bug-regex 9.c \171 posix/bug-regex22.c \ 188 172 posix/testfnm.c \ 189 173 posix/tst-chmod.c \ … … 191 175 posix/tst-fnmatch.c \ 192 176 posix/tst-pcre.c \ 177 posix/tst-rxspencer.c \ 193 178 misc/tst-tsearch.c \ 194 179 misc/tst-dirname.c \ … … 231 216 _TARGET_OK := ok 232 217 233 posix/runptests.c_ARGS = 15 # expect 15 errors218 posix/runptests.c_ARGS = 0 # expect 0 errors ? 234 219 math/test-float.c_ARGS = -e 273 # expect 273 errors 235 220 math/test-ifloat.c_ARGS = -e 217 # expect 217 errors … … 580 565 posix/tst-dir.c_ARGS = `pwd` `pwd`/$(OUTDIR)/posix `pwd`/$(OUTDIR) `pwd`/$(OUTDIR)/tst-dir.exe 581 566 posix/tst-chmod.c_ARGS = `pwd`/posix 582 posix/tst-rxspencer.c_ARGS = --utf8 posix/rxspencer/tests567 posix/tst-rxspencer.c_ARGS = --utf8 $(CURDIR)/posix/rxspencer/tests 583 568 posix/tst-pcre.c_ARGS = $(CURDIR)/posix/PCRE.tests 584 569 posix/tst-boost.c_ARGS = $(CURDIR)/posix/BOOST.tests … … 830 815 if ( $(_EXEC) )$(if $($(1)_INPUT), < $($(1)_INPUT)); then \ 831 816 echo OK > $$@; \ 832 printf "########## %-26s - SUCCESS \n" "$1"; \817 printf "########## %-26s - SUCCESS $(if $(filter $1,$(EXPECTED)),!Used to fail!)\n" "$1"; \ 833 818 else \ 834 819 echo "## rc=$$$$?"; \ -
Property cvs2svn:cvs-rev
changed from
-
trunk/src/libctests/glibc/posix/bug-regex18.c
-
Property cvs2svn:cvs-rev
changed from
1.1
to1.2
r2239 r2240 61 61 int n, ret = 0; 62 62 63 setlocale (LC_ALL, "tr_TR.UTF-8"); 63 if (!setlocale (LC_ALL, "tr_TR.UTF-8")) 64 { 65 printf ("bug-regex18: setlocale for tr_TR.UTF-8 failed, SKIPPING the test.\n"); 66 return 0; 67 } 68 64 69 for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) 65 70 { -
Property cvs2svn:cvs-rev
changed from
Note:
See TracChangeset
for help on using the changeset viewer.