/[pcre]/code/trunk/pcretest.c
ViewVC logotype

Diff of /code/trunk/pcretest.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 287 by ph10, Tue Dec 18 20:11:28 2007 UTC revision 358 by ph10, Wed Jul 9 11:03:07 2008 UTC
# Line 49  POSSIBILITY OF SUCH DAMAGE. Line 49  POSSIBILITY OF SUCH DAMAGE.
49  #include <errno.h>  #include <errno.h>
50    
51  #ifdef SUPPORT_LIBREADLINE  #ifdef SUPPORT_LIBREADLINE
52    #ifdef HAVE_UNISTD_H
53  #include <unistd.h>  #include <unistd.h>
54    #endif
55  #include <readline/readline.h>  #include <readline/readline.h>
56  #include <readline/history.h>  #include <readline/history.h>
57  #endif  #endif
# Line 69  input mode under Windows. */ Line 71  input mode under Windows. */
71  #define INPUT_MODE   "r"  #define INPUT_MODE   "r"
72  #define OUTPUT_MODE  "wb"  #define OUTPUT_MODE  "wb"
73    
74    #define isatty _isatty         /* This is what Windows calls them, I'm told */
75    #define fileno _fileno
76    
77  #else  #else
78  #include <sys/time.h>          /* These two includes are needed */  #include <sys/time.h>          /* These two includes are needed */
79  #include <sys/resource.h>      /* for setrlimit(). */  #include <sys/resource.h>      /* for setrlimit(). */
# Line 89  appropriately for an application, not fo Line 94  appropriately for an application, not fo
94  #include "pcre.h"  #include "pcre.h"
95  #include "pcre_internal.h"  #include "pcre_internal.h"
96    
97  /* We need access to the data tables that PCRE uses. So as not to have to keep  /* We need access to some of the data tables that PCRE uses. So as not to have
98  two copies, we include the source file here, changing the names of the external  to keep two copies, we include the source file here, changing the names of the
99  symbols to prevent clashes. */  external symbols to prevent clashes. */
100    
101    #define _pcre_ucp_gentype      ucp_gentype
102  #define _pcre_utf8_table1      utf8_table1  #define _pcre_utf8_table1      utf8_table1
103  #define _pcre_utf8_table1_size utf8_table1_size  #define _pcre_utf8_table1_size utf8_table1_size
104  #define _pcre_utf8_table2      utf8_table2  #define _pcre_utf8_table2      utf8_table2
# Line 214  for (;;) Line 220  for (;;)
220    if (rlen > 1000)    if (rlen > 1000)
221      {      {
222      int dlen;      int dlen;
223    
224      /* If libreadline support is required, use readline() to read a line if the      /* If libreadline support is required, use readline() to read a line if the
225      input is a terminal. Note that readline() removes the trailing newline, so      input is a terminal. Note that readline() removes the trailing newline, so
226      we must put it back again, to be compatible with fgets(). */      we must put it back again, to be compatible with fgets(). */
227    
228  #ifdef SUPPORT_LIBREADLINE  #ifdef SUPPORT_LIBREADLINE
229      if (isatty(fileno(f)))      if (isatty(fileno(f)))
230        {        {
231        size_t len;        size_t len;
232        char *s = readline(prompt);        char *s = readline(prompt);
233        if (s == NULL) return (here == start)? NULL : start;        if (s == NULL) return (here == start)? NULL : start;
234        len = strlen(s);        len = strlen(s);
235        if (len > 0) add_history(s);        if (len > 0) add_history(s);
236        if (len > rlen - 1) len = rlen - 1;        if (len > rlen - 1) len = rlen - 1;
237        memcpy(here, s, len);        memcpy(here, s, len);
238        here[len] = '\n';        here[len] = '\n';
239        here[len+1] = 0;        here[len+1] = 0;
240        free(s);        free(s);
241        }        }
242      else      else
243  #endif  #endif
244    
245      /* Read the next line by normal means, prompting if the file is stdin. */      /* Read the next line by normal means, prompting if the file is stdin. */
246    
247        {        {
248        if (f == stdin) printf(prompt);        if (f == stdin) printf(prompt);
249        if (fgets((char *)here, rlen,  f) == NULL)        if (fgets((char *)here, rlen,  f) == NULL)
250          return (here == start)? NULL : start;          return (here == start)? NULL : start;
251        }        }
252    
253      dlen = (int)strlen((char *)here);      dlen = (int)strlen((char *)here);
254      if (dlen > 0 && here[dlen - 1] == '\n') return start;      if (dlen > 0 && here[dlen - 1] == '\n') return start;
255      here += dlen;      here += dlen;
# Line 1247  while (!done) Line 1253  while (!done)
1253    
1254        case '<':        case '<':
1255          {          {
1256          int x = check_newline(pp, outfile);          if (strncmp((char *)pp, "JS>", 3) == 0)
1257          if (x == 0) goto SKIP_DATA;            {
1258          options |= x;            options |= PCRE_JAVASCRIPT_COMPAT;
1259          while (*pp++ != '>');            pp += 3;
1260              }
1261            else
1262              {
1263              int x = check_newline(pp, outfile);
1264              if (x == 0) goto SKIP_DATA;
1265              options |= x;
1266              while (*pp++ != '>');
1267              }
1268          }          }
1269        break;        break;
1270    
# Line 1792  while (!done) Line 1806  while (!done)
1806              {              {
1807              unsigned char buff8[8];              unsigned char buff8[8];
1808              int ii, utn;              int ii, utn;
1809              utn = ord2utf8(c, buff8);              if (use_utf8)
1810              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];                {
1811              c = buff8[ii];   /* Last byte */                utn = ord2utf8(c, buff8);
1812                  for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
1813                  c = buff8[ii];   /* Last byte */
1814                  }
1815                else
1816                 {
1817                 if (c > 255)
1818                   fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
1819                     "UTF-8 mode is not enabled.\n"
1820                     "** Truncation will probably give the wrong result.\n", c);
1821                 }
1822              p = pt + 1;              p = pt + 1;
1823              break;              break;
1824              }              }

Legend:
Removed from v.287  
changed lines
  Added in v.358

  ViewVC Help
Powered by ViewVC 1.1.5