mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-09-19 16:01:55 +00:00
b1cad17a14
Extract call to GLib's g_utf8_get_char_validated() and the associated
workaround to also read NUL characters into a separate function to make
PipeCapture::OnReadable() a little smaller and simpler, so easier to
understand.
Add max_len > 0 clause into get_utf8_char_validated() like this:
if (uc == UTF8_PARTIAL && max_len > 0)
so that the NUL character reading workaround is only applied when
max_len specifies the maximum number of bytes to read, rather than
when -1 specifies reading a NUL termination string. This makes
get_utf8_char_validated() a complete wrapper of
g_utf8_get_char_validated() [1], even though GParted always specifies
the maximum number of bytes to read.
No longer describe the inability to read NUL characters as a bug [2]
since the GLib author's said it wasn't [3].
[1] GLib Reference Manual, Unicode Manipulation Functions,
g_utf8_get_char_validated ()
https://developer.gnome.org/glib/stable/glib-Unicode-Manipulation.html#g-utf8-get-char-validated
[2] 8dbbb47ce2
Workaround g_utf8_get_char_validate() bug with embedded NUL bytes
(#777973)
[3] Bug 780095 - g_utf8_get_char_validated() stopping at nul byte even
for length specified buffers
https://bugzilla.gnome.org/show_bug.cgi?id=780095#18
"If g_utf8_get_char_validated() encounters a nul byte in the
middle of a string of given longer length, it returns -2,
indicating a partial gunichar. That is not the obvious
behaviour, but since g_utf8_get_char_validated() has been API
for a long time, the behaviour cannot be changed.
"
Closes #136 - 1.2.0: test suite is failing in test_PipeCapture
65 lines
2.4 KiB
C++
65 lines
2.4 KiB
C++
/* Copyright (C) 2013 Phillip Susi
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GPARTED_PIPECAPTURE_H
|
|
#define GPARTED_PIPECAPTURE_H
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <stddef.h> // typedef size_t
|
|
#include <glib.h> // typedef gunichar
|
|
#include <glibmm/ustring.h>
|
|
#include <glibmm/refptr.h>
|
|
#include <glibmm/iochannel.h>
|
|
|
|
namespace GParted {
|
|
|
|
// captures output pipe of subprocess into a ustring and emits a signal on eof
|
|
class PipeCapture
|
|
{
|
|
public:
|
|
PipeCapture( int fd, Glib::ustring &buffer );
|
|
~PipeCapture();
|
|
|
|
void connect_signal();
|
|
sigc::signal<void> signal_eof;
|
|
sigc::signal<void> signal_update;
|
|
|
|
private:
|
|
bool OnReadable( Glib::IOCondition condition );
|
|
static gboolean _OnReadable( GIOChannel *source,
|
|
GIOCondition condition,
|
|
gpointer data );
|
|
static void append_unichar_vector_to_utf8( std::string & str,
|
|
const std::vector<gunichar> & ucvec );
|
|
static gunichar get_utf8_char_validated(const char *p, gssize max_len);
|
|
static int utf8_char_length( unsigned char firstbyte );
|
|
|
|
Glib::RefPtr<Glib::IOChannel> channel; // Wrapper around fd
|
|
char * readbuf; // Bytes read from IOChannel (fd)
|
|
size_t fill_offset; // Filling offset into readbuf
|
|
std::vector<gunichar> linevec; // Current line stored as UCS-4 characters
|
|
size_t cursor; // Cursor position index into linevec
|
|
std::string capturebuf; // Captured output as UTF-8 characters
|
|
size_t line_start; // Index into bytebuf where current line starts
|
|
Glib::ustring & callerbuf; // Reference to caller supplied buffer
|
|
bool callerbuf_uptodate; // Has capturebuf changed since last copied to callerbuf?
|
|
};
|
|
|
|
} // namepace GParted
|
|
|
|
#endif /* GPARTED_PIPECAPTURE_H */
|