Attachment 85930 Details for Bug 50914 – allow zero-padded pagespecs

[patch] allow zero-padded pagespecs

allow-zero-padded-pagespecs.patch (text/plain), 1.07 KB, created by Daniel Kahn Gillmor on 2013-09-16 18:21:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Kahn Gillmor

Created: 2013-09-16 18:21:56 UTC

Size: 1.07 KB

patch

obsolete

>--- a/utils/pdfseparate.cc	2013-09-16 13:26:25.403397896 -0400
>+++ b/utils/pdfseparate.cc	2013-09-16 13:47:01.352602022 -0400
>@@ -61,9 +61,24 @@
>     lastPage = doc->getNumPages();
>   if (firstPage == 0)
>     firstPage = 1;
>-  if (firstPage != lastPage && strstr(destFileName, "%d") == NULL) {
>-    error(errSyntaxError, -1, "'{0:s}' must contain '%%d' if more than one page should be extracted", destFileName);
>-    return false;
>+  if (firstPage != lastPage) {
>+    bool foundmatch = false;
>+    if (strstr(destFileName, "%d") != NULL) {
>+      foundmatch = true;
>+    } else {
>+      char pattern[5];
>+      for (int i = 2; i < 10; i++) {
>+        sprintf(pattern, "%%0%dd", i);
>+        if (strstr(destFileName, pattern) != NULL) {
>+          foundmatch = true;
>+          break;
>+        }
>+      }
>+    }
>+    if (!foundmatch) {
>+      error(errSyntaxError, -1, "'{0:s}' must contain '%%d' if more than one page should be extracted", destFileName);
>+      return false;
>+    }
>   }
>   for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) {
>     sprintf (pathName, destFileName, pageNo);

Actions: View | Splinter Review

Attachments on bug 50914: 85930

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.