[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/config/mingw/os_...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/config/mingw/os_... |
|
Date: |
Mon, 20 Feb 2006 01:17:55 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/02/20 01:17:54
Modified files:
distrib : ChangeLog
src/config/mingw: os_stubs_c.c
src/config/unix: os_stubs_c.c
src/daemon/common: commonOptions.ml
src/daemon/driver: driverInteractive.ml
src/utils/lib : os_stubs.h stubs_c.c unix32.ml unix32.mli
Log message:
patch #4909
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.739&tr2=1.740&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/mingw/os_stubs_c.c.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/unix/os_stubs_c.c.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.126&tr2=1.127&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/os_stubs.h.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.ml.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.mli.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.739 mldonkey/distrib/ChangeLog:1.740
--- mldonkey/distrib/ChangeLog:1.739 Mon Feb 20 00:53:57 2006
+++ mldonkey/distrib/ChangeLog Mon Feb 20 01:17:54 2006
@@ -15,6 +15,8 @@
=========
2006/02/20
+4909: Print warning messages when run on supported operating systems (Schlumpf)
+ currently for example Windows 95/98/ME
4920: Cleanup included header files in C code (Schlumpf)
2006/02/17
Index: mldonkey/src/config/mingw/os_stubs_c.c
diff -u mldonkey/src/config/mingw/os_stubs_c.c:1.15
mldonkey/src/config/mingw/os_stubs_c.c:1.16
--- mldonkey/src/config/mingw/os_stubs_c.c:1.15 Mon Feb 20 00:53:57 2006
+++ mldonkey/src/config/mingw/os_stubs_c.c Mon Feb 20 01:17:54 2006
@@ -437,3 +437,29 @@
return;
}
+/*******************************************************************
+
+
+ os_os_supported
+
+
+*******************************************************************/
+
+int os_os_supported()
+{
+ OSVERSIONINFO pVersion;
+ pVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ int check = GetVersionEx(&pVersion);
+
+ if ( check != 0 )
+ {
+ if ( pVersion.dwPlatformId == VER_PLATFORM_WIN32_NT )
+ return 1;
+ else
+ return 0;
+ }
+ else /* expect an NT system because GetVersionEx failed */
+ {
+ return 1;
+ }
+}
Index: mldonkey/src/config/unix/os_stubs_c.c
diff -u mldonkey/src/config/unix/os_stubs_c.c:1.15
mldonkey/src/config/unix/os_stubs_c.c:1.16
--- mldonkey/src/config/unix/os_stubs_c.c:1.15 Mon Feb 20 00:53:57 2006
+++ mldonkey/src/config/unix/os_stubs_c.c Mon Feb 20 01:17:54 2006
@@ -181,3 +181,16 @@
}
#endif
+
+/*******************************************************************
+
+
+ os_os_supported
+
+
+*******************************************************************/
+
+int os_os_supported()
+{
+ return 1; /* return always 1 to expect an supported os */
+}
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.126
mldonkey/src/daemon/common/commonOptions.ml:1.127
--- mldonkey/src/daemon/common/commonOptions.ml:1.126 Sun Feb 5 13:17:40 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Mon Feb 20 01:17:54 2006
@@ -137,6 +137,19 @@
exit 2);
Unix2.can_write_to_directory file_basedir;
Unix.chdir file_basedir;
+
+ let uname = Unix32.uname () in
+ if uname = "" then
+ begin
+ lprintf_nl "Unknown operating system, please report to the MLDonkey
development team";
+ lprintf_nl "at http://savannah.nongnu.org/bugs/?group=mldonkey";
+ end
+ else
+ if not (Unix32.os_supported ()) then begin
+ lprintf_nl "WARNING: MLDonkey is not suuported on %s" uname;
+ if Autoconf.windows then
+ lprintf_nl "WARNING: MLDonkey is only supported on Windows
NT/2000/XP/Server 2003."
+ end;
if (String2.starts_with (Filename.basename Sys.argv.(0)) "mlnet")
&& not Autoconf.windows && not (Autoconf.system = "morphos") &&
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.62
mldonkey/src/daemon/driver/driverInteractive.ml:1.63
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.62 Sun Feb 5
13:25:22 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml Mon Feb 20 01:17:54 2006
@@ -71,9 +71,18 @@
warning
end
else ""
+
+let check_supported_os () =
+ let uname = Unix32.uname () in
+ let message = Printf.sprintf "MLDonkey is not able to run faultless under
%s" uname; in
+ if uname <> "" && not (Unix32.os_supported ()) then begin
+ lprintf_nl () "%s" message;
+ message;
+ end
+ else ""
let real_startup_message () =
- !startup_message ^ (verify_user_admin ())
+ !startup_message ^ (verify_user_admin ()) ^ (check_supported_os ())
(* ripped from gui_downloads *)
@@ -1745,7 +1754,9 @@
^ "\nIP blocking:\t " ^ (let r1,r2 = Ip_set.block_stats () in
if r1 = 0 then dis_mess else Printf.sprintf "enabled, %d ranges
loaded - optimized to %d" r1 r2)
^ "\nSystem info:\t " ^ (let uname = Unix32.uname () in
- if uname <> "" then uname else "unknown")
+ if uname <> "" then uname ^
+ (if not (Unix32.os_supported ()) then " - \nWARNING:\t not
supported operating system" else "")
+ else "unknown")
^ "\n\t\t language: " ^ Charset.default_language
^ " - locale: " ^ Charset.locstr
^ " - UTC offset: " ^ Rss_date.mk_timezone (Unix.time ())
Index: mldonkey/src/utils/lib/os_stubs.h
diff -u mldonkey/src/utils/lib/os_stubs.h:1.13
mldonkey/src/utils/lib/os_stubs.h:1.14
--- mldonkey/src/utils/lib/os_stubs.h:1.13 Mon Feb 20 00:53:57 2006
+++ mldonkey/src/utils/lib/os_stubs.h Mon Feb 20 01:17:54 2006
@@ -139,6 +139,7 @@
extern int64 os_getfilesize(char *path);
extern void os_set_nonblock(OS_SOCKET fd);
extern void os_uname(char buf[]);
+extern int os_os_supported();
#define HASH_BUFFER_LEN 131072
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.37
mldonkey/src/utils/lib/stubs_c.c:1.38
--- mldonkey/src/utils/lib/stubs_c.c:1.37 Mon Feb 20 00:53:57 2006
+++ mldonkey/src/utils/lib/stubs_c.c Mon Feb 20 01:17:54 2006
@@ -1465,3 +1465,21 @@
#endif
}
+/*******************************************************************
+
+
+ ml_os_supported
+
+
+*******************************************************************/
+
+value ml_os_supported(value unit)
+{
+ int buf = os_os_supported();
+
+ if ( buf == 1 )
+ return Val_true;
+ else
+ return Val_false;
+}
+
Index: mldonkey/src/utils/lib/unix32.ml
diff -u mldonkey/src/utils/lib/unix32.ml:1.56
mldonkey/src/utils/lib/unix32.ml:1.57
--- mldonkey/src/utils/lib/unix32.ml:1.56 Thu Jan 26 00:25:25 2006
+++ mldonkey/src/utils/lib/unix32.ml Mon Feb 20 01:17:54 2006
@@ -47,6 +47,7 @@
external external_start : string -> unit = "external_start"
external external_exit : unit -> unit = "external_exit"
external uname : unit -> string = "ml_uname"
+external os_supported : unit -> bool = "ml_os_supported"
(* let really_write fd s pos len =
try
Index: mldonkey/src/utils/lib/unix32.mli
diff -u mldonkey/src/utils/lib/unix32.mli:1.20
mldonkey/src/utils/lib/unix32.mli:1.21
--- mldonkey/src/utils/lib/unix32.mli:1.20 Thu Jan 26 00:25:25 2006
+++ mldonkey/src/utils/lib/unix32.mli Mon Feb 20 01:17:54 2006
@@ -24,6 +24,7 @@
val external_start : string -> unit
val external_exit : unit -> unit
val uname : unit -> string
+val os_supported : unit -> bool
val create_dir_mask : string ref
val close : t -> unit