/[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 274 by ph10, Tue Nov 20 10:05:23 2007 UTC revision 345 by ph10, Mon Apr 28 15:10:02 2008 UTC
# Line 48  POSSIBILITY OF SUCH DAMAGE. Line 48  POSSIBILITY OF SUCH DAMAGE.
48  #include <locale.h>  #include <locale.h>
49  #include <errno.h>  #include <errno.h>
50    
51    #ifdef SUPPORT_LIBREADLINE
52    #ifdef HAVE_UNISTD_H
53    #include <unistd.h>
54    #endif
55    #include <readline/readline.h>
56    #include <readline/history.h>
57    #endif
58    
59    
60  /* A number of things vary for Windows builds. Originally, pcretest opened its  /* A number of things vary for Windows builds. Originally, pcretest opened its
61  input and output without "b"; then I was told that "b" was needed in some  input and output without "b"; then I was told that "b" was needed in some
# Line 63  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 189  optimal way of handling this, but hey, t Line 200  optimal way of handling this, but hey, t
200  Arguments:  Arguments:
201    f            the file to read    f            the file to read
202    start        where in buffer to start (this *must* be within buffer)    start        where in buffer to start (this *must* be within buffer)
203      prompt       for stdin or readline()
204    
205  Returns:       pointer to the start of new data  Returns:       pointer to the start of new data
206                 could be a copy of start, or could be moved                 could be a copy of start, or could be moved
# Line 196  Returns: pointer to the start of n Line 208  Returns: pointer to the start of n
208  */  */
209    
210  static uschar *  static uschar *
211  extend_inputline(FILE *f, uschar *start)  extend_inputline(FILE *f, uschar *start, const char *prompt)
212  {  {
213  uschar *here = start;  uschar *here = start;
214    
# Line 207  for (;;) Line 219  for (;;)
219    if (rlen > 1000)    if (rlen > 1000)
220      {      {
221      int dlen;      int dlen;
222      if (fgets((char *)here, rlen,  f) == NULL)  
223        return (here == start)? NULL : start;      /* If libreadline support is required, use readline() to read a line if the
224        input is a terminal. Note that readline() removes the trailing newline, so
225        we must put it back again, to be compatible with fgets(). */
226    
227    #ifdef SUPPORT_LIBREADLINE
228        if (isatty(fileno(f)))
229          {
230          size_t len;
231          char *s = readline(prompt);
232          if (s == NULL) return (here == start)? NULL : start;
233          len = strlen(s);
234          if (len > 0) add_history(s);
235          if (len > rlen - 1) len = rlen - 1;
236          memcpy(here, s, len);
237          here[len] = '\n';
238          here[len+1] = 0;
239          free(s);
240          }
241        else
242    #endif
243    
244        /* Read the next line by normal means, prompting if the file is stdin. */
245    
246          {
247          if (f == stdin) printf(prompt);
248          if (fgets((char *)here, rlen,  f) == NULL)
249            return (here == start)? NULL : start;
250          }
251    
252      dlen = (int)strlen((char *)here);      dlen = (int)strlen((char *)here);
253      if (dlen > 0 && here[dlen - 1] == '\n') return start;      if (dlen > 0 && here[dlen - 1] == '\n') return start;
254      here += dlen;      here += dlen;
# Line 728  return 0; Line 768  return 0;
768  static void  static void
769  usage(void)  usage(void)
770  {  {
771  printf("Usage:     pcretest [options] [<input> [<output>]]\n");  printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
772    printf("Input and output default to stdin and stdout.\n");
773    #ifdef SUPPORT_LIBREADLINE
774    printf("If input is a terminal, readline() is used to read from it.\n");
775    #else
776    printf("This version of pcretest is not linked with readline().\n");
777    #endif
778    printf("\nOptions:\n");
779  printf("  -b       show compiled code (bytecode)\n");  printf("  -b       show compiled code (bytecode)\n");
780  printf("  -C       show PCRE compile-time options and exit\n");  printf("  -C       show PCRE compile-time options and exit\n");
781  printf("  -d       debug: show compiled code and information (-b and -i)\n");  printf("  -d       debug: show compiled code and information (-b and -i)\n");
# Line 997  while (!done) Line 1044  while (!done)
1044    use_utf8 = 0;    use_utf8 = 0;
1045    debug_lengths = 1;    debug_lengths = 1;
1046    
1047    if (infile == stdin) printf("  re> ");    if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
   if (extend_inputline(infile, buffer) == NULL) break;  
1048    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);    if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
1049    fflush(outfile);    fflush(outfile);
1050    
# Line 1114  while (!done) Line 1160  while (!done)
1160        pp++;        pp++;
1161        }        }
1162      if (*pp != 0) break;      if (*pp != 0) break;
1163      if (infile == stdin) printf("    > ");      if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
     if ((pp = extend_inputline(infile, pp)) == NULL)  
1164        {        {
1165        fprintf(outfile, "** Unexpected EOF\n");        fprintf(outfile, "** Unexpected EOF\n");
1166        done = 1;        done = 1;
# Line 1207  while (!done) Line 1252  while (!done)
1252    
1253        case '<':        case '<':
1254          {          {
1255          int x = check_newline(pp, outfile);          if (strncmp((char *)pp, "JS>", 3) == 0)
1256          if (x == 0) goto SKIP_DATA;            {
1257          options |= x;            options |= PCRE_JAVASCRIPT_COMPAT;
1258          while (*pp++ != '>');            pp += 3;
1259              }
1260            else
1261              {
1262              int x = check_newline(pp, outfile);
1263              if (x == 0) goto SKIP_DATA;
1264              options |= x;
1265              while (*pp++ != '>');
1266              }
1267          }          }
1268        break;        break;
1269    
# Line 1289  while (!done) Line 1342  while (!done)
1342          {          {
1343          for (;;)          for (;;)
1344            {            {
1345            if (extend_inputline(infile, buffer) == NULL)            if (extend_inputline(infile, buffer, NULL) == NULL)
1346              {              {
1347              done = 1;              done = 1;
1348              goto CONTINUE;              goto CONTINUE;
# Line 1684  while (!done) Line 1737  while (!done)
1737      len = 0;      len = 0;
1738      for (;;)      for (;;)
1739        {        {
1740        if (infile == stdin) printf("data> ");        if (extend_inputline(infile, buffer + len, "data> ") == NULL)
       if (extend_inputline(infile, buffer + len) == NULL)  
1741          {          {
1742          if (len > 0) break;          if (len > 0) break;
1743          done = 1;          done = 1;
Legend:
Removed from v.274  
changed lines
  Added in v.345
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12