Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / charset / sbcsgen.pl

diff --git a/charset/sbcsgen.pl b/charset/sbcsgen.pl
index 355bf3b..56eb61e 100644 (file)
--- a/charset/sbcsgen.pl
+++ b/charset/sbcsgen.pl
@@ -86,9 +86,10 @@ sub outcharset($$$) {
        }
     }
     print "\n    },\n    {\n";
-    @sorted = sort { $a->[1] == $b->[1] ?
-                    $b->[2] <=> $a->[2] :
-                    $a->[1] <=> $b->[1] } @sorted;
+    @sorted = sort { ($a->[1] == $b->[1] ?
+                     $b->[2] <=> $a->[2] :
+                     $a->[1] <=> $b->[1]) ||
+                     $a->[0] <=> $b->[0] } @sorted;
     $prefix = "    ";
     $uval = -1;
     for ($i = $j = 0; $i < scalar @sorted; $i++) {
@@ -102,7 +103,7 @@ sub outcharset($$$) {
        }
        $j++;
     }
-    printf "\n    },\n    %d\n", scalar @sorted;
+    printf "\n    },\n    %d\n", $j;
     print "};\n";
     print "const charset_spec charset_$name = {\n" .
           "    $name, read_sbcs, write_sbcs, &data_$name\n};\n\n";