rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix stdin/stdout encoding on Windows. (#2425)

Browse Source 
QTextStream uses the system default locale, but this breaks in
various situations: (1) It does not work on the native Windows shell
(cmd.exe, Powershell), since the default Windows locale is Windows-1252,
but the shell uses Windows-850. (2) It also breaks on *nix systems where
the locale is Latin1 or C, which is the case for most CI systems or
build servers.

We allow overriding the detected codec by setting the ENCODING_OVERRIDE
environment variable, but otherwise prefer Windows-850 on Windows and
UTF-8 on any other system, even if LANG is set to something else.

This resolves #2413
This commit is contained in:
Janek Bevendorff
2018-10-28 19:55:00 +01:00
committed by GitHub
parent c9cab250c7
commit 7263dcddfe
19 changed files with 180 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/Merge.cpp
View File

@@ -18,8 +18,8 @@
#include "Merge.h"
#include <QCommandLineParser>
#include <QTextStream>
#include "cli/TextStream.h"
#include "core/Database.h"
#include "core/Merger.h"
#include "cli/Utils.h"
@@ -38,8 +38,8 @@ Merge::~Merge()
int Merge::execute(const QStringList& arguments)
{
QTextStream out(Utils::STDOUT, QIODevice::WriteOnly);
QTextStream err(Utils::STDERR, QIODevice::WriteOnly);
TextStream out(Utils::STDOUT, QIODevice::WriteOnly);
TextStream err(Utils::STDERR, QIODevice::WriteOnly);
QCommandLineParser parser;
parser.setApplicationDescription(description);