Mercurial > octave

changeset 31943:c90de146a9ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge away extra head
author Arun Giridhar <arungiridhar@gmail.com>
date Tue, 28 Mar 2023 11:56:03 -0400
parents 7782d1ead0a0 (current diff) 9cd7515e735d (diff)
children 2a75c771c451
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc	Tue Mar 28 11:52:15 2023 -0400
+++ b/liboctave/util/url-transfer.cc	Tue Mar 28 11:56:03 2023 -0400
@@ -535,7 +535,12 @@
         if (newpos == std::string::npos)
           break;
 
-        retval(i) = str.substr(pos, newpos - pos);
+        std::string name = str.substr (pos, newpos - pos);
+        // remove trailing \r if there is one
+        if (name.length () > 0 && name.back () == '\r')
+          name.pop_back ();
+
+        retval(i) = name;
         pos = newpos + 1;
       }