1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
--- browser/app/nsBrowserApp.cpp 2011-09-28 22:24:36.000000000 +0200
+++ ../../ff6/mozilla-release/browser/app/nsBrowserApp.cpp 2011-09-02 22:15:19.000000000 +0200
@@ -36,19 +36,14 @@
*
* ***** END LICENSE BLOCK ***** */
-#include "nsXPCOMGlue.h"
#include "nsXULAppAPI.h"
-#if defined(XP_WIN)
+#ifdef XP_WIN
#include <windows.h>
#include <stdlib.h>
-#elif defined(XP_UNIX)
-#include <sys/time.h>
-#include <sys/resource.h>
#endif
#include <stdio.h>
#include <stdarg.h>
-#include <string.h>
#include "plstr.h"
#include "prprf.h"
@@ -59,16 +54,11 @@
#include "nsStringGlue.h"
#ifdef XP_WIN
+// we want to use the DLL blocklist if possible
+#define XRE_WANT_DLL_BLOCKLIST
// we want a wmain entry point
#include "nsWindowsWMain.cpp"
-#define snprintf _snprintf
-#define strcasecmp _stricmp
#endif
-#include "BinaryPath.h"
-
-#include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL
-
-#include "mozilla/Telemetry.h"
static void Output(const char *fmt, ... )
{
@@ -95,12 +85,12 @@
{
if (*++arg == '-')
++arg;
- return !strcasecmp(arg, s);
+ return !PL_strcasecmp(arg, s);
}
#if defined(XP_WIN) || defined(XP_OS2)
if (*arg == '/')
- return !strcasecmp(++arg, s);
+ return !PL_strcasecmp(++arg, s);
#endif
return PR_FALSE;
@@ -116,48 +106,22 @@
~ScopedLogging() { NS_LogTerm(); }
};
-XRE_GetFileFromPathType XRE_GetFileFromPath;
-XRE_CreateAppDataType XRE_CreateAppData;
-XRE_FreeAppDataType XRE_FreeAppData;
-#ifdef XRE_HAS_DLL_BLOCKLIST
-XRE_SetupDllBlocklistType XRE_SetupDllBlocklist;
-#endif
-XRE_TelemetryAccumulateType XRE_TelemetryAccumulate;
-XRE_mainType XRE_main;
-
-static const nsDynamicFunctionLoad kXULFuncs[] = {
- { "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
- { "XRE_CreateAppData", (NSFuncPtr*) &XRE_CreateAppData },
- { "XRE_FreeAppData", (NSFuncPtr*) &XRE_FreeAppData },
-#ifdef XRE_HAS_DLL_BLOCKLIST
- { "XRE_SetupDllBlocklist", (NSFuncPtr*) &XRE_SetupDllBlocklist },
-#endif
- { "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate },
- { "XRE_main", (NSFuncPtr*) &XRE_main },
- { nsnull, nsnull }
-};
-
-static int do_main(const char *exePath, int argc, char* argv[])
+int main(int argc, char* argv[])
{
+ ScopedLogging log;
+
nsCOMPtr<nsILocalFile> appini;
-#ifdef XP_WIN
- // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8
- // encoded path, so it is safe to convert it
- nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
- getter_AddRefs(appini));
-#else
- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
- getter_AddRefs(appini));
-#endif
+ nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini));
if (NS_FAILED(rv)) {
+ Output("Couldn't calculate the application directory.");
return 255;
}
-
appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini"));
// Allow firefox.exe to launch XULRunner apps via -app <application.ini>
// Note that -app must be the *first* argument.
- const char *appDataFile = getenv("XUL_APP_FILE");
+ char *appEnv = nsnull;
+ const char *appDataFile = PR_GetEnv("XUL_APP_FILE");
if (appDataFile && *appDataFile) {
rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini));
if (NS_FAILED(rv)) {
@@ -177,12 +141,8 @@
return 255;
}
- char appEnv[MAXPATHLEN];
- snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]);
- if (putenv(appEnv)) {
- Output("Couldn't set %s.\n", appEnv);
- return 255;
- }
+ appEnv = PR_smprintf("XUL_APP_FILE=%s", argv[2]);
+ PR_SetEnv(appEnv);
argv[2] = argv[0];
argv += 2;
argc -= 2;
@@ -197,90 +157,7 @@
int result = XRE_main(argc, argv, appData);
XRE_FreeAppData(appData);
- return result;
-}
-
-int main(int argc, char* argv[])
-{
- char exePath[MAXPATHLEN];
-
- nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
- if (NS_FAILED(rv)) {
- Output("Couldn't calculate the application directory.\n");
- return 255;
- }
-
- char *lastSlash = strrchr(exePath, XPCOM_FILE_PATH_SEPARATOR[0]);
- if (!lastSlash || (lastSlash - exePath > MAXPATHLEN - sizeof(XPCOM_DLL) - 1))
- return 255;
-
- strcpy(++lastSlash, XPCOM_DLL);
-
- int gotCounters;
-#if defined(XP_UNIX)
- struct rusage initialRUsage;
- gotCounters = !getrusage(RUSAGE_SELF, &initialRUsage);
-#elif defined(XP_WIN)
- // GetProcessIoCounters().ReadOperationCount seems to have little to
- // do with actual read operations. It reports 0 or 1 at this stage
- // in the program. Luckily 1 coincides with when prefetch is
- // enabled. If Windows prefetch didn't happen we can do our own
- // faster dll preloading.
- IO_COUNTERS ioCounters;
- gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters);
- if (gotCounters && !ioCounters.ReadOperationCount)
-#endif
- {
- XPCOMGlueEnablePreload();
- }
-
-
- rv = XPCOMGlueStartup(exePath);
- if (NS_FAILED(rv)) {
- Output("Couldn't load XPCOM.\n");
- return 255;
- }
-
- rv = XPCOMGlueLoadXULFunctions(kXULFuncs);
- if (NS_FAILED(rv)) {
- Output("Couldn't load XRE functions.\n");
- return 255;
- }
-
-#ifdef XRE_HAS_DLL_BLOCKLIST
- XRE_SetupDllBlocklist();
-#endif
-
- if (gotCounters) {
-#if defined(XP_WIN)
- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_OPS,
- int(ioCounters.ReadOperationCount));
- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_TRANSFER,
- int(ioCounters.ReadTransferCount / 1024));
- IO_COUNTERS newIoCounters;
- if (GetProcessIoCounters(GetCurrentProcess(), &newIoCounters)) {
- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_OPS,
- int(newIoCounters.ReadOperationCount - ioCounters.ReadOperationCount));
- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_TRANSFER,
- int((newIoCounters.ReadTransferCount - ioCounters.ReadTransferCount) / 1024));
- }
-#elif defined(XP_UNIX)
- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_HARD_FAULTS,
- int(initialRUsage.ru_majflt));
- struct rusage newRUsage;
- if (!getrusage(RUSAGE_SELF, &newRUsage)) {
- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_HARD_FAULTS,
- int(newRUsage.ru_majflt - initialRUsage.ru_majflt));
- }
-#endif
- }
-
- int result;
- {
- ScopedLogging log;
- result = do_main(exePath, argc, argv);
- }
-
- XPCOMGlueShutdown();
+ if (appEnv)
+ PR_smprintf_free(appEnv);
return result;
}
|
