[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    branches/stable/l10n/scripts
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2005-12-24 15:54:18
Message-ID: 1135439658.591407.21299.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 491101 by goutte:

Do not allow trailing \r (Carriage Return) in .desktop files
(Backport of revision 490773)
CCMAIL:kde-i18n-doc@kde.org
(This might change some messages)


 M  +2 -0      apply.cc  
 M  +4 -0      createdesktop.pl  


--- branches/stable/l10n/scripts/apply.cc #491100:491101
@@ -1744,6 +1744,8 @@
         int len = strlen(in) - 1;
 	if (in[len] == '\n')
            in[len--] = 0;
+	if (in[len] == '\r')
+           in[len--] = 0;
 	while (in[len] == ' ')
 	   in[len--] = 0;
 
--- branches/stable/l10n/scripts/createdesktop.pl #491100:491101
@@ -67,6 +67,10 @@
                    $msgid =~ s/ +$//; # remove trailing spaces
 		   print STDERR "ERROR: white space at the end of $msgid in $filename\n";
 		}
+                if ($msgid =~ m/\r+$/) {
+                   $msgid =~ s/\r+$//; # remove trailing CR (Carriage Return)
+		   print STDERR "ERROR: CR at the end of $msgid in $filename\n";
+		}
 		$filename =~ s,^$basedir/,,;
                 print "#: $filename:$.\n";
                 print "msgid \"$msgid\"\n";
[prev in list] [next in list] [prev in thread] [next in thread]