mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-15 00:44:19 +09:00
d7566f5f5a
* client: Fix exit codes for /help and similar option Currently, non-zero exit code is returned for /version, /buildconfig, /help, /monitor-list, /kbd-list and /kbd-lang-list command-line options for several clients. This is against conventions because 0 is usually returned in such cases. Also, there is potentially another problem that the returned codes overflow on UNIX systems (where the exit code is a number between 0 and 255). Let's fix the clients to return 0 in the mentioned cases to honor conventions and 1 for the command-line parsing errors (or -1 for clients who already use that value). Fixes: https://github.com/FreeRDP/FreeRDP/issues/6686 * Refactored freerdp_client_settings_command_line_status_print_ex Now returns 0 if help or version information was requested. * Do not eliminate original error status. Co-authored-by: akallabeth <akallabeth@posteo.net>
88 lines
2.1 KiB
C
88 lines
2.1 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* X11 Client
|
|
*
|
|
* Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
* Copyright 2012 HP Development Company, LLC
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <winpr/crt.h>
|
|
#include <winpr/synch.h>
|
|
#include <winpr/thread.h>
|
|
|
|
#include <freerdp/freerdp.h>
|
|
#include <freerdp/client/cmdline.h>
|
|
|
|
#include "../xf_client.h"
|
|
#include "../xfreerdp.h"
|
|
|
|
int main(int argc, char* argv[])
|
|
{
|
|
int rc = 1;
|
|
int status;
|
|
HANDLE thread;
|
|
xfContext* xfc;
|
|
DWORD dwExitCode;
|
|
rdpContext* context;
|
|
rdpSettings* settings;
|
|
RDP_CLIENT_ENTRY_POINTS clientEntryPoints;
|
|
|
|
ZeroMemory(&clientEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS));
|
|
clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS);
|
|
clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION;
|
|
|
|
RdpClientEntry(&clientEntryPoints);
|
|
|
|
context = freerdp_client_context_new(&clientEntryPoints);
|
|
if (!context)
|
|
return 1;
|
|
|
|
settings = context->settings;
|
|
xfc = (xfContext*)context;
|
|
|
|
status = freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE);
|
|
if (status)
|
|
{
|
|
BOOL list = settings->ListMonitors;
|
|
|
|
rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
|
|
|
|
if (list)
|
|
xf_list_monitors(xfc);
|
|
|
|
goto out;
|
|
}
|
|
|
|
if (freerdp_client_start(context) != 0)
|
|
goto out;
|
|
|
|
thread = freerdp_client_get_thread(context);
|
|
|
|
WaitForSingleObject(thread, INFINITE);
|
|
GetExitCodeThread(thread, &dwExitCode);
|
|
rc = xf_exit_code_from_disconnect_reason(dwExitCode);
|
|
|
|
freerdp_client_stop(context);
|
|
|
|
out:
|
|
freerdp_client_context_free(context);
|
|
|
|
return rc;
|
|
}
|