[Firebird-checkins] SF.net SVN: firebird:[54692]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <asf...@us...> - 2012-06-29 01:47:46
|
Revision: 54692 http://firebird.svn.sourceforge.net/firebird/?rev=54692&view=rev Author: asfernandes Date: 2012-06-29 01:47:40 +0000 (Fri, 29 Jun 2012) Log Message: ----------- Misc. Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-06-28 11:58:19 UTC (rev 54691) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-06-29 01:47:40 UTC (rev 54692) @@ -1014,7 +1014,7 @@ Array<char> stdinBuffer; do { - char *sendBlock = send; + char* sendBlock = send; USHORT sendSize = p - send; if (stdinRequest) { @@ -1046,6 +1046,7 @@ perror("stdin"); break; } + stdinRequest = n; sendBlock[sendSize] = isc_info_svc_line; sendBlock[sendSize + 1] = stdinRequest; @@ -1055,6 +1056,7 @@ stdinRequest = 0; } + if (isc_service_query(status, &svc_handle, 0, sendSize, sendBlock, static_cast<USHORT>(spbItems.getBufferLength()), reinterpret_cast<const char*>(spbItems.getBuffer()), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[54724]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <ale...@us...> - 2012-07-16 10:40:52
|
Revision: 54724 http://firebird.svn.sourceforge.net/firebird/?rev=54724&view=rev Author: alexpeshkoff Date: 2012-07-16 10:40:43 +0000 (Mon, 16 Jul 2012) Log Message: ----------- Removed debugging code Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-07-16 04:23:28 UTC (rev 54723) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-07-16 10:40:43 UTC (rev 54724) @@ -814,9 +814,6 @@ default: status_exception::raise(Arg::Gds(isc_fbsvcmgr_query_err) << Arg::Num(static_cast<unsigned char>(p[-1]))); -#ifdef DEV_BUILD - abort(); -#endif } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[57032]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <hv...@us...> - 2012-08-12 21:10:07
|
Revision: 57032 http://firebird.svn.sourceforge.net/firebird/?rev=57032&view=rev Author: hvlad Date: 2012-08-12 21:10:01 +0000 (Sun, 12 Aug 2012) Log Message: ----------- Make consistent usage of CRT routines in windows builds (perror() not aware of Win32 errors). Unify file IO API usage across POSIX\WIN32 platforms (use common read()\write() routines). Avoid usage of (questionable) gbak code in other utility. Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-08-12 18:00:53 UTC (rev 57031) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-08-12 21:10:01 UTC (rev 57032) @@ -38,7 +38,6 @@ #include "../common/utils_proto.h" #include "../common/classes/MsgPrint.h" #include "../jrd/license.h" -#include "../burp/std_desc.h" using namespace Firebird; @@ -534,22 +533,22 @@ bool printData(const char*& p) { - static DESC binout = INVALID_HANDLE_VALUE; - if (binout == INVALID_HANDLE_VALUE) + static int binout = -1; + if (binout == -1) { - binout = GBAK_STDOUT_DESC(); +#ifdef WIN_NT + binout = fileno(stdout); + setmode(binout, 0); +#else + binout = 1; +#endif } string s; bool rc = getLine(s, p); if (rc) { -#ifdef WIN_NT - DWORD cnt; - WriteFile(binout, s.c_str(), s.length(), &cnt, NULL); -#else write(binout, s.c_str(), s.length()); -#endif } return rc; } @@ -1026,19 +1025,19 @@ sendBlock = stdinBuffer.getBuffer(len + 1); memcpy(sendBlock, send, sendSize); - static DESC binIn = INVALID_HANDLE_VALUE; - if (binIn == INVALID_HANDLE_VALUE) + static int binIn = -1; + if (binIn == -1) { - binIn = GBAK_STDIN_DESC(); - } - #ifdef WIN_NT - DWORD n; - if (!ReadFile(binIn, &sendBlock[sendSize + 1 + 2], stdinRequest, &n, NULL)) + binIn = fileno(stdin); + setmode(binIn, 0); #else + binIn = 0; +#endif + } + int n = read(binIn, &sendBlock[sendSize + 1 + 2], stdinRequest); if (n < 0) -#endif { perror("stdin"); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[57185]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <hv...@us...> - 2012-10-01 07:41:22
|
Revision: 57185 http://firebird.svn.sourceforge.net/firebird/?rev=57185&view=rev Author: hvlad Date: 2012-10-01 07:41:11 +0000 (Mon, 01 Oct 2012) Log Message: ----------- Missed include Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-09-30 14:43:52 UTC (rev 57184) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-10-01 07:41:11 UTC (rev 57185) @@ -28,6 +28,7 @@ #include "firebird.h" #include <signal.h> +#include <io.h> #include <stdio.h> #include <stdlib.h> #include <string.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[57202]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <ale...@us...> - 2012-10-03 09:19:46
|
Revision: 57202 http://firebird.svn.sourceforge.net/firebird/?rev=57202&view=rev Author: alexpeshkoff Date: 2012-10-03 09:19:37 +0000 (Wed, 03 Oct 2012) Log Message: ----------- misc Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-10-02 08:50:36 UTC (rev 57201) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2012-10-03 09:19:37 UTC (rev 57202) @@ -28,7 +28,9 @@ #include "firebird.h" #include <signal.h> +#ifdef WIN_NT #include <io.h> +#endif #include <stdio.h> #include <stdlib.h> #include <string.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[58234]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <ale...@us...> - 2013-06-24 08:36:52
|
Revision: 58234 http://sourceforge.net/p/firebird/code/58234 Author: alexpeshkoff Date: 2013-06-24 08:36:46 +0000 (Mon, 24 Jun 2013) Log Message: ----------- Avoid adding incompatible info item to pure info requests Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2013-06-24 00:31:00 UTC (rev 58233) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2013-06-24 08:36:46 UTC (rev 58234) @@ -997,7 +997,11 @@ if (spbItems.getBufferLength() > 0) { - spbItems.insertTag(isc_info_svc_stdin); + if (fb_utils::isRunningCheck(spbItems.getBuffer(), spbItems.getBufferLength())) + { + // running service may request stdin data + spbItems.insertTag(isc_info_svc_stdin); + } // use one second timeout to poll service char send[16]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[59637]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <asf...@us...> - 2014-05-28 14:59:41
|
Revision: 59637 http://sourceforge.net/p/firebird/code/59637 Author: asfernandes Date: 2014-05-28 14:59:38 +0000 (Wed, 28 May 2014) Log Message: ----------- Apply patch "Removed white space before bracket" by Jiri Cincura. Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2014-05-28 06:39:57 UTC (rev 59636) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2014-05-28 14:59:38 UTC (rev 59637) @@ -1103,7 +1103,7 @@ sendBlock[sendSize] = isc_info_svc_line; sendBlock[sendSize + 1] = stdinRequest; sendBlock[sendSize + 2] = stdinRequest >> 8; - sendBlock [sendSize + 1 + 2 + stdinRequest] = isc_info_end; + sendBlock[sendSize + 1 + 2 + stdinRequest] = isc_info_end; sendSize += (1 + 2 + stdinRequest + 1); stdinRequest = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[60579]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <hv...@us...> - 2015-01-28 17:13:00
|
Revision: 60579 http://sourceforge.net/p/firebird/code/60579 Author: hvlad Date: 2015-01-28 17:12:57 +0000 (Wed, 28 Jan 2015) Log Message: ----------- Correct use of CRT. Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-01-28 17:00:12 UTC (rev 60578) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-01-28 17:12:57 UTC (rev 60579) @@ -29,6 +29,7 @@ #include "firebird.h" #include <signal.h> #ifdef WIN_NT +#include <fcntl.h> #include <io.h> #endif #include <stdio.h> @@ -554,7 +555,7 @@ { #ifdef WIN_NT binout = fileno(stdout); - setmode(binout, 0); + _setmode(binout, _O_BINARY); #else binout = 1; #endif @@ -1090,7 +1091,7 @@ { #ifdef WIN_NT binIn = fileno(stdin); - setmode(binIn, 0); + _setmode(binIn, _O_BINARY); #else binIn = 0; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[61998]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <hv...@us...> - 2015-07-15 14:15:00
|
Revision: 61998 http://sourceforge.net/p/firebird/code/61998 Author: hvlad Date: 2015-07-15 14:14:57 +0000 (Wed, 15 Jul 2015) Log Message: ----------- Fixed bug CORE-4876 fbsvcmgr shows wrong options for some Trace API services in help screen Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-07-15 12:07:25 UTC (rev 61997) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-07-15 14:14:57 UTC (rev 61998) @@ -501,7 +501,6 @@ const SvcSwitches traceChgStateOptions[] = { - {"trc_name", putStringArgument, 0, isc_spb_trc_name, 0}, {"trc_id", putNumericArgument, 0, isc_spb_trc_id, 0}, {0, 0, 0, 0, 0} }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
[Firebird-checkins] SF.net SVN: firebird:[62425]
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr .cpp
From: <ale...@us...> - 2015-10-26 16:55:39
|
Revision: 62425 http://sourceforge.net/p/firebird/code/62425 Author: alexpeshkoff Date: 2015-10-26 16:55:37 +0000 (Mon, 26 Oct 2015) Log Message: ----------- Do not type "invalid service handle" error message after pressing ctrl-C (as Vlad requested) Modified Paths: -------------- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp Modified: firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp =================================================================== --- firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-10-26 15:07:17 UTC (rev 62424) +++ firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp 2015-10-26 16:55:37 UTC (rev 62425) @@ -1005,8 +1005,8 @@ static void ctrl_c_handler(int signal) { - if (signal == SIGINT) - terminated = true; + terminated = true; + printf("\n"); if (prevCtrlCHandler) prevCtrlCHandler(signal); @@ -1175,7 +1175,8 @@ reinterpret_cast<const char*>(spbItems.getBuffer()), sizeof(results), results)) { - isc_print_status(status); + if (!terminated) + isc_print_status(status); isc_service_detach(status, &svc_handle); return 1; } @@ -1184,7 +1185,8 @@ if (isc_service_detach(status, &svc_handle)) { - isc_print_status(status); + if (!terminated) + isc_print_status(status); return 1; } return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |