[ros-diffs] [akhaldi] 61559: [FTP] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup headers including the main one. CORE-7716

Author: akhaldi
Date: Tue Jan  7 16:59:58 2014
New Revision: 61559

URL: http://svn.reactos.org/svn/reactos?rev=61559&view=rev
Log:
[FTP]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup headers including the main one.
CORE-7716

Modified:
    trunk/reactos/base/applications/network/ftp/cmds.c
    trunk/reactos/base/applications/network/ftp/cmdtab.c
    trunk/reactos/base/applications/network/ftp/domacro.c
    trunk/reactos/base/applications/network/ftp/fake.c
    trunk/reactos/base/applications/network/ftp/ftp.c
    trunk/reactos/base/applications/network/ftp/main.c
    trunk/reactos/base/applications/network/ftp/precomp.h
    trunk/reactos/base/applications/network/ftp/ruserpass.c

Modified: trunk/reactos/base/applications/network/ftp/cmds.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/cmds.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/cmds.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -15,17 +15,17 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+/*
+ * FTP User Program -- Command Routines.
+ */
+
+#include "precomp.h"
+
+#include "pathnames.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)cmds.c	5.18 (Berkeley) 4/20/89";
 #endif /* not lint */
-
-/*
- * FTP User Program -- Command Routines.
- */
-//#include <sys/param.h>
-//#include <sys/wait.h>
-
-#include "precomp.h"

extern	char *globerr;
 extern	char home[];

Modified: trunk/reactos/base/applications/network/ftp/cmdtab.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/cmdtab.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/cmdtab.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -15,11 +15,11 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+#include "precomp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)cmdtab.c	5.9 (Berkeley) 3/21/89";
 #endif /* not lint */
-
-#include "precomp.h"

/*
  * User FTP -- Command Tables.

Modified: trunk/reactos/base/applications/network/ftp/domacro.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/domacro.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/domacro.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -15,13 +15,13 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+
+
+#include "precomp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)domacro.c	1.6 (Berkeley) 2/28/89";
 #endif /* not lint */
-
-#include "precomp.h"
-//#include <errno.h>
-//#include <sys/ttychars.h>

void domacro(int argc, const char *argv[])
 {

Modified: trunk/reactos/base/applications/network/ftp/fake.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/fake.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/fake.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -1,4 +1,6 @@
 #include "precomp.h"
+
+#include <wincon.h>

#define MAX_ASCII 100

Modified: trunk/reactos/base/applications/network/ftp/ftp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/ftp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/ftp.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -1,6 +1,3 @@
-#define L_SET SEEK_SET
-#define L_INCR SEEK_CUR
-#define caddr_t void *
 /*
  * Copyright (c) 1985, 1989 Regents of the University of California.
  * All rights reserved.
@@ -18,11 +15,17 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+#include "precomp.h"
+
+#include <signal.h>
+
+#define L_SET SEEK_SET
+#define L_INCR SEEK_CUR
+#define caddr_t void *
+
 #ifndef lint
 static char sccsid[] = "@(#)ftp.c	5.28 (Berkeley) 4/20/89";
 #endif /* not lint */
-
-#include "precomp.h"

#ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 64

Modified: trunk/reactos/base/applications/network/ftp/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/main.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -15,6 +15,14 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+/*
+ * FTP User Program -- Command Interface.
+ */
+
+#include "precomp.h"
+
+#include <fcntl.h>
+
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1985, 1989 Regents of the University of California.\n\
@@ -24,11 +32,6 @@
 #ifndef lint
 static char sccsid[] = "@(#)main.c	based on 5.13 (Berkeley) 3/14/89";
 #endif /* not lint */
-
-/*
- * FTP User Program -- Command Interface.
- */
-#include "precomp.h"

#if defined(sun) && !defined(FD_SET)
 typedef int uid_t;

Modified: trunk/reactos/base/applications/network/ftp/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/precomp.h	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -1,5 +1,4 @@
 #include <sys/stat.h>
-//#include <sys/types.h>

#ifndef _WIN32
 #include <sys/param.h>
@@ -19,18 +18,12 @@
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <wincon.h>
 #define _INC_WINDOWS
 #include <winsock.h>
 #endif

-#include <signal.h>
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>

#include "ftp_var.h"
-#include "pathnames.h"
-//#include "prototypes.h"
-//#include "fake.h"

Modified: trunk/reactos/base/applications/network/ftp/ruserpass.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/ruserpass.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/ruserpass.c	[iso-8859-1] Tue Jan  7 16:59:58 2014
@@ -15,12 +15,11 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

+#include "precomp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)ruserpass.c	5.1 (Berkeley) 3/1/89";
 #endif /* not lint */
-
-#include "precomp.h"
-//#include <utmp.h>

struct	utmp *getutmp();
 static	FILE *cfile;