walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Minor tidies to pcre2grep.

This commit is contained in:
Philip.Hazel 2017-01-16 15:06:57 +00:00
parent 662a765bdf
commit 31c62034fe
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -329,6 +329,14 @@ JIT.
AC_USE_SYSTEM_EXTENSIONS macro and to test for functions used by the JIT AC_USE_SYSTEM_EXTENSIONS macro and to test for functions used by the JIT
modules. modules.
52. Minor fixed to pcre2grep from Jason Hood:
* fixes some spacing;
* Windows doesn't usually use single quotes, so I've added a define
to use appropriate quotes [in an example];
* LC_ALL was displayed as "LCC_ALL";
* numbers 11, 12 & 13 should end in "th".
* use double quotes in usage message
Version 10.22 29-July-2016 Version 10.22 29-July-2016
-------------------------- --------------------------

14
src/pcre2grep.c
View File

@ -141,12 +141,15 @@ apply to fprintf(). */
/* Under Windows, we have to set stdout to be binary, so that it does not /* Under Windows, we have to set stdout to be binary, so that it does not
convert \r\n at the ends of output lines to \r\r\n. However, that means that convert \r\n at the ends of output lines to \r\r\n. However, that means that
any messages written to stdout must have \r\n as their line terminator. This is any messages written to stdout must have \r\n as their line terminator. This is
handled by using STDOUT_NL as the newline string. */ handled by using STDOUT_NL as the newline string. We also use a normal double
quote for the example, as single quotes aren't usually available. */
#ifdef WIN32 #ifdef WIN32
#define STDOUT_NL "\r\n" #define STDOUT_NL "\r\n"
#define QUOT "\""
#else #else
#define STDOUT_NL "\n" #define STDOUT_NL "\n"
#define QUOT "'"
#endif #endif
@ -1038,7 +1041,7 @@ for (op = optionlist; op->one_char != 0; op++)
if (op->one_char > 0) fprintf(stderr, "%c", op->one_char); if (op->one_char > 0) fprintf(stderr, "%c", op->one_char);
} }
fprintf(stderr, "] [long options] [pattern] [files]\n"); fprintf(stderr, "] [long options] [pattern] [files]\n");
fprintf(stderr, "Type `pcre2grep --help' for more information and the long " fprintf(stderr, "Type \"pcre2grep --help\" for more information and the long "
"options.\n"); "options.\n");
return rc; return rc;
} }
@ -1080,7 +1083,7 @@ printf("Other files and the standard input are read as plain files." STDOUT_NL S
printf("All files are read as plain files, without any interpretation." STDOUT_NL STDOUT_NL); printf("All files are read as plain files, without any interpretation." STDOUT_NL STDOUT_NL);
#endif #endif
printf("Example: pcre2grep -i 'hello.*world' menu.h main.c" STDOUT_NL STDOUT_NL); printf("Example: pcre2grep -i " QUOT "hello.*world" QUOT " menu.h main.c" STDOUT_NL STDOUT_NL);
printf("Options:" STDOUT_NL); printf("Options:" STDOUT_NL);
for (op = optionlist; op->one_char != 0; op++) for (op = optionlist; op->one_char != 0; op++)
@ -2516,7 +2519,6 @@ while (ptr < endptr)
lastmatchnumber > 0 && lastmatchnumber > 0 &&
lastmatchrestart < main_buffer + bufthird) lastmatchrestart < main_buffer + bufthird)
{ {
do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname); do_after_lines(lastmatchnumber, lastmatchrestart, endptr, printname);
lastmatchnumber = 0; /* Indicates no after lines pending */ lastmatchnumber = 0; /* Indicates no after lines pending */
} }
@ -2945,6 +2947,8 @@ static char buffer[14];
char *p = buffer; char *p = buffer;
sprintf(p, "%d", n); sprintf(p, "%d", n);
while (*p != 0) p++; while (*p != 0) p++;
n %= 100;
if (n >= 11 && n <= 13) n = 0;
switch (n%10) switch (n%10)
{ {
case 1: strcpy(p, "st"); break; case 1: strcpy(p, "st"); break;
@ -3525,7 +3529,7 @@ LC_ALL environment variable is set, and if so, use it. */
if (locale == NULL) if (locale == NULL)
{ {
locale = getenv("LC_ALL"); locale = getenv("LC_ALL");
locale_from = "LCC_ALL"; locale_from = "LC_ALL";
} }
if (locale == NULL) if (locale == NULL)