projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.127' into main
[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..87c6a7664d0ad7d823c8a295f18aed9c246722e2 100644
(file)
--- a/
nucleus/applications/bundler/unpacker_stub.cpp
+++ b/
nucleus/applications/bundler/unpacker_stub.cpp
@@
-43,7
+43,7
@@
#ifdef __UNIX__
#include <utime.h>
#endif
#ifdef __UNIX__
#include <utime.h>
#endif
-#ifdef _
_WIN32__
+#ifdef _
MSC_VER
#include <direct.h>
#include <io.h>
#include <shlobj.h>
#include <direct.h>
#include <io.h>
#include <shlobj.h>
@@
-196,11
+196,6
@@
int unpacker_stub::execute()
astring target;
cmds.get_value("target", target);
if (!target) {
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);
provided_target = false;
} else {
//LOG(astring("target is now ") + target);
@@
-212,7
+207,7
@@
int unpacker_stub::execute()
astring logdir = environment::get(LOGDIR_WORD);
#ifdef __WIN32__
if (!logdir) {
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
environment::set(LOGDIR_WORD, logdir);
}
#else
@@
-451,7
+446,7
@@
int unpacker_stub::execute()
}
}
}
}
- byte_filer *targo = N
IL
;
+ byte_filer *targo = N
ULL_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);
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);