From fae0bc9d9ba0359d0f3d26325762e93a8e63c209 Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Wed, 16 Jun 2004 16:58:46 +0000
Subject: [PATCH] PR#1938

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 driver/pparse.ml   |  4 +++-
 stdlib/sys.ml      |  2 +-
 tools/ocamlprof.ml | 16 ++++++++--------
 utils/ccomp.ml     |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/driver/pparse.ml b/driver/pparse.ml
index da65a5525..0622ddad9 100644
--- a/driver/pparse.ml
+++ b/driver/pparse.ml
@@ -23,7 +23,9 @@ let preprocess sourcefile =
     None -> sourcefile
   | Some pp ->
       let tmpfile = Filename.temp_file "camlpp" "" in
-      let comm = Printf.sprintf "%s %s > %s" pp sourcefile tmpfile in
+      let comm = Printf.sprintf "%s %s > %s"
+                                pp (Filename.quote sourcefile) tmpfile
+      in
       if Ccomp.command comm <> 0 then begin
         Misc.remove_file tmpfile;
         raise Error;
diff --git a/stdlib/sys.ml b/stdlib/sys.ml
index f9c256cb7..d1478525c 100644
--- a/stdlib/sys.ml
+++ b/stdlib/sys.ml
@@ -78,4 +78,4 @@ let catch_break on =
 
 (* OCaml version string, must be in the format described in sys.mli. *)
 
-let ocaml_version = "3.07+21 (2004-06-14)";;
+let ocaml_version = "3.07+22 (2004-06-16)";;
diff --git a/tools/ocamlprof.ml b/tools/ocamlprof.ml
index 6ae04d3db..d283162fb 100644
--- a/tools/ocamlprof.ml
+++ b/tools/ocamlprof.ml
@@ -22,7 +22,7 @@ open Misc
 open Parsetree
 
 (* User programs must not use identifiers that start with these prefixes. *)
-let idprefix = "__ocaml_prof";;
+let idprefix = "__ocaml_prof_";;
 let modprefix = "OCAML__prof_";;
 
 
@@ -88,10 +88,10 @@ let add_incr_counter modul (kind,pos) =
    | Close -> fprintf !outchan ")";
    | Open ->
          fprintf !outchan
-                 "(%sArray.set %s_cnt_%s %d \
-                               (%sPervasives.succ (%sArray.get %s_cnt_%s %d)); "
-                 modprefix idprefix modul !prof_counter
-                 modprefix modprefix idprefix modul !prof_counter;
+                 "(%sArray.set %s_cnt %d \
+                               (%sPervasives.succ (%sArray.get %s_cnt %d)); "
+                 modprefix idprefix !prof_counter
+                 modprefix modprefix idprefix !prof_counter;
          incr prof_counter;
 ;;
 
@@ -132,12 +132,12 @@ let init_rewrite modes mod_name =
   if !instr_mode then begin
     fprintf !outchan "module %sArray = Array;; " modprefix;
     fprintf !outchan "module %sPervasives = Pervasives;; " modprefix;
-    fprintf !outchan "let %s_cnt_%s = Array.create 0000000" idprefix mod_name;
+    fprintf !outchan "let %s_cnt = Array.create 0000000" idprefix;
     pos_len := pos_out !outchan;
     fprintf !outchan 
             " 0;; Profiling.counters := \
-              (\"%s\", (\"%s\", %s_cnt_%s)) :: !Profiling.counters;; "
-            mod_name modes idprefix mod_name
+              (\"%s\", (\"%s\", %s_cnt)) :: !Profiling.counters;; "
+            mod_name modes idprefix;
   end
 
 let final_rewrite add_function =
diff --git a/utils/ccomp.ml b/utils/ccomp.ml
index 1e065666b..f98ba6985 100644
--- a/utils/ccomp.ml
+++ b/utils/ccomp.ml
@@ -25,7 +25,7 @@ let command cmdline =
 let run_command cmdline = ignore(command cmdline)
 
 (* Build @responsefile to work around Windows limitations on 
-   command-length line *)
+   command-line length *)
 let build_diversion lst =
   let (responsefile, oc) = Filename.open_temp_file "camlresp" "" in
   List.iter