Merged across diffs between setup_crypto_branch_branchpoint and

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

diff --git a/io_stream_cygfile.h b/io_stream_cygfile.h
index 4c030b0e13c7102bfa6e0fc59c6427f69ff0c62d..62aae493b250aa9b9a4c36a76372bc25dace4dfb 100644 (file)
--- a/io_stream_cygfile.h
+++ b/io_stream_cygfile.h
@@ -13,24 +13,26 @@
  *
  */
 
-#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"
 
 
 /* io_stream on disk files using cygwin paths
  * and potentially understanding links in the future
  */
 
-extern int cygmkdir_p (int isadir, const char *path);
+extern int cygmkdir_p (path_type_t isadir, const std::string& path);
 
 class io_stream_cygfile:public io_stream
 {
 public:
-  static int exists (const char *);
-  static int remove (const char *);
-  static int mklink (const char *, const char *, io_stream_link_t);
-    io_stream_cygfile (const char *, const char *);
-  virtual ~io_stream_cygfile ();
+  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& );
+    virtual ~ io_stream_cygfile ();
   /* read data (duh!) */
   virtual ssize_t read (void *buffer, size_t len);
   /* provide data to (double duh!) */
@@ -43,21 +45,24 @@ public:
   virtual int error ();
   virtual int set_mtime (int);
   /* not relevant yet */
-  virtual int get_mtime () {return 0;};
-  /* dummy for io_stream_file */
-  virtual const char *next_file_name ()
+  virtual int get_mtime ()
   {
-    return NULL;
+    return 0;
   };
+  virtual size_t get_size ();
+  static int move (const std::string& ,const std::string& );
 private:
   /* always require parameters */
-    io_stream_cygfile ()
+  io_stream_cygfile ()
   {
   };
+  friend int cygmkdir_p (path_type_t isadir, const std::string& _name);
+  static std::string normalise (const std::string& unixpath);
   FILE *fp;
   int lasterr;
-  char *fname;
-  char *lmode;
+  std::string fname;
+  std::string lmode;
+  static std::string cwd;
 };
 
-#endif /* _IO_STREAM_CYGFILE_H_ */
+#endif /* SETUP_IO_STREAM_CYGFILE_H */