Perl 5.12.2 from CPAN

1 files changed, 63 insertions, 16 deletions

diff --git a/gnu/usr.bin/perl/generate_uudmap.c b/gnu/usr.bin/perl/generate_uudmap.c
index 28cfd274eed..2c3e24a267b 100644
--- a/gnu/usr.bin/perl/generate_uudmap.c
+++ b/gnu/usr.bin/perl/generate_uudmap.c
@@ -1,5 +1,47 @@
+/* Originally this program just generated uudmap.h
+   However, when we later wanted to generate bitcount.h, it was easier to
+   refactor it and keep the same name, than either alternative - rename it,
+   or duplicate all of the Makefile logic for a second program.  */
+
 #include <stdio.h>
 #include <stdlib.h>
+/* If it turns out that we need to make this conditional on config.sh derived
+   values, it might be easier just to rip out the use of strerrer().  */
+#include <string.h>
+/* If a platform doesn't support errno.h, it's probably so strange that
+   "hello world" won't port easily to it.  */
+#include <errno.h>
+
+void output_block_to_file(const char *progname, const char *filename,
+			  const char *block, size_t count) {
+  FILE *const out = fopen(filename, "w");
+
+  if (!out) {
+    fprintf(stderr, "%s: Could not open '%s': %s\n", progname, filename,
+	    strerror(errno));
+    exit(1);
+  }
+
+  fputs("{\n    ", out);
+  while (count--) {
+    fprintf(out, "%d", *block);
+    block++;
+    if (count) {
+      fputs(", ", out);
+      if (!(count & 15)) {
+	fputs("\n    ", out);
+      }
+    }
+  }
+  fputs("\n}\n", out);
+
+  if (fclose(out)) {
+    fprintf(stderr, "%s: Could not close '%s': %s\n", progname, filename,
+	    strerror(errno));
+    exit(1);
+  }
+}
+
 
 static const char PL_uuemap[]
 = "`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
@@ -8,10 +50,16 @@ typedef unsigned char U8;
 
 /* This will ensure it is all zeros.  */
 static char PL_uudmap[256];
+static char PL_bitcount[256];
 
-int main() {
+int main(int argc, char **argv) {
   size_t i;
-  char *p;
+  int bits;
+
+  if (argc < 3 || argv[1][0] == '\0' || argv[2][0] == '\0') {
+    fprintf(stderr, "Usage: %s uudemap.h bitcount.h\n", argv[0]);
+    return 1;
+  }
 
   for (i = 0; i < sizeof(PL_uuemap) - 1; ++i)
     PL_uudmap[(U8)PL_uuemap[i]] = (char)i;
@@ -21,21 +69,20 @@ int main() {
    */
   PL_uudmap[(U8)' '] = 0;
 
-  i = sizeof(PL_uudmap);
-  p = PL_uudmap;
-
-  fputs("{\n    ", stdout);
-  while (i--) {
-    printf("%d", *p);
-    p++;
-    if (i) {
-      fputs(", ", stdout);
-      if (!(i & 15)) {
-	fputs("\n    ", stdout);
-      }
-    }
+  output_block_to_file(argv[0], argv[1], PL_uudmap, sizeof(PL_uudmap));
+
+  for (bits = 1; bits < 256; bits++) {
+    if (bits & 1)	PL_bitcount[bits]++;
+    if (bits & 2)	PL_bitcount[bits]++;
+    if (bits & 4)	PL_bitcount[bits]++;
+    if (bits & 8)	PL_bitcount[bits]++;
+    if (bits & 16)	PL_bitcount[bits]++;
+    if (bits & 32)	PL_bitcount[bits]++;
+    if (bits & 64)	PL_bitcount[bits]++;
+    if (bits & 128)	PL_bitcount[bits]++;
   }
-  puts("\n}");
+
+  output_block_to_file(argv[0], argv[2], PL_bitcount, sizeof(PL_bitcount));
 
   return 0;
 }