updates from orpheus for windoze build

[feisty_meow.git] / nucleus / applications / bundler / unpacker_stub.cpp

diff --git a/nucleus/applications/bundler/unpacker_stub.cpp b/nucleus/applications/bundler/unpacker_stub.cpp
index a515d8ccb79e9786dc8c8fd74e8ce3405c3b4b51..a9de74afd3185068065b60c43aeae259fe212771 100644 (file)
--- a/nucleus/applications/bundler/unpacker_stub.cpp
+++ b/nucleus/applications/bundler/unpacker_stub.cpp
@@ -40,15 +40,17 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <zlib.h>
-#ifdef __UNIX__
+//#ifdef __UNIX__
   #include <utime.h>
-#endif
-#ifdef __WIN32__
+//#endif
+/*
+#ifdef _MSC_VER
   #include <direct.h>
   #include <io.h>
   #include <shlobj.h>
   #include <sys/utime.h>
 #endif
+*/
 
 using namespace application;
 using namespace basis;
@@ -196,11 +198,6 @@ int unpacker_stub::execute()
   astring target;
   cmds.get_value("target", target);
   if (!target) {
-/* no, this is wrong headed.  make them supply a target if there is
- * no default target provided in the bundle.
-    // a bogus default is provided if they don't specify the destination.
-    target = environment::get("TMP") + "/unbundled";
-*/
     provided_target = false;
   } else {
 //LOG(astring("target is now ") + target);
@@ -212,7 +209,7 @@ int unpacker_stub::execute()
     astring logdir = environment::get(LOGDIR_WORD);
 #ifdef __WIN32__
     if (!logdir) {
-      logdir = environment::get("TMP") + "/logs";
+      logdir = environment::TMP() + "/logs";
       environment::set(LOGDIR_WORD, logdir);
     }
 #else
@@ -451,7 +448,7 @@ int unpacker_stub::execute()
         }
       }
 
-      byte_filer *targo = NIL;
+      byte_filer *targo = NULL_POINTER;
       if (keyword_good) targo = new byte_filer(curr._payload, "wb");
       byte_array uncompressed(256 * KILOBYTE);  // fluff it out to begin with.
       byte_array temp(256 * KILOBYTE);