JBoss Native SVN: r1140 - trunk/sight/native/os/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-22 02:58:23 -0400 (Mon, 22 Oct 2007)
New Revision: 1140
Modified:
trunk/sight/native/os/windows/scm.c
Log:
Fix services enum for Windows. We are using non-unicode structure
Modified: trunk/sight/native/os/windows/scm.c
===================================================================
--- trunk/sight/native/os/windows/scm.c 2007-10-19 10:09:10 UTC (rev 1139)
+++ trunk/sight/native/os/windows/scm.c 2007-10-22 06:58:23 UTC (rev 1140)
@@ -145,7 +145,7 @@
if (SIGHT_LOCAL_IRQ(no)) {
ea = NULL;
SIGHT_LOCAL_BRK(no);
- goto cleanup;
+ goto cleanup;
}
rt = EnumServicesStatusExA(no->native,
SC_ENUM_PROCESS_INFO,
@@ -194,7 +194,7 @@
DWORD i;
lpService = (LPENUM_SERVICE_STATUS_PROCESSA)&head->data[0];
for (i = 0; i < head->size; i++) {
- jstring s = WSTR_TO_JSTRING(lpService[i].lpServiceName);
+ jstring s = CSTR_TO_JSTRING(lpService[i].lpServiceName);
if (s)
(*_E)->SetObjectArrayElement(_E, ea, idx++, s);
else
16 years, 6 months
JBoss Native SVN: r1139 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-19 06:09:10 -0400 (Fri, 19 Oct 2007)
New Revision: 1139
Added:
trunk/build/patch/openssl-0.9.8g.patch
Removed:
trunk/build/patch/openssl-0.9.8f.patch
Log:
Remove broken OpenSSL version
Deleted: trunk/build/patch/openssl-0.9.8f.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8f.patch 2007-10-18 16:13:07 UTC (rev 1138)
+++ trunk/build/patch/openssl-0.9.8f.patch 2007-10-19 10:09:10 UTC (rev 1139)
@@ -1,93 +0,0 @@
---- util/mk1mf.pl
-+++ util/mk1mf.pl
-@@ -333,24 +333,24 @@
- if ($shlib)
- {
- $extra_install= <<"EOF";
-- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
-- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
-- \$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
-+ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
- EOF
- if ($no_static_engine)
- {
- $extra_install .= <<"EOF"
-- \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
-- \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
-+ \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
- EOF
- }
- }
- else
- {
- $extra_install= <<"EOF";
-- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
- EOF
- $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
- }
-@@ -492,7 +492,7 @@
- $banner
-
- \$(TMP_D):
-- \$(MKDIR) \$(TMP_D)
-+ \$(MKDIR) \"\$(TMP_D)\"
- # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
- #\$(BIN_D):
- # \$(MKDIR) \$(BIN_D)
-@@ -501,13 +501,13 @@
- # \$(MKDIR) \$(TEST_D)
-
- \$(LIB_D):
-- \$(MKDIR) \$(LIB_D)
-+ \$(MKDIR) \"\$(LIB_D)\"
-
- \$(INCO_D): \$(INC_D)
-- \$(MKDIR) \$(INCO_D)
-+ \$(MKDIR) \"\$(INCO_D)\"
-
- \$(INC_D):
-- \$(MKDIR) \$(INC_D)
-+ \$(MKDIR) \"\$(INC_D)\"
-
- headers: \$(HEADER) \$(EXHEADER)
- @
-@@ -517,14 +517,14 @@
- exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
-
- install: all
-- \$(MKDIR) \$(INSTALLTOP)
-- \$(MKDIR) \$(INSTALLTOP)${o}bin
-- \$(MKDIR) \$(INSTALLTOP)${o}include
-- \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
-- \$(MKDIR) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
-- \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
-- \$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
-+ \$(MKDIR) \"\$(INSTALLTOP)\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-+ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
- $extra_install
-
-
-@@ -969,7 +969,7 @@
- if ($n =~ /bss_file/)
- { $pp=".c"; }
- else { $pp=$p; }
-- $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n";
-+ $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
- }
- return($ret);
- }
Added: trunk/build/patch/openssl-0.9.8g.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8g.patch (rev 0)
+++ trunk/build/patch/openssl-0.9.8g.patch 2007-10-19 10:09:10 UTC (rev 1139)
@@ -0,0 +1,93 @@
+--- util/mk1mf.pl
++++ util/mk1mf.pl
+@@ -333,24 +333,24 @@
+ if ($shlib)
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ if ($no_static_engine)
+ {
+ $extra_install .= <<"EOF"
+- \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
+- \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
++ \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
+ EOF
+ }
+ }
+ else
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+ }
+@@ -492,7 +492,7 @@
+ $banner
+
+ \$(TMP_D):
+- \$(MKDIR) \$(TMP_D)
++ \$(MKDIR) \"\$(TMP_D)\"
+ # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
+ #\$(BIN_D):
+ # \$(MKDIR) \$(BIN_D)
+@@ -501,13 +501,13 @@
+ # \$(MKDIR) \$(TEST_D)
+
+ \$(LIB_D):
+- \$(MKDIR) \$(LIB_D)
++ \$(MKDIR) \"\$(LIB_D)\"
+
+ \$(INCO_D): \$(INC_D)
+- \$(MKDIR) \$(INCO_D)
++ \$(MKDIR) \"\$(INCO_D)\"
+
+ \$(INC_D):
+- \$(MKDIR) \$(INC_D)
++ \$(MKDIR) \"\$(INC_D)\"
+
+ headers: \$(HEADER) \$(EXHEADER)
+ @
+@@ -517,14 +517,14 @@
+ exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+
+ install: all
+- \$(MKDIR) \$(INSTALLTOP)
+- \$(MKDIR) \$(INSTALLTOP)${o}bin
+- \$(MKDIR) \$(INSTALLTOP)${o}include
+- \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
+- \$(MKDIR) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
+- \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
+- \$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
++ \$(MKDIR) \"\$(INSTALLTOP)\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
+ $extra_install
+
+
+@@ -969,7 +969,7 @@
+ if ($n =~ /bss_file/)
+ { $pp=".c"; }
+ else { $pp=$p; }
+- $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n";
++ $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
+ }
+ return($ret);
+ }
16 years, 6 months
JBoss Native SVN: r1138 - trunk/sight/native/os/solaris.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-10-18 12:13:07 -0400 (Thu, 18 Oct 2007)
New Revision: 1138
Modified:
trunk/sight/native/os/solaris/volume.c
Log:
Oops... That caused a core on Solaris10.
Modified: trunk/sight/native/os/solaris/volume.c
===================================================================
--- trunk/sight/native/os/solaris/volume.c 2007-10-18 15:16:12 UTC (rev 1137)
+++ trunk/sight/native/os/solaris/volume.c 2007-10-18 16:13:07 UTC (rev 1138)
@@ -230,7 +230,6 @@
ent->next = NULL;
}
fclose(fp);
- free(previous->next);
previous->next = NULL;
ent = e->ent;
16 years, 6 months
JBoss Native SVN: r1137 - trunk/sight/native/os/solaris.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-10-18 11:16:12 -0400 (Thu, 18 Oct 2007)
New Revision: 1137
Modified:
trunk/sight/native/os/solaris/volume.c
Log:
Stick to the Solaris example of man swapctl
Modified: trunk/sight/native/os/solaris/volume.c
===================================================================
--- trunk/sight/native/os/solaris/volume.c 2007-10-18 09:13:56 UTC (rev 1136)
+++ trunk/sight/native/os/solaris/volume.c 2007-10-18 15:16:12 UTC (rev 1137)
@@ -240,14 +240,14 @@
/* process swap */
e->num_swap = swapctl(SC_GETNSWP, 0);
- e->num_mounts = e->num_mounts + e->num_swap;
- e->swap_table = apr_palloc(e->pool, sizeof(swapent_t) * e->num_swap + sizeof(int));
- buf = apr_palloc(e->pool, MAXSTRSIZE * e->num_swap);
- for (i = 0; i < e->num_swap; i++) {
+ e->swap_table = apr_palloc(e->pool, sizeof(swapent_t) * e->num_swap + sizeof(swaptbl_t));
+ buf = apr_palloc(e->pool, MAXSTRSIZE * e->num_swap + 1);
+ for (i = 0; i < e->num_swap + 1; i++) {
e->swap_table->swt_ent[i].ste_path = buf + (i * MAXSTRSIZE);
}
e->swap_table->swt_n = e->num_swap;
- swapctl(SC_LIST, e->swap_table);
+ e->num_swap = swapctl(SC_LIST, e->swap_table);
+ e->num_mounts = e->num_mounts + e->num_swap;
e->swap_idx = 0;
e->mounts_idx = 0;
16 years, 6 months
JBoss Native SVN: r1136 - trunk/sight/examples/org/jboss/sight.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-10-18 05:13:56 -0400 (Thu, 18 Oct 2007)
New Revision: 1136
Modified:
trunk/sight/examples/org/jboss/sight/DumpUdp.java
Log:
Also print the remote address.
Modified: trunk/sight/examples/org/jboss/sight/DumpUdp.java
===================================================================
--- trunk/sight/examples/org/jboss/sight/DumpUdp.java 2007-10-18 06:10:03 UTC (rev 1135)
+++ trunk/sight/examples/org/jboss/sight/DumpUdp.java 2007-10-18 09:13:56 UTC (rev 1136)
@@ -45,7 +45,8 @@
System.out.println(" NumAddrs :" + udp.NumAddrs);
for (UdpConnection c : udp.getUdpConnections()) {
System.out.println(new Date(c.CreateTimestamp) + " " + c.Pid + " \t" +
- c.LocalAddr.Address + ":" + c.LocalAddr.Port);
+ c.LocalAddr.Address + ":" + c.LocalAddr.Port + " \t" +
+ c.RemoteAddr.Address + ":" + c.RemoteAddr.Port);
}
16 years, 6 months
JBoss Native SVN: r1135 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-18 02:10:03 -0400 (Thu, 18 Oct 2007)
New Revision: 1135
Modified:
trunk/build/unix/package.list
Log:
Use APR 1.2.8. 1.2.9 doesn't work on windows
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-10-18 06:08:52 UTC (rev 1134)
+++ trunk/build/unix/package.list 2007-10-18 06:10:03 UTC (rev 1135)
@@ -2,7 +2,7 @@
# add new versions of package after existing ones.
jboss-native|2.0.2|1.2.9|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11
jboss-native|2.0.3|1.2.8|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11
-jboss-native|2.0.3-dev|1.2.9|1.2.8|0.9.8e|trunk
+jboss-native|2.0.3-dev|1.2.8|1.2.8|0.9.8e|trunk
# SIGHT
jboss-sight|1.0.0|1.2.9|1.2.8||trunk
jboss-sight|1.0.1|1.2.8|1.2.8||trunk
16 years, 6 months
JBoss Native SVN: r1134 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-18 02:08:52 -0400 (Thu, 18 Oct 2007)
New Revision: 1134
Added:
trunk/build/patch/apr-1.2.9.patch
Log:
Oops. Revert cause old builds depend on 1.2.9
Copied: trunk/build/patch/apr-1.2.9.patch (from rev 1132, trunk/build/patch/apr-1.2.9.patch)
===================================================================
--- trunk/build/patch/apr-1.2.9.patch (rev 0)
+++ trunk/build/patch/apr-1.2.9.patch 2007-10-18 06:08:52 UTC (rev 1134)
@@ -0,0 +1,24 @@
+--- include/apr.hw
++++ include/apr.hw
+@@ -217,7 +217,7 @@
+ #define APR_HAVE_IN_ADDR 1
+ #define APR_HAVE_INET_ADDR 1
+ #define APR_HAVE_INET_NETWORK 0
+-#define APR_HAVE_IPV6 0
++#define APR_HAVE_IPV6 1
+ #define APR_HAVE_MEMMOVE 1
+ #define APR_HAVE_SETRLIMIT 0
+ #define APR_HAVE_SIGACTION 0
+--- misc/win32/rand.c
++++ misc/win32/rand.c
+@@ -14,9 +14,8 @@
+ * limitations under the License.
+ */
+
+-#include <windows.h>
+-#include <wincrypt.h>
+ #include "apr.h"
++#include <wincrypt.h>
+ #include "apr_private.h"
+ #include "apr_general.h"
+ #include "apr_portable.h"
16 years, 6 months
JBoss Native SVN: r1133 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-18 01:41:21 -0400 (Thu, 18 Oct 2007)
New Revision: 1133
Removed:
trunk/build/patch/apr-1.2.9.patch
Log:
Remove APR 1.2.9 patch. APR 1.2.9 is bogus
Deleted: trunk/build/patch/apr-1.2.9.patch
===================================================================
--- trunk/build/patch/apr-1.2.9.patch 2007-10-18 05:40:20 UTC (rev 1132)
+++ trunk/build/patch/apr-1.2.9.patch 2007-10-18 05:41:21 UTC (rev 1133)
@@ -1,24 +0,0 @@
---- include/apr.hw
-+++ include/apr.hw
-@@ -217,7 +217,7 @@
- #define APR_HAVE_IN_ADDR 1
- #define APR_HAVE_INET_ADDR 1
- #define APR_HAVE_INET_NETWORK 0
--#define APR_HAVE_IPV6 0
-+#define APR_HAVE_IPV6 1
- #define APR_HAVE_MEMMOVE 1
- #define APR_HAVE_SETRLIMIT 0
- #define APR_HAVE_SIGACTION 0
---- misc/win32/rand.c
-+++ misc/win32/rand.c
-@@ -14,9 +14,8 @@
- * limitations under the License.
- */
-
--#include <windows.h>
--#include <wincrypt.h>
- #include "apr.h"
-+#include <wincrypt.h>
- #include "apr_private.h"
- #include "apr_general.h"
- #include "apr_portable.h"
16 years, 6 months
JBoss Native SVN: r1132 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-18 01:40:20 -0400 (Thu, 18 Oct 2007)
New Revision: 1132
Modified:
trunk/build/patch/openssl-0.9.8f.patch
Log:
Use correct SVN properties
Property changes on: trunk/build/patch/openssl-0.9.8f.patch
___________________________________________________________________
Name: svn:eol-style
+ LF
16 years, 6 months
JBoss Native SVN: r1131 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-10-18 01:39:06 -0400 (Thu, 18 Oct 2007)
New Revision: 1131
Added:
trunk/build/patch/openssl-0.9.8f.patch
Log:
Added OpenSSL 0.9.8f patch file
Added: trunk/build/patch/openssl-0.9.8f.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8f.patch (rev 0)
+++ trunk/build/patch/openssl-0.9.8f.patch 2007-10-18 05:39:06 UTC (rev 1131)
@@ -0,0 +1,93 @@
+--- util/mk1mf.pl
++++ util/mk1mf.pl
+@@ -333,24 +333,24 @@
+ if ($shlib)
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ if ($no_static_engine)
+ {
+ $extra_install .= <<"EOF"
+- \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
+- \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
++ \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
+ EOF
+ }
+ }
+ else
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+ }
+@@ -492,7 +492,7 @@
+ $banner
+
+ \$(TMP_D):
+- \$(MKDIR) \$(TMP_D)
++ \$(MKDIR) \"\$(TMP_D)\"
+ # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
+ #\$(BIN_D):
+ # \$(MKDIR) \$(BIN_D)
+@@ -501,13 +501,13 @@
+ # \$(MKDIR) \$(TEST_D)
+
+ \$(LIB_D):
+- \$(MKDIR) \$(LIB_D)
++ \$(MKDIR) \"\$(LIB_D)\"
+
+ \$(INCO_D): \$(INC_D)
+- \$(MKDIR) \$(INCO_D)
++ \$(MKDIR) \"\$(INCO_D)\"
+
+ \$(INC_D):
+- \$(MKDIR) \$(INC_D)
++ \$(MKDIR) \"\$(INC_D)\"
+
+ headers: \$(HEADER) \$(EXHEADER)
+ @
+@@ -517,14 +517,14 @@
+ exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+
+ install: all
+- \$(MKDIR) \$(INSTALLTOP)
+- \$(MKDIR) \$(INSTALLTOP)${o}bin
+- \$(MKDIR) \$(INSTALLTOP)${o}include
+- \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
+- \$(MKDIR) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
+- \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
+- \$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
++ \$(MKDIR) \"\$(INSTALLTOP)\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
+ $extra_install
+
+
+@@ -969,7 +969,7 @@
+ if ($n =~ /bss_file/)
+ { $pp=".c"; }
+ else { $pp=$p; }
+- $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp $to${o}$n$pp\n\n";
++ $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
+ }
+ return($ret);
+ }
16 years, 6 months