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

« back to all changes in this revision

Viewing changes to scantree.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:
64
64
    return false;
65
65
  CurMask[ASIZE(CurMask)-1]=0;
66
66
#ifdef _WIN_ALL
67
 
  UnixSlashToDos(CurMask);
 
67
  UnixSlashToDos(CurMask,CurMask,ASIZE(CurMask));
68
68
#endif
69
69
 
70
70
  // We wish to scan entire disk if mask like c:\ is specified
253
253
 
254
254
    if (wcslen(CurMask)+wcslen(Mask)+1>=NM || Depth>=MAXSCANDEPTH-1)
255
255
    {
256
 
#ifndef SILENT
257
 
      Log(NULL,L"\n%ls%c%ls",CurMask,CPATHDIVIDER,Mask);
258
 
      Log(NULL,St(MPathTooLong));
259
 
#endif
 
256
      uiMsg(UIERROR_PATHTOOLONG,CurMask,SPATHDIVIDER,Mask);
260
257
      return SCAN_ERROR;
261
258
    }
262
259
 
325
322
  if (Error && Cmd!=NULL && Cmd->ExclCheck(CurMask,false,true,true))
326
323
    Error=false;
327
324
 
328
 
#ifndef SILENT
329
325
  if (Error)
330
326
  {
331
327
    wchar FullName[NM];
332
328
    // This conversion works for wildcard masks too.
333
329
    ConvertNameToFull(CurMask,FullName,ASIZE(FullName));
334
 
    Log(NULL,St(MScanError),FullName);
 
330
    uiMsg(UIERROR_DIRSCAN,FullName);
335
331
    ErrHandler.SysErrMsg();
336
332
  }
337
 
#endif
338
333
}