pxcloud/pkg-fetch
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "draft of reorder(argc, argv, wargv[0])"

Browse Source 
This reverts commit 0239bb94e1.
This commit is contained in:
igor 2016-10-04 23:02:20 +03:00
parent 0239bb94e1
commit e8ed755feb
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/node.v6.6.0.patch
View File

@ -430,7 +430,7 @@
} // namespace node
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -1,7 +1,282 @@
@@ -1,7 +1,277 @@
#include "node.h"
+#include <string.h>
@ -585,14 +585,9 @@
+#endif
+
+
+char* ReadOverlays(const void* filename) {
+
+#ifdef _WIN32
+ FILE* file = _wfopen((wchar_t*) filename, L"rb");
+#else
+ FILE* file = fopen((char*) filename, "rb");
+#endif
+char* ReadOverlays(const char* filename) {
+
+ FILE* file = fopen(filename, "rb");
+ if (!file) {
+ fprintf(stderr, "Pkg: Error opening file.\n");
+ exit(1);
@ -662,7 +657,7 @@
+}
+
+
+int reorder(int argc, char** argv, void* wargv0) {
+int reorder(int argc, char** argv) {
+ int i;
+ int runtime_pos = argc;
+ for (i = 1; i < argc; i++) {
@ -679,7 +674,7 @@
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = ReadOverlays(wargv0);
+ char* bakery = ReadOverlays(argv[0]);
+ int c = 0;
+ nargv[c++] = argv[0];
+ if (bakery) {
@ -713,14 +708,14 @@
int wmain(int argc, wchar_t *wargv[]) {
if (!IsWindows7OrGreater()) {
@@ -43,17 +318,17 @@
@@ -43,17 +313,17 @@
exit(1);
}
}
argv[argc] = nullptr;
// Now that conversion is done, we can finally start.
- return node::Start(argc, argv);
+ return reorder(argc, argv, wargv[0]);
+ return reorder(argc, argv);
}
#else
// UNIX
@ -730,6 +725,6 @@
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0);
- return node::Start(argc, argv);
+ return reorder(argc, argv, argv[0]);
+ return reorder(argc, argv);
}
#endif