Merge branch 'master' into otsv

lib/Tag.pm

@@ -16,21 +16,22 @@
 # <http://www.gnu.org/licenses/>.
 
 package Tag;
+use MIME::Base64;
 
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(random_tag);
 use strict;
 
 sub random_tag($) {
-    my ($bytes) = @_;
-    my $tag;
+    my ($chars) = @_;
+    my $bytes = $chars * 3 / 4;
+    my $random;
 
     open my $fh, '<', '/dev/urandom'
 	or die "/dev/urandom: $!\n";
-    (read $fh, $tag, $bytes) == $bytes
+    (read $fh, $random, $bytes) == $bytes
 	or die "/dev/urandom: $!\n";
-    $tag =~ s/(.)/sprintf("%02x",ord($1))/egs;
 
-    return $tag;
+    return encode_base64($random);
 }