Use QUtil::path_basename

Jay Berkenbilt
1 parent 0b1623d0
Showing 3 changed files with 5 additions and 26 deletions
examples/pdf-attach-file.cc
qpdf/qpdf.cc
qpdf/qtest/qpdf.test
@@ -60,16 +60,7 @@ static void process(char const* infilename, char const* password,
             ">>"));
     // Create a file spec.
-    std::string key(attachment);
-    size_t pos = key.find_last_of("/\\");
-    if (pos != std::string::npos)
-    {
-        key = key.substr(pos + 1);
-    }
-    if (key.empty())
-    {
-        throw std::runtime_error("can't get last path element of attachment");
-    }
+    std::string key = QUtil::path_basename(attachment);
     std::cout << whoami << ": attaching " << attachment << " as " << key
               << std::endl;
     auto fs = QPDFFileSpecObjectHelper::createFileSpec(q, key, attachment);
@@ -2873,16 +2873,10 @@ ArgParser::argEndAddAttachment()
     {
         usage("add attachment: no path specified");
     }
-    std::string last_element = cur.path;
-    size_t pathsep = cur.path.find_last_of("/\\");
-    if (pathsep != std::string::npos)
+    std::string last_element = QUtil::path_basename(cur.path);
+    if (last_element.empty())
     {
-        last_element = cur.path.substr(pathsep + 1);
-        if (last_element.empty())
-        {
-            usage("path for --add-attachment may not end"
-                  " with a path separator");
-        }
+        usage("path for --add-attachment may not be empty");
     }
     if (cur.filename.empty())
     {
@@ -523,7 +523,7 @@ $td-&gt;runtest(&quot;page operations on form xobject&quot;,
 show_ntests();
 # ----------
 $td->notify("--- File Attachments ---");
-$n_tests += 34;
+$n_tests += 33;
 open(F, ">auto-txt") or die;
 print F "from file";
@@ -598,12 +598,6 @@ $td-&gt;runtest(&quot;add attachment: bad mod date&quot;,
 	     $td->NORMALIZE_NEWLINES);
 $td->runtest("add attachment: trailing slash",
 	     {$td->COMMAND => "qpdf minimal.pdf a.pdf" .
-                  " --add-attachment auto-txt/ --"},
-	     {$td->REGEXP => ".*may not end with a path separator.*",
-                  $td->EXIT_STATUS => 2},
-	     $td->NORMALIZE_NEWLINES);
-$td->runtest("add attachment: trailing slash",
-	     {$td->COMMAND => "qpdf minimal.pdf a.pdf" .
                   " --add-attachment --"},
 	     {$td->REGEXP => ".*add attachment: no path specified.*",
                   $td->EXIT_STATUS => 2},