(file) Return to DirWindows.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/DirWindows.cpp between version 1.4 and 1.17

version 1.4, 2001/06/16 17:30:37 version 1.17, 2006/01/30 16:16:48
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 The Open group, BMC Software, Tivoli Systems, IBM  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 22 
Line 31 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // Modified By:  // Modified By: Amit K Arora, IBM (amita@in.ibm.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "Destroyer.h"  
 #include "Dir.h" #include "Dir.h"
 #include "Exception.h"  #include "InternalException.h"
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 #include <io.h>  
 #include <direct.h> #include <direct.h>
  
 struct DirRep  
 {  
     long file;  
     struct _finddata_t findData;  
 };  
  
 Dir::Dir(const String& path) Dir::Dir(const String& path)
 { {
     ArrayDestroyer<char> p(strcat(path.allocateCString(2), "/*"));      _dirRep.file = _findfirst((path+"/*").getCString(), &_dirRep.findData);
     _rep = new DirRep;  
     _rep->file = _findfirst(p.getPointer(), &_rep->findData);  
  
     if (_rep->file == -1)      if (_dirRep.file == -1)
     {     {
         _more = false;         _more = false;
         throw CannotOpenDirectory(path);         throw CannotOpenDirectory(path);
Line 58 
Line 58 
  
 Dir::~Dir() Dir::~Dir()
 { {
     if (_rep->file != -1)      if (_dirRep.file != -1)
         _findclose(_rep->file);          _findclose(_dirRep.file);
  
     delete _rep;  
 } }
  
 const char* Dir::getName() const const char* Dir::getName() const
 { {
     return _rep->findData.name;      return _dirRep.findData.name;
 } }
  
 void Dir::next() void Dir::next()
Line 74 
Line 73 
     if (!_more)     if (!_more)
         return;         return;
  
     _more = _findnext(_rep->file, &_rep->findData) == 0;      _more = _findnext(_dirRep.file, &_dirRep.findData) == 0;
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END


Legend:
Removed from v.1.4  
changed lines
  Added in v.1.17

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2