Changeset 2ce23a3 in rtems-tools

Timestamp:

Aug 1, 2014, 6:47:11 AM (5 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, master

Children:

ea29902

Parents:

427acf3

Message:

Fix building on Windows with the latest MSVC.

Remove some warnings.

Location:

linkers

Files:

• rld-files.cpp (modified) (1 diff)
• rld-outputter.cpp (modified) (3 diffs)
• rld-process.cpp (modified) (11 diffs)

linkers/rld-files.cpp

@@ -26 +26 @@
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include <rld.h>

linkers/rld-outputter.cpp

@@ -45 +45 @@
   namespace outputter
   {
+    int unlink (const char* path)
+    {
+#if _WIN32
+      return ::remove(path);
+#else
+      return ::unlink (path);
+#endif
+    }
+
+    int link (const char* path1, const char* path2)
+    {
+#if _WIN32
+      return ::rename(path1, path2);
+#else
+      return ::link (path1, path2);
+#endif
+    }
+
     const std::string
     script_text (const std::string&        entry,
@@ -260 +278 @@
         if (ra_exist)
         {
-          std::string new_name = "rld_XXXXXX";
-          struct stat sb;
+          std::string    new_name = "rld_XXXXXX";
           files::archive arch (new_name);
+          struct stat    sb;
+
           arch.create (objects);
 
           if ((::stat (name.c_str (), &sb) >= 0) && S_ISREG (sb.st_mode))
           {
-            if (::unlink (name.c_str ()) < 0)
+            if (unlink (name.c_str ()) < 0)
               std::cerr << "error: unlinking temp file: " << name << std::endl;
           }
-          if (::link (new_name.c_str (), name.c_str ()) < 0)
+          if (link (new_name.c_str (), name.c_str ()) < 0)
           {
             std::cerr << "error: linking temp file: " << name << std::endl;
@@ -276 +295 @@
           if ((::stat (new_name.c_str (), &sb) >= 0) && S_ISREG (sb.st_mode))
           {
-            if (::unlink (new_name.c_str ()) < 0)
+            if (unlink (new_name.c_str ()) < 0)
               std::cerr << "error: unlinking temp file: " << new_name << std::endl;
           }

linkers/rld-process.cpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2011, Chris Johns <chrisj@rtems.org> 
+ * Copyright (c) 2011, Chris Johns <chrisj@rtems.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
@@ -24 +24 @@
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #ifdef HAVE_SYS_WAIT_H
@@ -67 +68 @@
       clean_up ();
     }
-    
+
     const std::string
     temporary_files::get ()
@@ -89 +90 @@
       if ((::stat (name.c_str (), &sb) >= 0) && S_ISREG (sb.st_mode))
       {
-        if (::unlink (name.c_str ()) < 0)
+        int r;
+#if _WIN32
+        r = ::remove(name.c_str ());
+#else
+        r = ::unlink (name.c_str ());
+#endif
+        if (r < 0)
         {
           std::cerr << "error: unlinking temp file: " << name << std::endl;
@@ -160 +167 @@
     }
 
-    const std::string& 
+    const std::string&
     tempfile::name () const
     {
@@ -175 +182 @@
       if (::stat (_name.c_str (), &sb) == 0)
         return sb.st_size;
-      
+
       return 0;
     }
@@ -243 +250 @@
 
     void
-    tempfile::output (const std::string& prefix, 
+    tempfile::output (const std::string& prefix,
                       std::ostream&      out,
                       bool               line_numbers)
@@ -269 +276 @@
 
     status
-    execute (const std::string& pname, 
+    execute (const std::string& pname,
              const std::string& command,
              const std::string& outname,
@@ -280 +287 @@
 
     status
-    execute (const std::string&   pname, 
+    execute (const std::string&   pname,
              const arg_container& args,
              const std::string&   outname,
@@ -346 +353 @@
       else
         throw rld::error ("execute: " + args[0], "unknown status returned");
-          
+
       return _status;
     }
@@ -365 +372 @@
 
       args.clear ();
-      
+
       const char quote = '"';
       const char escape = '\\';