Use solver to check for problems and produce a list of package transactions

[cygwin-apps/setup.git] / io_stream_cygfile.h

diff --git a/io_stream_cygfile.h b/io_stream_cygfile.h
index d9c3df585b98ab3e69741dffbda85b6589384803..1ece2428e27dfc053617c2a675566b280f37f9e6 100644 (file)
--- a/io_stream_cygfile.h
+++ b/io_stream_cygfile.h
@@ -13,25 +13,25 @@
  *
  */
 
-#ifndef _IO_STREAM_CYGFILE_H_
-#define _IO_STREAM_CYGFILE_H_
+#ifndef SETUP_IO_STREAM_CYGFILE_H
+#define SETUP_IO_STREAM_CYGFILE_H
 
 #include "io_stream.h"
-#include "String++.h"
+
 
 /* io_stream on disk files using cygwin paths
  * and potentially understanding links in the future
  */
 
-extern int cygmkdir_p (enum path_type_t isadir, String const &path);
+extern int cygmkdir_p (path_type_t isadir, const std::string& path, mode_t mode);
 
 class io_stream_cygfile:public io_stream
 {
 public:
-  static int exists (String const &);
-  static int remove (String const &);
-  static int mklink (String const &, String const &, io_stream_link_t);
-    io_stream_cygfile (String const &, String const &);
+  static int exists (const std::string& );
+  static int remove (const std::string& );
+  static int mklink (const std::string& , const std::string& , io_stream_link_t);
+    io_stream_cygfile (const std::string&, const std::string&, mode_t);
     virtual ~ io_stream_cygfile ();
   /* read data (duh!) */
   virtual ssize_t read (void *buffer, size_t len);
@@ -43,26 +43,25 @@ public:
   virtual int seek (long where, io_stream_seek_t whence);
   /* can't guess, oh well */
   virtual int error ();
-  virtual int set_mtime (int);
+  virtual int set_mtime (time_t);
   /* not relevant yet */
-  virtual int get_mtime ()
-  {
-    return 0;
-  };
+  virtual time_t get_mtime () { return 0; };
+  virtual mode_t get_mode () { return 0; };
   virtual size_t get_size ();
-  static int move (String const &,String const &);
+  static int move (const std::string& ,const std::string& );
 private:
   /* always require parameters */
   io_stream_cygfile ()
   {
   };
-  friend int cygmkdir_p (enum path_type_t isadir, String const &_name);
-  static String normalise (String const &unixpath);
+  friend int cygmkdir_p (path_type_t isadir, const std::string& _name, mode_t mode);
+  static std::string normalise (const std::string& unixpath);
   FILE *fp;
   int lasterr;
-  String fname;
-  String lmode;
-  static String cwd;
+  std::string fname;
+  wchar_t *wname;
+  wchar_t *w_str ();
+  static std::string cwd;
 };
 
-#endif /* _IO_STREAM_CYGFILE_H_ */
+#endif /* SETUP_IO_STREAM_CYGFILE_H */