[ROSAPPS] Add "net" subfolder to build and add all stuff which was built by rbuild...

svn path=/trunk/; revision=67419

diff --git a/rosapps/applications/CMakeLists.txt b/rosapps/applications/CMakeLists.txt
index 5e83791..c053b06 100644 (file)
--- a/rosapps/applications/CMakeLists.txt
+++ b/rosapps/applications/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(devutils)
 add_subdirectory(explorer-old)
 add_subdirectory(fraginator)
 add_subdirectory(imagesoft)
-#add_subdirectory(net)
+add_subdirectory(net)
 add_subdirectory(notevil)
 add_subdirectory(screensavers)
 add_subdirectory(sysutils)

diff --git a/rosapps/applications/devutils/gdihv/CMakeLists.txt b/rosapps/applications/devutils/gdihv/CMakeLists.txt
index c8d36e8..1ede06a 100644 (file)
--- a/rosapps/applications/devutils/gdihv/CMakeLists.txt
+++ b/rosapps/applications/devutils/gdihv/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 list(APPEND SOURCE
        gdihv.c
        gdihv.rc

diff --git a/rosapps/applications/fraginator/CMakeLists.txt b/rosapps/applications/fraginator/CMakeLists.txt
index 1795105..c55082b 100644 (file)
--- a/rosapps/applications/fraginator/CMakeLists.txt
+++ b/rosapps/applications/fraginator/CMakeLists.txt
@@ -1,8 +1,6 @@
 
 set_cpp(WITH_RUNTIME WITH_STL)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 list(APPEND SOURCE
        Fraginator.cpp
        MainDialog.cpp

diff --git a/rosapps/applications/net/CMakeLists.txt b/rosapps/applications/net/CMakeLists.txt
new file mode 100644 (file)
index 0000000..338f970
--- /dev/null
+++ b/rosapps/applications/net/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory(ncftp)
+add_subdirectory(netreg)
+add_subdirectory(niclist)
+add_subdirectory(roshttpd)
+add_subdirectory(tditest)

diff --git a/rosapps/applications/net/ncftp/CMakeLists.txt b/rosapps/applications/net/ncftp/CMakeLists.txt
new file mode 100644 (file)
index 0000000..71bb206
--- /dev/null
+++ b/rosapps/applications/net/ncftp/CMakeLists.txt
@@ -0,0 +1,75 @@
+
+list(APPEND SOURCE
+    sio/PRead.c
+    sio/PWrite.c
+    sio/SAcceptA.c
+    sio/SAcceptS.c
+    sio/SBind.c
+    sio/SClose.c
+    sio/SConnect.c
+    sio/SConnectByName.c
+    sio/SNew.c
+    sio/SRead.c
+    sio/SReadline.c
+    sio/SRecv.c
+    sio/SRecvfrom.c
+    sio/SRecvmsg.c
+    sio/SSelect.c
+    sio/SSend.c
+    sio/SSendto.c
+    sio/SSendtoByName.c
+    sio/SWrite.c
+    sio/SocketUtil.c
+    sio/StrAddr.c
+    sio/UAcceptA.c
+    sio/UAcceptS.c
+    sio/UBind.c
+    sio/UConnect.c
+    sio/UConnectByName.c
+    sio/UNew.c
+    sio/URecvfrom.c
+    sio/USendto.c
+    sio/USendtoByName.c
+    sio/SError.c
+    sio/SWait.c
+    sio/main.c
+    Strn/Dynscat.c
+    Strn/Strncpy.c
+    Strn/Strncat.c
+    Strn/Strntok.c
+    Strn/Strnpcpy.c
+    Strn/Strnpcat.c
+    Strn/strtokc.c
+    Strn/version.c
+    libncftp/open.c
+    libncftp/cmds.c
+    libncftp/util.c
+    libncftp/rcmd.c
+    libncftp/ftp.c
+    libncftp/io.c
+    libncftp/errno.c
+    libncftp/linelist.c
+    libncftp/glob.c
+    ncftp/cmds.c
+    ncftp/cmdlist.c
+    ncftp/getopt.c
+    ncftp/ls.c
+    ncftp/main.c
+    ncftp/version.c
+    ncftp/shell.c
+    ncftp/util.c
+    ncftp/readln.c
+    ncftp/progress.c
+    ncftp/bookmark.c
+    ncftp/pref.c
+    ncftp/preffw.c
+    ncftp/trace.c
+    ncftp/spool.c
+    ncftp/log.c
+    ncftp/getline.c)
+
+add_executable(ncftp ${SOURCE} ncftp.rc)
+set_module_type(ncftp win32cui)
+add_target_compile_flags(ncftp "-Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-format-extra-args")
+add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32)
+add_cd_file(TARGET ncftp DESTINATION reactos FOR all)

diff --git a/rosapps/applications/net/ncftp/libncftp/ftp.c b/rosapps/applications/net/ncftp/libncftp/ftp.c
index 43f4156..9c24d26 100644 (file)
--- a/rosapps/applications/net/ncftp/libncftp/ftp.c
+++ b/rosapps/applications/net/ncftp/libncftp/ftp.c
@@ -10,7 +10,7 @@
 
 char gLibNcFTPVersion[64] = kLibraryVersion;
 
-#ifdef NO_SIGNALS
+/* #ifdef NO_SIGNALS
 static char gNoSignalsMarker[] = "@(#) LibNcFTP - NO_SIGNALS";
 #else
 
@@ -19,9 +19,9 @@ static int gGotSig = 0;
 static sigjmp_buf gCancelConnectJmp;
 #else
 static jmp_buf gCancelConnectJmp;
-#endif /* HAVE_SIGSETJMP */
+#endif
 
-#endif /* NO_SIGNALS */
+#endif */
 
 
 #ifndef lint

diff --git a/rosapps/applications/net/ncftp/libncftp/util.c b/rosapps/applications/net/ncftp/libncftp/util.c
index 914fe56..674fd86 100644 (file)
--- a/rosapps/applications/net/ncftp/libncftp/util.c
+++ b/rosapps/applications/net/ncftp/libncftp/util.c
@@ -13,13 +13,13 @@ extern void GetSpecialDir(char *dst, size_t size, int whichDir);
 #endif
 
 
-static void *
+/* static void *
 Realloc(void *ptr, size_t siz)
 {
        if (ptr == NULL)
                return (void *) malloc(siz);
        return ((void *) realloc(ptr, siz));
-}      /* Realloc */
+}*/
 
 
 /* Use getcwd/getwd to get the full path of the current local

diff --git a/rosapps/applications/net/ncftp/ncftp/cmds.c b/rosapps/applications/net/ncftp/ncftp/cmds.c
index b8b8d30..d90e897 100644 (file)
--- a/rosapps/applications/net/ncftp/ncftp/cmds.c
+++ b/rosapps/applications/net/ncftp/ncftp/cmds.c
@@ -1375,7 +1375,7 @@ ListCmd(const int argc, const char **const argv, const CommandPtr cmdp, const Ar
        char options[32];
        char option[2];
        volatile int listmode;
-       FILE *volatile stream;
+       FILE *stream;
        volatile int paging;
 #if defined(WIN32) || defined(_WINDOWS)
 #else
@@ -1557,7 +1557,7 @@ LocalListCmd(const int argc, const char **const argv, const CommandPtr cmdp, con
        char options[32];
        char option[2];
        volatile int listmode;
-       FILE *volatile stream;
+       FILE *stream;
        volatile int paging;
 
 
@@ -1703,7 +1703,7 @@ LocalListCmd(const int argc, const char **const argv, const CommandPtr cmdp, con
 
 
 
-static void
+/* static void
 Sys(const int argc, const char **const argv, const ArgvInfoPtr aip, const char *syscmd, int noDQuote)
 {
        char cmd[256];
@@ -1730,7 +1730,7 @@ Sys(const int argc, const char **const argv, const ArgvInfoPtr aip, const char *
        Trace(0, "Sys: %s\n", cmd);
        (void) system(cmd);
 #endif
-}      /* Sys */
+}*/
 
 
 

diff --git a/rosapps/applications/net/ncftp/ncftp/getline.c b/rosapps/applications/net/ncftp/ncftp/getline.c
index c4cc0e3..23996d4 100644 (file)
--- a/rosapps/applications/net/ncftp/ncftp/getline.c
+++ b/rosapps/applications/net/ncftp/ncftp/getline.c
@@ -28,8 +28,8 @@ static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris
 #      include <conio.h>
 #      include <io.h>
 #      include <fcntl.h>
-#      define strcasecmp stricmp
-#      define strncasecmp strnicmp
+// #   define strcasecmp stricmp
+// #   define strncasecmp strnicmp
 #      define sleep(a) Sleep(a * 1000)
 #      ifndef S_ISREG
 #              define S_ISREG(m)      (((m) & _S_IFMT) == _S_IFREG)
@@ -152,8 +152,8 @@ static char     gl_killbuf[GL_BUF_SIZE]=""; /* killed text */
 static const char *gl_prompt;          /* to save the prompt string */
 static char     gl_intrc = 0;          /* keyboard SIGINT char */
 static char     gl_quitc = 0;          /* keyboard SIGQUIT char */
-static char     gl_suspc = 0;          /* keyboard SIGTSTP char */
-static char     gl_dsuspc = 0;         /* delayed SIGTSTP char */
+// static char     gl_suspc = 0;               /* keyboard SIGTSTP char */
+// static char     gl_dsuspc = 0;              /* delayed SIGTSTP char */
 static int      gl_search_mode = 0;    /* search mode flag */
 static char   **gl_matchlist = 0;
 static char    *gl_home_dir = NULL;

diff --git a/rosapps/applications/net/ncftp/ncftp/main.c b/rosapps/applications/net/ncftp/ncftp/main.c
index 5577235..418aa60 100644 (file)
--- a/rosapps/applications/net/ncftp/ncftp/main.c
+++ b/rosapps/applications/net/ncftp/ncftp/main.c
@@ -122,7 +122,7 @@ InitConnectionInfo(void)
        UseTrace();
        (void) STRNCPY(gConn.user, "anonymous");
        gConn.host[0] = '\0';
-       gConn.progress = gProgressMeter;
+       gConn.progress = NULL;
        gTransferTypeInitialized = 0;
        gTransferType = kTypeBinary;
        gConn.leavePass = 1;            /* Don't let the lib zap it. */

diff --git a/rosapps/applications/net/ncftp/ncftp/util.c b/rosapps/applications/net/ncftp/ncftp/util.c
index 57cefff..a323a69 100644 (file)
--- a/rosapps/applications/net/ncftp/ncftp/util.c
+++ b/rosapps/applications/net/ncftp/ncftp/util.c
@@ -1132,7 +1132,7 @@ void SysPerror(const char *const errMsg)
                NULL
                );
 
-       if (reason[strlen(reason) - 1] = '\n')
+       if (reason[strlen(reason) - 1] == '\n')
                reason[strlen(reason) - 1] = '\0';
        (void) fprintf(stderr, "%s: %s\n", errMsg, reason);
 }      /* SysPerror */

diff --git a/rosapps/applications/net/netreg/CMakeLists.txt b/rosapps/applications/net/netreg/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a646064
--- /dev/null
+++ b/rosapps/applications/net/netreg/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+set_cpp(WITH_RUNTIME WITH_STL)
+add_executable(netreg netreg.cpp netreg.rc)
+set_module_type(netreg win32cui)
+add_importlibs(netreg advapi32 user32 ws2_32 msvcrt kernel32)
+add_cd_file(TARGET netreg DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/net/niclist/CMakeLists.txt b/rosapps/applications/net/niclist/CMakeLists.txt
new file mode 100644 (file)
index 0000000..730f9e3
--- /dev/null
+++ b/rosapps/applications/net/niclist/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(niclist niclist.c niclist.rc)
+set_module_type(niclist win32cui)
+add_importlibs(niclist user32 msvcrt kernel32)
+add_cd_file(TARGET niclist DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/net/roshttpd/CMakeLists.txt b/rosapps/applications/net/roshttpd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..90268be
--- /dev/null
+++ b/rosapps/applications/net/roshttpd/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+set_cpp(WITH_RUNTIME WITH_STL WITH_EXCEPTIONS)
+include_directories(BEFORE include)
+add_compile_flags("-D__USE_W32_SOCKETS")
+
+list(APPEND SOURCE
+    config.cpp
+    error.cpp
+    http.cpp
+    httpd.cpp
+    roshttpd.cpp
+    common/list.cpp
+    common/socket.cpp
+    common/thread.cpp)
+
+add_executable(roshttpd ${SOURCE} common/roshttpd.rc)
+set_module_type(roshttpd win32cui)
+add_importlibs(roshttpd user32 ws2_32 msvcrt kernel32)
+add_cd_file(TARGET roshttpd DESTINATION reactos FOR all)

diff --git a/rosapps/applications/net/tditest/CMakeLists.txt b/rosapps/applications/net/tditest/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4c42ee5
--- /dev/null
+++ b/rosapps/applications/net/tditest/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+include_directories(include)
+add_executable(tditest tditest/tditest.c tditest.rc)
+set_module_type(tditest kernelmodedriver)
+target_link_libraries(tditest ${PSEH_LIB})
+add_importlibs(tditest ntoskrnl hal)
+add_cd_file(TARGET tditest DESTINATION reactos/system32/drivers FOR all)