[Pcre-svn] [592] code/trunk: Add strerror() to pcre2test for…

Revision: 592

          http://www.exim.org/viewvc/pcre2?view=rev&revision=592
Author:   ph10
Date:     2016-11-03 18:18:53 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
Add strerror() to pcre2test for failed file opening.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/src/pcre2test.c

Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2016-11-03 17:35:59 UTC (rev 591)
+++ code/trunk/ChangeLog    2016-11-03 18:18:53 UTC (rev 592)
@@ -143,7 +143,9 @@
 19. Removed all instances of "register" declarations, as they are considered 
 obsolete these days and in any case had become very haphazard.

+20. Add strerror() to pcre2test for failed file opening.

+
Version 10.22 29-July-2016
--------------------------

Modified: code/trunk/src/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c    2016-11-03 17:35:59 UTC (rev 591)
+++ code/trunk/src/pcre2test.c    2016-11-03 18:18:53 UTC (rev 592)
@@ -2368,7 +2368,28 @@
 };

+#ifndef HAVE_STRERROR
+/*************************************************
+*     Provide strerror() for non-ANSI libraries  *
+*************************************************/

+/* Some old-fashioned systems (e.g. SunOS4) didn't have strerror() in their
+libraries. They may no longer be around, but just in case, we can try to
+provide the same facility by this simple alternative function. */
+
+extern int   sys_nerr;
+extern char *sys_errlist[];
+
+char *
+strerror(int n)
+{
+if (n < 0 || n >= sys_nerr) return "unknown error number";
+return sys_errlist[n];
+}
+#endif /* HAVE_STRERROR */
+
+
+
 /*************************************************
 *            Local memory functions              *
 *************************************************/
@@ -4231,7 +4252,7 @@
 *fptr = fopen((const char *)filename, mode);
 if (*fptr == NULL)
   {
-  fprintf(outfile, "** Failed to open '%s'\n", filename);
+  fprintf(outfile, "** Failed to open '%s': %s\n", filename, strerror(errno));
   return PR_ABEND;
   }

@@ -6088,7 +6109,7 @@
   if ((dat_datctl.options & PCRE2_NOTBOL) != 0) eflags |= REG_NOTBOL;
   if ((dat_datctl.options & PCRE2_NOTEOL) != 0) eflags |= REG_NOTEOL;
   if ((dat_datctl.options & PCRE2_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
-  
+
   rc = regexec(&preg, (const char *)pp, dat_datctl.oveccount, pmatch, eflags);
   if (rc != 0)
     {
@@ -7641,7 +7662,7 @@
   infile = fopen(argv[op], INPUT_MODE);
   if (infile == NULL)
     {
-    printf("** Failed to open '%s'\n", argv[op]);
+    printf("** Failed to open '%s': %s\n", argv[op], strerror(errno));
     yield = 1;
     goto EXIT;
     }
@@ -7656,7 +7677,7 @@
   outfile = fopen(argv[op+1], OUTPUT_MODE);
   if (outfile == NULL)
     {
-    printf("** Failed to open '%s'\n", argv[op+1]);
+    printf("** Failed to open '%s': %s\n", argv[op+1], strerror(errno));
     yield = 1;
     goto EXIT;
     }