GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #917

Browse source 
- Fixed bug #917, which mis-encoded quotes (thanks to Uli Martens).
- Added unit tests.
- Minor unrelated edits.
This commit is contained in:
Paul Beckingham 2012-02-02 22:58:36 -05:00
parent 89b5c91a35
commit 2ce9322a28
5 changed files with 70 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -240,6 +240,7 @@
to Paul-Gheorghe Barbu).
+ Fixed bug #901, which was preventing multiple IDs and UUIDs from being used
as a filter (thanks to Bryce Harrington).
+ Fixed bug #917, which mis-encoded quotes (thanks to Uli Martens).
# Untracked Bugs, biggest first.
+ Fixed bug that required the '%YAML' prologue in a YAML import.

6
src/Nibbler.cpp
View file

@ -67,10 +67,10 @@ Nibbler::Nibbler (const std::string& input)
////////////////////////////////////////////////////////////////////////////////
Nibbler::Nibbler (const Nibbler& other)
: _input (other._input)
, _length (other._length)
, _cursor (other._cursor)
{
_input = other._input;
_length = other._length;
_cursor = other._cursor;
}
////////////////////////////////////////////////////////////////////////////////

1
src/ViewTask.cpp
View file

@ -25,7 +25,6 @@
//
////////////////////////////////////////////////////////////////////////////////
#define L10N // Localization complete.
#include <ViewTask.h>

6
src/util.cpp
View file

@ -492,14 +492,12 @@ unsigned burndown_size (unsigned ntasks)
////////////////////////////////////////////////////////////////////////////////
// Encode values prior to serialization.
// " -> &dquot;
// [ -> &open;
// ] -> &close;
const std::string encode (const std::string& value)
{
std::string modified = value;
str_replace (modified, "\"", "&dquot;");
str_replace (modified, "[", "&open;");
str_replace (modified, "]", "&close;");
@ -521,14 +519,14 @@ const std::string decode (const std::string& value)
std::string modified = value;
// Supported encodings.
str_replace (modified, "&dquot;", "\"");
str_replace (modified, "&quot;", "'");
str_replace (modified, "&open;", "[");
str_replace (modified, "&close;", "]");
// Support for deprecated encodings. These cannot be removed or old files
// will not be parsable. Not just old files - completed.data can contain
// tasks formatted/encoded using these.
str_replace (modified, "&dquot;", "\"");
str_replace (modified, "&quot;", "'");
str_replace (modified, "&squot;", "'"); // Deprecated 2.0
str_replace (modified, "&comma;", ","); // Deprecated 2.0
str_replace (modified, "&colon;", ":"); // Deprecated 2.0

64
test/bug.917.t Executable file
View file

@ -0,0 +1,64 @@
#! /usr/bin/perl
################################################################################
## taskwarrior - a command line task list manager.
##
## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
##
## Permission is hereby granted, free of charge, to any person obtaining a copy
## of this software and associated documentation files (the "Software"), to deal
## in the Software without restriction, including without limitation the rights
## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
## copies of the Software, and to permit persons to whom the Software is
## furnished to do so, subject to the following conditions:
##
## The above copyright notice and this permission notice shall be included
## in all copies or substantial portions of the Software.
##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
## SOFTWARE.
##
## http://www.opensource.org/licenses/mit-license.php
##
################################################################################
use strict;
use warnings;
use Test::More tests => 6;
# Create the rc file.
if (open my $fh, '>', 'bug.rc')
{
print $fh "data.location=.\n",
"confirmation=off\n";
close $fh;
ok (-r 'bug.rc', 'Created bug.rc');
}
# Bug 917: escaping runs amok
qx{../src/task rc:bug.rc add one \\'two\\' three};
qx{../src/task rc:bug.rc add four \\"five\\" six};
my $output = qx{../src/task rc:bug.rc list};
like ($output, qr/one 'two' three/, 'Single quote preserved');
like ($output, qr/four "five" six/, 'Double quote preserved');
qx{../src/task rc:bug.rc 1,2 mod +tag};
$output = qx{../src/task rc:bug.rc list};
like ($output, qr/one 'two' three/, 'Single quote preserved after modification');
like ($output, qr/four "five" six/, 'Double quote preserved after modification');
# Cleanup.
unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.rc);
ok (! -r 'pending.data' &&
! -r 'completed.data' &&
! -r 'undo.data' &&
! -r 'backlog.data' &&
! -r 'synch.key' &&
! -r 'bug.rc', 'Cleanup');
exit 0;