~ubuntu-branches/ubuntu/vivid/unrar-nonfree/vivid

« back to all changes in this revision

Viewing changes to list.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Meredith
  • Date: 2015-02-03 12:58:01 UTC
  • mfrom: (1.1.18) (5.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20150203125801-od6ev8cqy1er51vz
Tags: 1:5.2.5-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
  wchar ArcName[NM];
19
19
  while (Cmd->GetArcName(ArcName,ASIZE(ArcName)))
20
20
  {
 
21
    if (Cmd->ManualPassword)
 
22
      Cmd->Password.Clean(); // Clean user entered password before processing next archive.
 
23
 
21
24
    Archive Arc(Cmd);
22
25
#ifdef _WIN_ALL
23
26
    Arc.RemoveSequentialFlag();
162
165
    }
163
166
  }
164
167
 
 
168
  // Clean user entered password. Not really required, just for extra safety.
 
169
  if (Cmd->ManualPassword)
 
170
    Cmd->Password.Clean();
 
171
 
165
172
  if (ArcCount>1 && !Bare && !Technical)
166
173
  {
167
174
    wchar UnpSizeText[20],PackSizeText[20];
270
277
        }
271
278
      mprintf(L"\n%12ls: %ls",St(MListType),Type);
272
279
      if (hd.RedirType!=FSREDIR_NONE)
273
 
        mprintf(L"\n%12ls: %ls",St(MListTarget),hd.RedirName);
 
280
        if (Format==RARFMT15)
 
281
        {
 
282
          char LinkTargetA[NM];
 
283
          if (Arc.FileHead.Encrypted)
 
284
          {
 
285
            // Link data are encrypted. We would need to ask for password
 
286
            // and initialize decryption routine to display the link target.
 
287
            strncpyz(LinkTargetA,"*<-?->",ASIZE(LinkTargetA));
 
288
          }
 
289
          else
 
290
          {
 
291
            int DataSize=(int)Min(hd.PackSize,ASIZE(LinkTargetA)-1);
 
292
            Arc.Read(LinkTargetA,DataSize);
 
293
            LinkTargetA[DataSize > 0 ? DataSize : 0] = 0;
 
294
          }
 
295
          wchar LinkTarget[NM];
 
296
          CharToWide(LinkTargetA,LinkTarget,ASIZE(LinkTarget));
 
297
          mprintf(L"\n%12ls: %ls",St(MListTarget),LinkTarget);
 
298
        }
 
299
        else
 
300
          mprintf(L"\n%12ls: %ls",St(MListTarget),hd.RedirName);
274
301
    }
275
302
    if (!hd.Dir)
276
303
    {