← Back to branch summary

~ubuntu-branches/ubuntu/utopic/p7zip/utopic-updates

« back to all changes in this revision

Viewing changes to 7zip/UI/Common/Extract.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mohammed Adnène Trojette
  • Date: 2006-02-10 20:54:59 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060210205459-qbpkkabtqdd97zo7
Tags: 4.33.dfsg-1
http://bugs.debian.org/353235
* New upstream release
* Move p7zip from /usr/share to /usr/bin
   - modify debian/install
   - write debian/p7zip.1
* debian/README.Debian: document directory exclusion
* patches/01_add_help_switch: 7z --help works now (Closes: #353235)

Show diffs side-by-side

added added

removed removed

Lines of Context:
7zip/UI/Common/Extract.cpp
111
111
        archivePathsFull.Delete(index);
112
112
      }
113
113
    }
 
114
 
 
115
    #ifndef _NO_CRYPTO
114
116
    UString password;
115
117
    RINOK(openCallback->GetPasswordIfAny(password));
116
118
    if (!password.IsEmpty())
117
119
    {
118
120
      RINOK(extractCallback->SetPassword(password));
119
121
    }
 
122
    #endif
120
123
 
121
124
    options.DefaultItemName = archiveLink.GetDefaultItemName();
122
125
    RINOK(DecompressArchive(
124
127
        wildcardCensor, options, extractCallback));
125
128
  }
126
129
  return S_OK;
127
 
}
 
 
b'\\ No newline at end of file'
 
130
}