You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
253 lines
7.9 KiB
253 lines
7.9 KiB
Index: erts/emulator/Makefile.in |
|
--- erts/emulator/Makefile.in.orig 2007-11-26 19:55:14 +0100 |
|
+++ erts/emulator/Makefile.in 2007-12-07 09:22:01 +0100 |
|
@@ -248,8 +248,10 @@ |
|
endif |
|
WITH_SCTP=@WITH_SCTP@ |
|
ifdef WITH_SCTP |
|
+ifneq ($(findstring freebsd,$(TARGET)),freebsd) |
|
LIBS += -lsctp |
|
endif |
|
+endif |
|
|
|
ORG_THR_LIBS=@EMU_THR_LIBS@ |
|
THR_LIB_NAME=@EMU_THR_LIB_NAME@ |
|
Index: erts/emulator/beam/erl_process_dump.c |
|
--- erts/emulator/beam/erl_process_dump.c.orig 2007-11-26 19:59:28 +0100 |
|
+++ erts/emulator/beam/erl_process_dump.c 2007-12-07 09:22:01 +0100 |
|
@@ -372,9 +372,11 @@ |
|
static void |
|
dump_externally(int to, void *to_arg, Eterm term) |
|
{ |
|
- byte sbuf[1024]; /* encode and hope for the best ... */ |
|
- byte* s; |
|
- byte* p; |
|
+ byte *sbuf, *s, *p; |
|
+ unsigned size; |
|
+ |
|
+ size = encode_size_struct(term, TERM_TO_BINARY_DFLAGS); |
|
+ sbuf = (byte *) erts_alloc(ERTS_ALC_T_TMP, size); |
|
|
|
if (is_fun(term)) { |
|
/* |
|
@@ -406,4 +408,6 @@ |
|
while (s < p) { |
|
erts_print(to, to_arg, "%02X", *s++); |
|
} |
|
+ |
|
+ erts_free(ERTS_ALC_T_TMP, (void *) sbuf); |
|
} |
|
Index: erts/emulator/hipe/hipe_x86.c |
|
--- erts/emulator/hipe/hipe_x86.c.orig 2007-11-26 19:59:40 +0100 |
|
+++ erts/emulator/hipe/hipe_x86.c 2007-12-07 09:22:01 +0100 |
|
@@ -112,7 +112,7 @@ |
|
abort(); |
|
map_start = mmap(map_hint, map_bytes, |
|
PROT_EXEC|PROT_READ|PROT_WRITE, |
|
- MAP_PRIVATE|MAP_ANONYMOUS |
|
+ MAP_PRIVATE|MAP_ANON |
|
#ifdef __x86_64__ |
|
|MAP_32BIT |
|
#endif |
|
Index: erts/etc/unix/Install.src |
|
--- erts/etc/unix/Install.src.orig 2007-11-26 19:55:53 +0100 |
|
+++ erts/etc/unix/Install.src 2007-12-07 09:22:01 +0100 |
|
@@ -148,4 +148,4 @@ |
|
./misc/format_man_pages $ERL_ROOT |
|
fi |
|
|
|
- |
|
+exit 0 |
|
Index: lib/asn1/c_src/Makefile.in |
|
--- lib/asn1/c_src/Makefile.in.orig 2007-11-26 14:12:06 +0100 |
|
+++ lib/asn1/c_src/Makefile.in 2007-12-07 09:22:01 +0100 |
|
@@ -129,7 +129,7 @@ |
|
$(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) |
|
|
|
$(SHARED_OBJ_FILES): $(OBJ_FILES) $(LIBDIR) |
|
- $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(CLIB_FLAGS) $(LIBS) |
|
+ $(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) |
|
|
|
$(LIBDIR): |
|
-mkdir -p $(LIBDIR) |
|
Index: lib/crypto/c_src/Makefile.in |
|
--- lib/crypto/c_src/Makefile.in.orig 2007-11-26 20:01:59 +0100 |
|
+++ lib/crypto/c_src/Makefile.in 2007-12-07 09:22:01 +0100 |
|
@@ -135,7 +135,7 @@ |
|
release_spec: opt |
|
$(INSTALL_DIR) $(RELSYSDIR)/priv/obj |
|
$(INSTALL_DIR) $(RELSYSDIR)/priv/lib |
|
- $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj |
|
+ $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj |
|
$(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj |
|
$(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib |
|
|
|
Index: lib/erl_interface/src/connect/ei_resolve.c |
|
--- lib/erl_interface/src/connect/ei_resolve.c.orig 2007-11-26 19:57:25 +0100 |
|
+++ lib/erl_interface/src/connect/ei_resolve.c 2007-12-07 09:22:01 +0100 |
|
@@ -51,6 +51,10 @@ |
|
#include "ei_resolve.h" |
|
#include "ei_locking.h" |
|
|
|
+#if defined(HAVE_GETHOSTBYNAME_R) && defined(__FreeBSD__) |
|
+#undef HAVE_GETHOSTBYNAME_R |
|
+#endif |
|
+ |
|
#ifdef HAVE_GETHOSTBYNAME_R |
|
|
|
void ei_init_resolve(void) |
|
Index: lib/et/src/et_contents_viewer.erl |
|
--- lib/et/src/et_contents_viewer.erl.orig 2002-10-03 00:10:21 +0200 |
|
+++ lib/et/src/et_contents_viewer.erl 2007-12-07 09:22:01 +0100 |
|
@@ -346,7 +346,6 @@ |
|
'Caps_Lock' -> |
|
{noreply, S}; |
|
_ -> |
|
- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), |
|
{noreply, S} |
|
end; |
|
handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> |
|
Index: lib/et/src/et_viewer.erl |
|
--- lib/et/src/et_viewer.erl.orig 2007-11-26 14:09:44 +0100 |
|
+++ lib/et/src/et_viewer.erl 2007-12-07 09:22:01 +0100 |
|
@@ -975,8 +975,7 @@ |
|
noreply(S). |
|
|
|
click_error(Click, S) -> |
|
- gs:config(S#state.canvas, beep), |
|
- io:format("~p: ignored: ~p~n", [?MODULE, Click]). |
|
+ gs:config(S#state.canvas, beep). |
|
|
|
%%%---------------------------------------------------------------------- |
|
%%% Clone viewer |
|
Index: lib/gs/src/tool_utils.erl |
|
--- lib/gs/src/tool_utils.erl.orig 2007-11-26 20:03:09 +0100 |
|
+++ lib/gs/src/tool_utils.erl 2007-12-07 09:22:01 +0100 |
|
@@ -37,6 +37,9 @@ |
|
}). |
|
|
|
|
|
+%% Browser executable list (openURL command line protocol required) |
|
+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]). |
|
+ |
|
%%---------------------------------------------------------------------- |
|
%% open_help(Parent, File) |
|
%% Parent = gsobj() (GS root object or parent window) |
|
@@ -77,7 +80,7 @@ |
|
{unix,Type} -> |
|
case Type of |
|
darwin -> "open " ++ File; |
|
- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" |
|
+ _Else -> unix_url_command("file:" ++ File) |
|
end; |
|
{win32,_AnyType} -> |
|
"start " ++ filename:nativename(File); |
|
@@ -92,7 +95,7 @@ |
|
{unix,Type} -> |
|
case Type of |
|
darwin -> "open " ++ File; |
|
- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" |
|
+ _Else -> unix_url_command("file:" ++ File) |
|
end; |
|
{win32,_AnyType} -> |
|
"netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); |
|
@@ -429,3 +432,53 @@ |
|
[Last]; |
|
insert_newlines(Other) -> |
|
Other. |
|
+ |
|
+%% find_browser(BrowserList) => string() | false |
|
+%% BrowserList - [string()] |
|
+%% Given a list of basenames, find the first available executable. |
|
+ |
|
+find_browser([]) -> |
|
+ false; |
|
+ |
|
+find_browser([H | T]) -> |
|
+ case os:find_executable(H) of |
|
+ false -> |
|
+ find_browser(T); |
|
+ Browser -> |
|
+ Browser |
|
+ end. |
|
+ |
|
+%% unix_url_command(URL) => string() |
|
+%% URL - string() |
|
+%% Open an URL, using a browser which supports the openURL command |
|
+%% line protocol. If no browser is found, the empty string will be |
|
+%% returned. |
|
+ |
|
+unix_url_command(URL) -> |
|
+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", |
|
+ |
|
+ case os:getenv("BROWSER") of |
|
+ false -> |
|
+ %% look for a compatible browser |
|
+ case find_browser(?BROWSERS) of |
|
+ false -> |
|
+ ""; |
|
+ Browser -> |
|
+ case regexp:gsub(Template, "BROWSER", Browser) of |
|
+ {ok, Command, 0} -> |
|
+ %% Template does not contain "BROWSER" placeholder |
|
+ ""; |
|
+ {ok, Command, _} -> |
|
+ Command |
|
+ end |
|
+ end; |
|
+ |
|
+ Value -> |
|
+ case regexp:gsub(Template, "BROWSER", Value) of |
|
+ {ok, Command2, 0} -> |
|
+ %% no placeholder |
|
+ ""; |
|
+ {ok, Command2, _} -> |
|
+ Command2 |
|
+ end |
|
+ end. |
|
Index: lib/hipe/regalloc/Makefile |
|
--- lib/hipe/regalloc/Makefile.orig 2007-11-26 19:58:39 +0100 |
|
+++ lib/hipe/regalloc/Makefile 2007-12-07 09:24:17 +0100 |
|
@@ -41,7 +41,6 @@ |
|
hipe_node_sets hipe_spillcost hipe_reg_worklists \ |
|
hipe_adj_list \ |
|
hipe_temp_map \ |
|
- hipe_optimistic_regalloc \ |
|
hipe_coalescing_regalloc \ |
|
hipe_graph_coloring_regalloc \ |
|
hipe_regalloc_loop \ |
|
Index: lib/odbc/c_src/odbcserver.c |
|
--- lib/odbc/c_src/odbcserver.c.orig 2007-11-26 14:08:42 +0100 |
|
+++ lib/odbc/c_src/odbcserver.c 2007-12-07 09:22:01 +0100 |
|
@@ -111,6 +111,7 @@ |
|
#include <sys/socket.h> |
|
#include <sys/uio.h> |
|
#include <netdb.h> |
|
+#include <netinet/in.h> |
|
#endif |
|
|
|
#include "ei.h" |
|
Index: lib/sasl/src/rb.erl |
|
--- lib/sasl/src/rb.erl.orig 2007-12-04 14:02:32 +0100 |
|
+++ lib/sasl/src/rb.erl 2007-12-07 09:22:01 +0100 |
|
@@ -414,7 +414,7 @@ |
|
Ref = make_ref(), |
|
case (catch {Ref,binary_to_term(Bin)}) of |
|
{'EXIT',_} -> |
|
- {error, "Inclomplete erlang term in log"}; |
|
+ {error, "Incomplete erlang term in log"}; |
|
{Ref,Term} -> |
|
{ok, Term} |
|
end |
|
Index: lib/snmp/src/misc/snmp_config.erl |
|
--- lib/snmp/src/misc/snmp_config.erl.orig 2007-11-26 15:58:11 +0100 |
|
+++ lib/snmp/src/misc/snmp_config.erl 2007-12-07 09:22:01 +0100 |
|
@@ -1733,7 +1733,7 @@ |
|
"%% {\"standard inform\", \"std_inform\", inform}.\n" |
|
"%%\n\n", |
|
Hdr = header() ++ Comment, |
|
- Conf = [{"stadard_trap", "std_trap", NotifyType}], |
|
+ Conf = [{"standard trap", "std_trap", NotifyType}], |
|
write_agent_notify_config(Dir, Hdr, Conf). |
|
|
|
write_agent_notify_config(Dir, Hdr, Conf) ->
|
|
|