[ros-diffs] [ion] 20317: Merge 19090:20311

Merge 19090:20311
Modified: branches/alex-network-branch/reactos/COPYING
Modified: branches/alex-network-branch/reactos/CREDITS
Modified: branches/alex-network-branch/reactos/LGPL.txt
Modified: branches/alex-network-branch/reactos/Makefile
Added: branches/alex-network-branch/reactos/ReactOS-ppc.xml
Modified: branches/alex-network-branch/reactos/ReactOS.xml
Modified: branches/alex-network-branch/reactos/apistatus.lst
Modified: branches/alex-network-branch/reactos/apps/utils/directory.xml
Added: branches/alex-network-branch/reactos/apps/utils/getfirefox/
Modified: branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/err.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/net.c
Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c
Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c
Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/ftp.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ftp/ftp_var.h
Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/main.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ftp/prototypes.h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ftp/ruserpass.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ipconfig/ipconfig.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/netstat/netstat.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/netstat/netstat.h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/ping/ping.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/ansiprsr.
cpp
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/ansiprsr.
h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tconsole.
cpp
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnconfig.
cpp
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnconfig.
h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnetwork.
h
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnmain.cp
p
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tscroll.c
pp
Modified:
branches/alex-network-branch/reactos/apps/utils/net/telnet/telnet.xml
Modified:
branches/alex-network-branch/reactos/apps/utils/net/tracert/tracert.c
Modified:
branches/alex-network-branch/reactos/apps/utils/net/whois/whois.c
Modified:
branches/alex-network-branch/reactos/apps/utils/nts2w32err/nts2w32err.c
Modified:
branches/alex-network-branch/reactos/apps/utils/objdir/objdir.c
Modified:
branches/alex-network-branch/reactos/apps/utils/partinfo/partinfo.c
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/loader/stdinc.h
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/module/patch.c
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/module/precomp.h
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/module/privateice.c
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/module/shell.c
Modified:
branches/alex-network-branch/reactos/apps/utils/pice/shared/shared.h
Modified:
branches/alex-network-branch/reactos/apps/utils/pnpdump/pnpdump.c
Modified: branches/alex-network-branch/reactos/apps/utils/ps/ps.c
Modified:
branches/alex-network-branch/reactos/apps/utils/rosperf/alphablend.c
Modified:
branches/alex-network-branch/reactos/apps/utils/rosperf/rosperf.c
Deleted: branches/alex-network-branch/reactos/apps/utils/sc/
Modified:
branches/alex-network-branch/reactos/apps/utils/shutdown/shutdown.c
Added:
branches/alex-network-branch/reactos/apps/utils/shutdown/shutdown.xml
Modified: branches/alex-network-branch/reactos/baseaddress.xml
Modified:
branches/alex-network-branch/reactos/boot/freeldr/bootsect/bootsect.xml
Modified:
branches/alex-network-branch/reactos/boot/freeldr/bootsect/ofwboot.s
Modified: branches/alex-network-branch/reactos/boot/freeldr/fdebug/En.rc
Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Hu.rc
Modified: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Ja.rc
Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Pl.rc
Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Tr.rc
Modified:
branches/alex-network-branch/reactos/boot/freeldr/fdebug/fdebug.rc
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/arch
mach.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hard
ware.c
Deleted:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hard
ware.h
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwac
pi.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwap
m.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwcp
u.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwpc
i.c
Deleted:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386
.h
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386
disk.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386
vid.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach
pc.c
Deleted:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach
pc.h
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach
xbox.c
Deleted:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach
xbox.h
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcco
ns.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcdi
sk.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcme
m.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcrt
c.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcvi
deo.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/port
io.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
cons.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
disk.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
font.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
hw.c
Added:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
i2c.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
mem.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
rtc.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox
video.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/b
oot.s
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/m
ach.c
Added:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/m
boot.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/bootmgr.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/blocklis
t.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/cache.c
Deleted:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/cm.h
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/cmdline.c
Modified:
branches/alex-network-branch/reactos/boot/freeldr/freeldr/comm/rs232.c
[truncated at 100 lines; 2280 more skipped] 
  _____  

Modified: branches/alex-network-branch/reactos/COPYING
--- branches/alex-network-branch/reactos/COPYING	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/COPYING	2005-12-24
02:50:22 UTC (rev 20317)
@@ -3,7 +3,7 @@

 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+                       51 Franklin St, Fifth Floor, Boston, MA
02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -280,7 +280,7 @@
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -292,7 +292,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it
does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or
modify
     it under the terms of the GNU General Public License as published
by
@@ -306,14 +306,15 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301  USA
 
+
 Also add information on how to contact you by electronic and paper
mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
`show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
  _____  

Modified: branches/alex-network-branch/reactos/CREDITS
--- branches/alex-network-branch/reactos/CREDITS	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/CREDITS	2005-12-24
02:50:22 UTC (rev 20317)
@@ -47,7 +47,8 @@

 Jonathan Wilson &lt;jonwil(a)tpgi.com.au&gt;
 Art Yerkes &lt;ayerkes(a)speakeasy.net&gt;
 Magnus Olsen (magnus(a)greatlord.com)
-Alex Ionescu (alex(a)relsoft.net)
+Brandon Turner (turnerb7(a)msu.edu)
+Christoph von Wittich (Christoph(a)ApiViewer.de)
 
 Graphic Design from
 
  _____  

Modified: branches/alex-network-branch/reactos/LGPL.txt
--- branches/alex-network-branch/reactos/LGPL.txt	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/LGPL.txt	2005-12-24
02:50:22 UTC (rev 20317)
@@ -2,7 +2,7 @@

 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301  USA
 
 Also add information on how to contact you by electronic and paper
mail.
 
  _____  

Modified: branches/alex-network-branch/reactos/Makefile
--- branches/alex-network-branch/reactos/Makefile	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/Makefile	2005-12-24
02:50:22 UTC (rev 20317)
@@ -105,17 +105,44 @@

 #            -dm{module}  Check only automatic dependencies for this
module.
 #            -mi          Let make handle creation of install
directories. Rbuild will not generate the directories.
 #            -ps          Generate proxy makefiles in source tree
instead of the output tree.
+#            -ud          Disable compilation units.
+#            -r           Input XML
+#
+#    ROS_AUTOMAKE
+#        Alternate name of makefile.auto
+#
 
+# check for versions of make that don't have features we need...
+# the function "eval" is only available in 3.80+, which happens to be
the minimum
+# version that has the features we use...
+# THIS CHECK IS BORROWED FROM THE "GMSL" PROJECT, AND IS COVERED BY THE
GPL LICENSE
+# YOU CAN FIND OUT MORE ABOUT GMSL - A VERY COOL PROJECT - AT:
+# http://gmsl.sourceforge.net/
+
+__gmsl_have_eval :=
+__gmsl_ignore := $(eval __gmsl_have_eval := T)
+
+ifndef __gmsl_have_eval
+$(error ReactOS's makefiles use GNU Make 3.80+ features, you have
$(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry)
+endif
+# END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ )
+
 .PHONY: all
 .PHONY: clean
-all: makefile.auto
 
+ifeq ($(ROS_AUTOMAKE),)
+ROS_AUTOMAKE=makefile.auto
+endif
 
+all: $(ROS_AUTOMAKE)
+
+
 .SUFFIXES:
 
 ifeq ($(HOST),)
 ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
-ifeq ($(OSTYPE),msys)
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+export OSTYPE = msys
 HOST=mingw32-linux
 else
 HOST=mingw32-windows
@@ -214,7 +241,7 @@
 	export EXEPREFIX = ./
 ifeq ($(OSTYPE),msys)
 	export EXEPOSTFIX = .exe
-else	
+else
 	export EXEPOSTFIX =
 endif
 	export SEP = /
@@ -319,7 +346,7 @@
 include lib/lib.mak
 include tools/tools.mak
 include boot/freeldr/bootsect/bootsect.mak
--include makefile.auto
+-include $(ROS_AUTOMAKE)
 
 PREAUTO := \
 	$(BIN2C_TARGET) \
@@ -332,7 +359,7 @@
 	$(NCI_SERVICE_FILES) \
 	$(GENDIB_DIB_FILES)
 
-makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
 
@@ -347,7 +374,7 @@
 
 $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
 	$(ECHO_WMC)
-	$(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC)
$(KERNEL32_MC)
+	$(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC)
$(KERNEL32_MC)
 
 .PHONY: msvc6
 msvc6: $(RBUILD_TARGET)
@@ -371,7 +398,7 @@
 
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
-	-@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)
+	-@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL)
 
 .PHONY: clean
 clean: makefile_auto_clean
  _____  

Copied: branches/alex-network-branch/reactos/ReactOS-ppc.xml (from rev
20311, trunk/reactos/ReactOS-ppc.xml)
  _____  

Modified: branches/alex-network-branch/reactos/ReactOS.xml
--- branches/alex-network-branch/reactos/ReactOS.xml	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/ReactOS.xml	2005-12-24
02:50:22 UTC (rev 20317)
@@ -10,6 +10,9 @@

 	<xi:include href="baseaddress.xml" />
 
 	<define name="_M_IX86" />
+	<define name="_X86_" />
+	<define name="__i386__" />
+	<define name="_REACTOS_" />
 	<if property="MP" value="1">
 		<define name="CONFIG_SMP" value="1" />
 	</if>
@@ -22,7 +25,7 @@
 		<compilerflag>-Wno-strict-aliasing</compilerflag>
 		<compilerflag>-ftracer</compilerflag>
 		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>            
 	</if>
 	<if property="KDBG" value="1">
 		<define name="KDBG" value="1" />
@@ -30,12 +33,15 @@
 	</if>
 	<compilerflag>-Wpointer-arith</compilerflag>
 
+	<include>.</include>
 	<include>include</include>
 	<include>include/reactos</include>
 	<include>include/libs</include>
 	<include>include/drivers</include>
 	<include>include/subsys</include>
+	<include>include/ndk</include>
 	<include>w32api/include</include>
+	<include>w32api/include/crt</include>
 	<include>w32api/include/ddk</include>
 
 	<directory name="apps">
  _____  

Modified: branches/alex-network-branch/reactos/apistatus.lst
--- branches/alex-network-branch/reactos/apistatus.lst	2005-12-23
20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apistatus.lst	2005-12-24
02:50:22 UTC (rev 20317)
@@ -11,15 +11,11 @@

 kernel32.dll reactos/lib/kernel32
 lz32.dll reactos/lib/lzexpand
 msvcrt.dll reactos/lib/msvcrt
-ole32.dll reactos/lib/ole32
-oleaut32.dll reactos/lib/oleaut32
 rpcrt4.dll reactos/lib/rpcrt4
 secur32.dll reactos/lib/secur32
-shell32.dll reactos/lib/shell32
 snmpapi.dll reactos/lib/snmpapi
 user32.dll reactos/lib/user32
 version.dll reactos/lib/version
-winmm.dll reactos/lib/winmm
 winspool.dll reactos/lib/winspool
 ws2_32.dll reactos/lib/ws2_32
 wsock32.dll reactos/lib/wsock32
  _____  

Modified: branches/alex-network-branch/reactos/apps/utils/directory.xml
--- branches/alex-network-branch/reactos/apps/utils/directory.xml
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/directory.xml
2005-12-24 02:50:22 UTC (rev 20317)
@@ -2,10 +2,16 @@

 <directory name="net">
 	<xi:include href="net/directory.xml" />
 </directory>
-<directory name="rosperf">
-	<xi:include href="rosperf/rosperf.xml" />
+<directory name="getfirefox">
+	<xi:include href="getfirefox/getfirefox.xml" />
 </directory>
+<directory name="shutdown">
+	<xi:include href="shutdown/shutdown.xml" />
+</directory>
 <directory name="ps">
 	<xi:include href="ps/ps.xml" />
 </directory>
+<directory name="rosperf">
+	<xi:include href="rosperf/rosperf.xml" />
+</directory>
 </group>
  _____  

Copied: branches/alex-network-branch/reactos/apps/utils/getfirefox (from
rev 20311, trunk/reactos/apps/utils/getfirefox)
Property changes on:
branches/alex-network-branch/reactos/apps/utils/getfirefox
___________________________________________________________________
Name: svn:ignore   + GNUmakefile 
  _____  

Modified: branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c
--- branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -28,6 +28,7 @@

  *
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +38,6 @@
 #include <winsock2.h>
 #include <iphlpapi.h>
 
-#define WIN32_LEAN_AND_MEAN
 #define UNICODE
 #define _UNICODE
 
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/err.c
--- branches/alex-network-branch/reactos/apps/utils/net/finger/err.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/finger/err.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -50,21 +50,10 @@

 extern char *__progname;		/* Program name, from crt0. */
 
 void
-#ifdef __STDC__
 err(int eval, const char *fmt, ...)
-#else
-err(eval, fmt, va_alist)
-	int eval;
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	verr(eval, fmt, ap);
 	va_end(ap);
 }
@@ -85,21 +74,10 @@
 }
 
 void
-#if __STDC__
 errx(int eval, const char *fmt, ...)
-#else
-errx(eval, fmt, va_alist)
-	int eval;
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	verrx(eval, fmt, ap);
 	va_end(ap);
 }
@@ -115,20 +93,10 @@
 }
 
 void
-#if __STDC__
 warn(const char *fmt, ...)
-#else
-warn(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vwarn(fmt, ap);
 	va_end(ap);
 }
@@ -150,20 +118,10 @@
 }
 
 void
-#ifdef __STDC__
 warnx(const char *fmt, ...)
-#else
-warnx(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vwarnx(fmt, ap);
 	va_end(ap);
 }
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c
--- branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -62,7 +62,6 @@

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "unistd.h"
 
 #include "various.h"
 #include "getopt.h"
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c
--- branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -50,7 +50,7 @@

 int	opterr = 1,		/* if error message should be printed */
 	optind = 1,		/* index into parent argv vector */
 	optopt;			/* character checked for validity */
-char	*optarg;		/* argument associated with option */
+const char	*optarg;		/* argument associated with
option */
 
 #define	BADCH	(int)'?'
 #define	EMSG	""
@@ -58,7 +58,7 @@
 int
 getopt(int nargc, char * const *nargv, const char *ostr)
 {
-	static char *place = EMSG;		/* option letter
processing */
+	static const char *place = EMSG;		/* option letter
processing */
 	register char *oli;			/* option letter list
index */
 	char *p;
 
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h
--- branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h
2005-12-24 02:50:22 UTC (rev 20317)
@@ -1,6 +1,6 @@

 /* getopt.h */
 
-extern char *optarg;
+extern const char *optarg;
 extern int optind;
 
 int
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/finger/net.c
--- branches/alex-network-branch/reactos/apps/utils/net/finger/net.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/finger/net.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -35,13 +35,15 @@

  */
 #include <sys/types.h>
 #include <winsock2.h>
-#include "unistd.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
 #include "various.h"
 
+int close(int);
+
 void
 netfinger(char *name)
 {
  _____  

Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c
--- branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -25,7 +25,7 @@

 //#include <sys/param.h>
 //#include <sys/wait.h>
 #include <sys/stat.h>
-#if !defined(WIN32)
+#ifndef _WIN32
 #include <sys/socket.h>
 #include <arpa/ftp.h>
 #include <netinet/in.h>
@@ -53,9 +53,9 @@
 extern off_t restart_point;
 extern char reply_string[];
 
-char *mname;
+const char *mname;
 jmp_buf jabort;
-char *dotrans(), *domap();
+const char *dotrans(), *domap();
 
 extern short portnum;
 extern char *hostname;
@@ -64,7 +64,7 @@
  * Connect to peer server and
  * auto-login, if possible.
  */
-void setpeer(int argc, char *argv[])
+void setpeer(int argc, const char *argv[])
 {
 	char *host;
 
@@ -154,8 +154,8 @@
 }
 
 struct	types {
-	char	*t_name;
-	char	*t_mode;
+	const char	*t_name;
+	const char	*t_mode;
 	int	t_type;
 	char	*t_arg;
 } types[] = {
@@ -171,13 +171,13 @@
  * Set transfer type.
  */
 void settype(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	register struct types *p;
 	int comret;
 
 	if (argc > 2) {
-		char *sep;
+		const char *sep;
 
 		printf("usage: %s [", argv[0]);
 		sep = " ";
@@ -216,7 +216,7 @@
 	}
 }
 
-char *stype[] = {
+const char *stype[] = {
 	"type",
 	"",
 	0
@@ -308,11 +308,11 @@
  */
 void put(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd;
+	const char *cmd;
 	int loc = 0;
-	char *oldargv1, *oldargv2;
+	const char *oldargv1, *oldargv2;
 
 	if (argc == 2) {
 		argc++;
@@ -374,12 +374,12 @@
  * Send multiple files.
  */
 void mput(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	register int i;
 	int ointer;
 	extern jmp_buf jabort;
-	char *tp;
+	const char *tp;
 
 	if (argc < 2) {
 		(void) strcat(line, " ");
@@ -505,13 +505,13 @@
 }
 
 void reget(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) getit(argc, argv, 1, "r+w");
 }
 
 void get(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) getit(argc, argv, 0, restart_point ? "r+w" : "w" );
 }
@@ -520,11 +520,11 @@
  * Receive one file.
  */
 int getit(argc, argv, restartit, mode)
-	char *argv[];
-	char *mode;
+	const char *argv[];
+	const char *mode;
 {
 	int loc = 0;
-	char *oldargv1, *oldargv2;
+	const char *oldargv1, *oldargv2;
 
 	if (argc == 2) {
 		argc++;
@@ -565,7 +565,8 @@
 		return (0);
 	}
 	if (loc && mcase) {
-		char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];
+		const char *tp = argv[1];
+        char *tp2, tmpbuf[MAXPATHLEN];
 
 		while (*tp && !islower(*tp)) {
 			tp++;
@@ -675,9 +676,10 @@
  * Get multiple files.
  */
 void mget(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
+	const char *cp, *tp;
+    char *tp2, tmpbuf[MAXPATHLEN];
 	int ointer;
 	extern jmp_buf jabort;
 
@@ -756,7 +758,8 @@
 	static FILE *ftemp = NULL;
 	static char **args;
 	int oldverbose, oldhash;
-	char *cp, *mode;
+	char *cp;
+    const char *mode;
 
 	if (!mflag) {
 		if (!doglob) {
@@ -808,7 +811,7 @@
 	return (buf);
 }
 
-static char *
+static const char *
 onoff(bool)
 	int bool;
 {
@@ -1002,7 +1005,7 @@
  * on remote machine.
  */
 void cd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1034,7 +1037,7 @@
  * on local machine.
  */
 void lcd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	char buf[MAXPATHLEN];
 
@@ -1064,7 +1067,7 @@
  * Delete a single file.
  */
 void delete(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1089,7 +1092,7 @@
  * Delete multiple files.
  */
 void mdelete(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	char *cp;
 	int ointer;
@@ -1139,7 +1142,7 @@
  * Rename a remote file.
  */
 void renamefile(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1178,9 +1181,9 @@
  * of remote files.
  */
 void ls(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd;
+	const char *cmd;
 
 	if (argc < 2)
 		argc++, argv[1] = NULL;
@@ -1211,9 +1214,10 @@
  * of multiple remote files.
  */
 void mls(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd, mode[1], *dest;
+	const char *cmd, *dest;
+	char mode[1];
 	int ointer, i;
 	extern jmp_buf jabort;
 
@@ -1395,7 +1399,7 @@
  */
 void user(argc, argv)
 	int argc;
-	char **argv;
+	const char **argv;
 {
 	char acct[80], *getpass();
 	int n, aflag = 0;
@@ -1466,7 +1470,7 @@
  * Make a directory.
  */
 void makedir(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1497,7 +1501,7 @@
  * Remove a directory.
  */
 void removedir(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1528,7 +1532,7 @@
  * Send a line, verbatim, to the remote machine.
  */
 void quote(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1565,7 +1569,7 @@
  */
 
 void site(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1597,7 +1601,7 @@
 }
 
 void do_chmod(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	if (argc == 2) {
 		printf("usage: %s mode file-name\n", argv[0]);
@@ -1692,7 +1696,7 @@
 }
 
 int confirm(cmd, file)
-	char *cmd, *file;
+	const char *cmd, *file;
 {
 	char line[BUFSIZ];
 
@@ -1721,7 +1725,7 @@
  * from the expression, we return only the first.
  */
 int globulize(cpp)
-	char **cpp;
+	const char **cpp;
 {
 	char **globbed;
 
@@ -1796,7 +1800,7 @@
 
 void doproxy(argc,argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
 	register struct cmd *c;
 	struct cmd *getcmd();
@@ -1901,12 +1905,13 @@
 	ntout[16] = '\0';
 }
 
-char *
+const char *
 dotrans(name)
-	char *name;
+	const char *name;
 {
 	static char new[MAXPATHLEN];
-	char *cp1, *cp2 = new;
+	const char *cp1;
+    char *cp2 = new;
 	register int i, ostop, found;
 
 	for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
@@ -1943,7 +1948,7 @@
 
 void setnmap(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
 	char *cp;
 
@@ -1983,13 +1988,14 @@
 	(void) strncpy(mapout, cp, MAXPATHLEN - 1);
 }
 
-char *
+const char *
 domap(name)
-	char *name;
+	const char *name;
 {
 	static char new[MAXPATHLEN];
-	register char *cp1 = name, *cp2 = mapin;
-	char *tp[9], *te[9];
+	const char *cp1 = name;
+    char *cpn, *cp2 = mapin;
+	const char *tp[9], *te[9];
 	int i, toks[9], toknum = 0, match = 1;
 
 	for (i=0; i < 9; ++i) {
@@ -2032,33 +2038,34 @@
 	{
 		toks[toknum] = 0;
 	}
-	cp1 = new;
-	*cp1 = '\0';
+
+	cpn = new;
+	*cpn = '\0';
 	cp2 = mapout;
 	while (*cp2) {
 		match = 0;
 		switch (*cp2) {
 			case '\\':
 				if (*(cp2 + 1)) {
-					*cp1++ = *++cp2;
+					*cpn++ = *++cp2;
 				}
 				break;
 			case '[':
 LOOP:
 				if (*++cp2 == '$' && isdigit(*(cp2+1)))
{
 					if (*++cp2 == '0') {
-						char *cp3 = name;
+						const char *cp3 = name;
 
 						while (*cp3) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 						match = 1;
 					}
 					else if (toks[toknum = *cp2 -
'1']) {
-						char *cp3 = tp[toknum];
+						const char *cp3 =
tp[toknum];
 
 						while (cp3 !=
te[toknum]) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 						match = 1;
 					}
@@ -2072,24 +2079,24 @@
 						else if (*cp2 == '$' &&
 
isdigit(*(cp2+1))) {
 							if (*++cp2 ==
'0') {
-							   char *cp3 =
name;
+							   const char
*cp3 = name;
 
 							   while (*cp3)
{
-								*cp1++ =
*cp3++;
+								*cpn++ =
*cp3++;
 							   }
 							}
 							else if
(toks[toknum =
 							    *cp2 - '1'])
{
-							   char
*cp3=tp[toknum];
+							   const char
*cp3=tp[toknum];
 
 							   while (cp3 !=
 
te[toknum]) {
-								*cp1++ =
*cp3++;
+								*cpn++ =
*cp3++;
 							   }
 							}
 						}
 						else if (*cp2) {
-							*cp1++ = *cp2++;
+							*cpn++ = *cp2++;
 						}
 					}
 					if (!*cp2) {
@@ -2126,29 +2133,29 @@
 			case '$':
 				if (isdigit(*(cp2 + 1))) {
 					if (*++cp2 == '0') {
-						char *cp3 = name;
+						const char *cp3 = name;
 
 						while (*cp3) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 					}
 					else if (toks[toknum = *cp2 -
'1']) {
-						char *cp3 = tp[toknum];
+						const char *cp3 =
tp[toknum];
 
 						while (cp3 !=
te[toknum]) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 					}
 					break;
 				}
 				/* intentional drop through */
 			default:
-				*cp1++ = *cp2;
+				*cpn++ = *cp2;
 				break;
 		}
 		cp2++;
 	}
-	*cp1 = '\0';
+	*cpn = '\0';
 	if (!*new) {
 		return(name);
 	}
@@ -2207,7 +2214,7 @@
 
 void macdef(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
 	char *tmp;
 	int c;
@@ -2283,7 +2290,7 @@
  * get size of file on remote machine
  */
 void sizecmd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -2308,7 +2315,7 @@
  * get last modification time of file on remote machine
  */
 void modtime(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int overbose;
 
@@ -2347,7 +2354,7 @@
  * show status on reomte machine
  */
 void rmtstatus(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }
@@ -2356,7 +2363,7 @@
  * get file if modtime is more recent than current file
  */
 void newer(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	if (getit(argc, argv, -1, "w")) {
 		printf("Local file \"%s\" is newer than remote file
\"%s\"\n",
  _____  

Modified:
branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c
--- branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -30,10 +30,11 @@

 
 void domacro(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
-	register int i, j;
-	register char *cp1, *cp2;
+	int i, j;
+	const char *cp1;
+    char *cp2;
 	int count = 2, loopflg = 0;
 	char line2[200];
 	struct cmd *getcmd(), *c;
  _____  

Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c
--- branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c
2005-12-23 20:47:54 UTC (rev 20316)
+++ branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c
2005-12-24 02:50:22 UTC (rev 20317)
@@ -113,7 +113,7 @@

 
 #endif
 
-char *fprintfSocket(int s, char *format, ...)
+const char *fprintfSocket(int s, const char *format, ...)
 {
    va_list argptr;
    char buffer[10009];
[truncated at 1000 lines; 178926 more skipped]