[dreimer] 67419: [ROSAPPS] Add "net" subfolder to build and add all stuff which was built by rbuild TOO. Remove useless include I added last time. Fix some warnings in ncftp to keep the -Wno-* at a...
Author: dreimer Date: Sat Apr 25 17:11:17 2015 New Revision: 67419
URL: http://svn.reactos.org/svn/reactos?rev=67419&view=rev Log: [ROSAPPS] Add "net" subfolder to build and add all stuff which was built by rbuild TOO. Remove useless include I added last time. Fix some warnings in ncftp to keep the -Wno-* at a minimum
Added: trunk/rosapps/applications/net/CMakeLists.txt (with props) trunk/rosapps/applications/net/ncftp/CMakeLists.txt (with props) trunk/rosapps/applications/net/netreg/CMakeLists.txt (with props) trunk/rosapps/applications/net/niclist/CMakeLists.txt (with props) trunk/rosapps/applications/net/roshttpd/CMakeLists.txt (with props) trunk/rosapps/applications/net/tditest/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt trunk/rosapps/applications/fraginator/CMakeLists.txt trunk/rosapps/applications/net/ncftp/libncftp/ftp.c trunk/rosapps/applications/net/ncftp/libncftp/util.c trunk/rosapps/applications/net/ncftp/ncftp/cmds.c trunk/rosapps/applications/net/ncftp/ncftp/getline.c trunk/rosapps/applications/net/ncftp/ncftp/main.c trunk/rosapps/applications/net/ncftp/ncftp/util.c
Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.txt... ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -3,7 +3,7 @@ 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)
Modified: trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdihv... ============================================================================== --- trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1,5 +1,3 @@ - -include_directories(${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND SOURCE gdihv.c
Modified: trunk/rosapps/applications/fraginator/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/CMa... ============================================================================== --- trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1,7 +1,5 @@
set_cpp(WITH_RUNTIME WITH_STL) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND SOURCE Fraginator.cpp
Added: trunk/rosapps/applications/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/CMakeLists... ============================================================================== --- trunk/rosapps/applications/net/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -0,0 +1,5 @@ +add_subdirectory(ncftp) +add_subdirectory(netreg) +add_subdirectory(niclist) +add_subdirectory(roshttpd) +add_subdirectory(tditest)
Propchange: trunk/rosapps/applications/net/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/net/ncftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/CMak... ============================================================================== --- trunk/rosapps/applications/net/ncftp/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/ncftp/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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)
Propchange: trunk/rosapps/applications/net/ncftp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rosapps/applications/net/ncftp/libncftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/libn... ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/ftp.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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 sigjmp_buf gCancelConnectJmp; #else static jmp_buf gCancelConnectJmp; -#endif /* HAVE_SIGSETJMP */ - -#endif /* NO_SIGNALS */ +#endif + +#endif */
#ifndef lint
Modified: trunk/rosapps/applications/net/ncftp/libncftp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/libn... ============================================================================== --- trunk/rosapps/applications/net/ncftp/libncftp/util.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/libncftp/util.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -13,13 +13,13 @@ #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
Modified: trunk/rosapps/applications/net/ncftp/ncftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncft... ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/cmds.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/cmds.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1375,7 +1375,7 @@ 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 @@ char options[32]; char option[2]; volatile int listmode; - FILE *volatile stream; + FILE *stream; volatile int paging;
@@ -1703,7 +1703,7 @@
-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 @@ Trace(0, "Sys: %s\n", cmd); (void) system(cmd); #endif -} /* Sys */ +}*/
Modified: trunk/rosapps/applications/net/ncftp/ncftp/getline.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncft... ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/getline.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -28,8 +28,8 @@ # 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 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;
Modified: trunk/rosapps/applications/net/ncftp/ncftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncft... ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/main.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -122,7 +122,7 @@ 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. */
Modified: trunk/rosapps/applications/net/ncftp/ncftp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncft... ============================================================================== --- trunk/rosapps/applications/net/ncftp/ncftp/util.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/ncftp/ncftp/util.c [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -1132,7 +1132,7 @@ 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 */
Added: trunk/rosapps/applications/net/netreg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/CMa... ============================================================================== --- trunk/rosapps/applications/net/netreg/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/netreg/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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)
Propchange: trunk/rosapps/applications/net/netreg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/net/niclist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/niclist/CM... ============================================================================== --- trunk/rosapps/applications/net/niclist/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/niclist/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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)
Propchange: trunk/rosapps/applications/net/niclist/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/net/roshttpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/C... ============================================================================== --- trunk/rosapps/applications/net/roshttpd/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/roshttpd/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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)
Propchange: trunk/rosapps/applications/net/roshttpd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/net/tditest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/CM... ============================================================================== --- trunk/rosapps/applications/net/tditest/CMakeLists.txt (added) +++ trunk/rosapps/applications/net/tditest/CMakeLists.txt [iso-8859-1] Sat Apr 25 17:11:17 2015 @@ -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)
Propchange: trunk/rosapps/applications/net/tditest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
-
dreimer＠svn.reactos.org