fenix
/
cpdf-source
mirror of https://github.com/johnwhitington/cpdf-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filename.quote and path separator for Win32

This commit is contained in:
John Whitington 2014-11-23 17:02:32 +00:00
parent 18b87d3bbd
commit 824a700329
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cpdf.ml
View File

@ -2,11 +2,15 @@
open Pdfutil open Pdfutil
open Pdfio open Pdfio
let system_path_separator =
match Sys.os_type with "Win32" -> ';' | _ -> ':'
(* Find the location of the cpdflin binary, either in a provided place (with (* Find the location of the cpdflin binary, either in a provided place (with
-cpdflin), or in the current directory or in $PATH. *) -cpdflin), or in the current directory or in $PATH. *)
let rec paths_of_chars prev = function let rec paths_of_chars prev = function
[] -> keep (fun x -> x <> "") (map implode (rev (map rev prev))) [] -> keep (fun x -> x <> "") (map implode (rev (map rev prev)))
| ':'::t -> paths_of_chars ([] :: prev) t | pathsep::t when pathsep = system_path_separator ->
paths_of_chars ([] :: prev) t
| h::t -> | h::t ->
match prev with match prev with
[] -> paths_of_chars [[h]] t [] -> paths_of_chars [[h]] t
@ -17,27 +21,29 @@ let paths () =
let is_at_path file path = let is_at_path file path =
let full = path ^ Filename.dir_sep ^ file in let full = path ^ Filename.dir_sep ^ file in
Printf.printf "Looking for %s\n%!" full;
if Sys.file_exists full then Some full else None if Sys.file_exists full then Some full else None
let find_cpdflin provided = let find_cpdflin provided =
match provided with match provided with
Some x -> Some x Some x -> Some x
| None -> | None ->
if Sys.file_exists "cpdflin" then Some "./cpdflin" else let dotslash = match Sys.os_type with "Win32" -> "" | _ -> "./" in
if Sys.file_exists "cpdflin.exe" then Some "./cpdflin.exe" else if Sys.file_exists "cpdflin" then Some (dotslash ^ "cpdflin") else
if Sys.file_exists "qpdf" then Some "./qpdf" else if Sys.file_exists "cpdflin.exe" then Some (dotslash ^ "cpdflin.exe") else
if Sys.file_exists "qpdf.exe" then Some "./qpdf.exe" else if Sys.file_exists "qpdf" then Some (dotslash ^ "qpdf") else
if Sys.file_exists "qpdf.exe" then Some (dotslash ^ "qpdf.exe") else
match option_map (is_at_path "cpdflin") (paths ()) with match option_map (is_at_path "cpdflin") (paths ()) with
h::_ -> Some h h::_ -> Some (Filename.quote h)
| _ -> | _ ->
match option_map (is_at_path "cpdflin.exe") (paths ()) with match option_map (is_at_path "cpdflin.exe") (paths ()) with
h::_ -> Some h h::_ -> Some (Filename.quote h)
| _ -> | _ ->
match option_map (is_at_path "qpdf") (paths ()) with match option_map (is_at_path "qpdf") (paths ()) with
h::_ -> Some h h::_ -> Some (Filename.quote h)
| _ -> | _ ->
match option_map (is_at_path "qpdf") (paths ()) with match option_map (is_at_path "qpdf") (paths ()) with
h::_ -> Some h h::_ -> Some (Filename.quote h)
| _ -> None | _ -> None
(* Call cpdflin, given the (temp) input name, the output name, and the location (* Call cpdflin, given the (temp) input name, the output name, and the location
@ -47,8 +53,9 @@ let call_cpdflin cpdflin temp output best_password =
cpdflin ^ " --linearize " ^ " --password=" ^ best_password ^ " " ^ cpdflin ^ " --linearize " ^ " --password=" ^ best_password ^ " " ^
Filename.quote temp ^ " " ^ Filename.quote output Filename.quote temp ^ " " ^ Filename.quote output
in in
print_endline command;
match Sys.os_type with match Sys.os_type with
"win32" -> "Win32" ->
(* On windows, don't use LD_LIBRARY_PATH - it will happen automatically *) (* On windows, don't use LD_LIBRARY_PATH - it will happen automatically *)
Sys.command command Sys.command command
| _ -> | _ ->