Changeset 76

Timestamp:

10/29/06 15:32:02 (3 years ago)

Author:

bradfitz

Message:

merging mart's win32 changes from trunk

Location:

branches/refactoring

Files:

• brackup (modified) (4 diffs)
• brackup-restore (modified) (3 diffs)
• lib/Brackup/Config.pm (modified) (1 diff)
• lib/Brackup/File.pm (modified) (1 diff)
• lib/Brackup/Root.pm (modified) (2 diffs)
• lib/Brackup/Target/Filesystem.pm (modified) (4 diffs)

branches/refactoring/brackup

@@ -67 +67 @@
 my $opt_du_stats;
 
+my $config_file = Brackup::Config->default_config_file_name;
+
 usage() unless
     GetOptions(
@@ -76 +78 @@
                'dry-run'   => \$opt_dryrun,
                'du-stats' => \$opt_du_stats,
+               'config=s'  => \$config_file,
                );
 
@@ -84 +87 @@
 }
 
-my $config = eval { Brackup::Config->load("$ENV{HOME}/.brackup.conf") } or
+my $config = eval { Brackup::Config->load($config_file) } or
     usage($@);
 
@@ -116 +119 @@
 my @now = localtime();
 $backup_file ||= $root->name . "-" . sprintf("%04d%02d%02d", $now[5]+1900, $now[4]+1, $now[3]) . ".brackup";
-$backup_file =~ s!^~/!$ENV{HOME}/!;
+$backup_file =~ s!^~/!$ENV{HOME}/! if $ENV{HOME};
 $backup_file = "$cwd/$backup_file" unless $backup_file =~ m!^/!;
 

branches/refactoring/brackup-restore

@@ -70 +70 @@
 my ($opt_verbose, $meta_file, $opt_help, $restore_dir, $opt_all, $prefix);
 
+my $config_file = Brackup::Config->default_config_file_name;
+
 usage() unless
     GetOptions(
@@ -78 +80 @@
                'all'       => \$opt_all,
                'just=s'    => \$prefix,
+               'config=s'  => \$config_file,
                );
 
@@ -86 +89 @@
 }
 
-my $config = eval { Brackup::Config->load("$ENV{HOME}/.brackup.conf") } or
+my $config = eval { Brackup::Config->load($config_file) } or
     usage($@);
 

branches/refactoring/lib/Brackup/Config.pm

@@ -53 +53 @@
 
     return $self;
+}
+
+sub default_config_file_name {
+    my ($class) = @_;
+    
+    if ($ENV{HOME}) {
+        # Default for UNIX folk
+        return "$ENV{HOME}/.brackup.conf";
+    }
+    elsif ($ENV{APPDATA}) {
+        # For Windows users
+        return "$ENV{APPDATA}/brackup.conf";
+    }
+    else {
+        # Fall back on the current directory
+        return "brackup.conf";
+    }
+
 }
 

branches/refactoring/lib/Brackup/File.pm

@@ -53 +53 @@
 sub is_link {
     my $self = shift;
-    return S_ISLNK($self->stat->mode);
+    my $result = eval { S_ISLNK($self->stat->mode) };
+    $result = -l $self->fullpath unless defined($result);
+    return $result;
 }
 

branches/refactoring/lib/Brackup/Root.pm

@@ -6 +6 @@
 use Brackup::Dict::SQLite;
 use File::Temp qw(tempfile);
+use IPC::Open2;
+use Symbol;
 
 sub new {
@@ -185 +187 @@
         unless -s $tmpfn == length $$data;
 
-    my ($etmpfh, $etmpfn) = tempfile();
-
-    system($self->gpg_path, $self->gpg_args,
-           "--recipient", $gpg_rcpt,
-           "--trust-model=always",
-           "--batch",
-           "--encrypt",
-           "--output=$etmpfn",
-           "--yes", $tmpfn)
-        and die "Failed to run gpg: $!\n";
-    open (my $enc_fh, $etmpfn) or die "Failed to open $etmpfn: $!\n";
-    return do { local $/; <$enc_fh>; };
+    my $cout = Symbol::gensym();
+    my $cin = Symbol::gensym();
+
+    my $pid = IPC::Open2::open2($cout, $cin,
+        $self->gpg_path, $self->gpg_args,
+        "--recipient", $gpg_rcpt,
+        "--trust-model=always",
+        "--batch",
+        "--encrypt",
+        "--output=-",  # Send output to stdout
+        "--yes",
+        $tmpfn
+    );
+
+    binmode $cout;
+    
+    my $ret = do { local $/; <$cout>; };
+
+    waitpid($pid, 0);
+    die "GPG failed: $!" if $? != 0; # If gpg return status is non-zero
+
+    return $ret;
 }
 

branches/refactoring/lib/Brackup/Target/Filesystem.pm

@@ -9 +9 @@
     my $self = $class->SUPER::new($confsec);
     $self->{path} = $confsec->path_value("path");
+    $self->{nocolons} = $confsec->value("no_filename_colons");
+    $self->{nocolons} = ($^O eq 'MSWin32') unless defined $self->{nocolons}; # LAME: Make it work on Windows
     return $self;
 }
@@ -35 +37 @@
     my $fulldig = $dig;
     $dig =~ s/^\w+://; # remove the "hashtype:" from beginning
+    $fulldig =~ s/:/./g if $self->{nocolons}; # Convert colons to dots if we've been asked to
     while (length $dig && @parts < 4) {
         $dig =~ s/^(.{1,4})//;
@@ -80 +83 @@
     }
     open (my $fh, ">$path") or die "Failed to open $path for writing: $!\n";
+    binmode($fh);
     my $chunkref = $chunk->chunkref;
     print $fh $$chunkref;
@@ -86 +90 @@
     my $actual_size   = -s $path;
     my $expected_size = length $$chunkref;
+    unless (defined($actual_size)) {
+        die "Chunk output file $path does not exist. Do you need to set no_filename_colons=1?";
+    }
     unless ($actual_size == $expected_size) {
-        die "Chunk was written to disk wrong:  size is $actual_size, expecting $expected_size\n";
+        die "Chunk $path was written to disk wrong:  size is $actual_size, expecting $expected_size\n";
     }