PR#1249

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5197 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

byterun/.depend

@@ -3,10 +3,10 @@ alloc.o: alloc.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   stacks.h
 array.o: array.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h
-backtrace.o: backtrace.c config.h ../config/m.h ../config/s.h \
- mlvalues.h misc.h alloc.h io.h instruct.h intext.h fix_code.h exec.h \
- startup.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- sys.h backtrace.h
+backtrace.o: backtrace.c config.h ../config/m.h ../config/s.h mlvalues.h \
+  misc.h alloc.h io.h instruct.h intext.h fix_code.h exec.h startup.h \
+  stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h \
+  backtrace.h
 callback.o: callback.c callback.h mlvalues.h config.h ../config/m.h \
   ../config/s.h misc.h fail.h memory.h gc.h major_gc.h freelist.h \
   minor_gc.h interp.h instruct.h fix_code.h stacks.h
@@ -22,9 +22,9 @@ custom.o: custom.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 debugger.o: debugger.c config.h ../config/m.h ../config/s.h debugger.h \
   misc.h mlvalues.h fail.h fix_code.h instruct.h intext.h io.h stacks.h \
   memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
-dynlink.o: dynlink.c config.h ../config/m.h ../config/s.h alloc.h \
- misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h osdeps.h prims.h
+dynlink.o: dynlink.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h osdeps.h prims.h
 extern.o: extern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h memory.h \
   major_gc.h freelist.h minor_gc.h reverse.h
@@ -32,8 +32,8 @@ fail.o: fail.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h minor_gc.h \
   printexc.h signals.h stacks.h
 finalise.o: finalise.c callback.h mlvalues.h config.h ../config/m.h \
- ../config/s.h misc.h fail.h roots.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h signals.h
+  ../config/s.h misc.h fail.h roots.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h signals.h
 fix_code.o: fix_code.c config.h ../config/m.h ../config/s.h debugger.h \
   misc.h mlvalues.h fix_code.h instruct.h md5.h io.h memory.h gc.h \
   major_gc.h freelist.h minor_gc.h reverse.h
@@ -42,9 +42,9 @@ floats.o: floats.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   reverse.h stacks.h
 freelist.o: freelist.c config.h ../config/m.h ../config/s.h freelist.h \
   misc.h mlvalues.h gc.h gc_ctrl.h major_gc.h
-gc_ctrl.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h \
- ../config/s.h mlvalues.h compact.h custom.h finalise.h roots.h \
- memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h stacks.h
+gc_ctrl.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+  mlvalues.h compact.h custom.h finalise.h roots.h memory.h gc.h \
+  major_gc.h freelist.h minor_gc.h gc_ctrl.h stacks.h
 globroots.o: globroots.c memory.h config.h ../config/m.h ../config/s.h \
   gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h globroots.h
 hash.o: hash.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
@@ -60,9 +60,12 @@ interp.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 ints.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h custom.h fail.h intext.h io.h fix_code.h memory.h gc.h \
   major_gc.h freelist.h minor_gc.h int64_native.h
-io.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
- mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h freelist.h \
- minor_gc.h signals.h sys.h
+io-hack.o: io-hack.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h custom.h debugger.h fail.h io.h memory.h gc.h major_gc.h \
+  freelist.h minor_gc.h signals.h sys.h
+io.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h mlvalues.h \
+  custom.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
+  signals.h sys.h
 lexing.o: lexing.c fail.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 macintosh.o: macintosh.c misc.h config.h ../config/m.h ../config/s.h \
@@ -80,35 +83,35 @@ memory.o: memory.c fail.h misc.h config.h ../config/m.h ../config/s.h \
 meta.o: meta.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h fix_code.h interp.h major_gc.h freelist.h memory.h \
   gc.h minor_gc.h prims.h stacks.h
-minor_gc.o: minor_gc.c config.h ../config/m.h ../config/s.h fail.h \
- misc.h mlvalues.h finalise.h roots.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h gc_ctrl.h signals.h
-misc.o: misc.c config.h ../config/m.h ../config/s.h misc.h memory.h \
- gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
+minor_gc.o: minor_gc.c config.h ../config/m.h ../config/s.h fail.h misc.h \
+  mlvalues.h finalise.h roots.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h gc_ctrl.h signals.h
+misc.o: misc.c config.h ../config/m.h ../config/s.h misc.h memory.h gc.h \
+  mlvalues.h major_gc.h freelist.h minor_gc.h
 mpwtool.o: mpwtool.c
 obj.o: obj.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h gc.h major_gc.h freelist.h memory.h minor_gc.h \
   prims.h
 parsing.o: parsing.c config.h ../config/m.h ../config/s.h mlvalues.h \
   misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h alloc.h
-prims.o: prims.c mlvalues.h config.h ../config/m.h ../config/s.h \
- misc.h prims.h
+prims.o: prims.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
+  prims.h
 printexc.o: printexc.c backtrace.h mlvalues.h config.h ../config/m.h \
   ../config/s.h misc.h callback.h debugger.h fail.h printexc.h
 roots.o: roots.c finalise.h roots.h misc.h config.h ../config/m.h \
- ../config/s.h memory.h gc.h mlvalues.h major_gc.h freelist.h \
- minor_gc.h globroots.h stacks.h
+  ../config/s.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h \
+  globroots.h stacks.h
 rotatecursor.o: rotatecursor.c rotatecursor.h
-signals.o: signals.c alloc.h misc.h config.h ../config/m.h \
- ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h roots.h signals.h sys.h
+signals.o: signals.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+  mlvalues.h callback.h fail.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h roots.h signals.h sys.h
 stacks.o: stacks.c config.h ../config/m.h ../config/s.h fail.h misc.h \
   mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
-startup.o: startup.c config.h ../config/m.h ../config/s.h alloc.h \
- misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
- dynlink.h exec.h fail.h fix_code.h gc_ctrl.h instrtrace.h interp.h \
- intext.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h osdeps.h \
- prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h
+startup.o: startup.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h backtrace.h callback.h custom.h debugger.h dynlink.h exec.h \
+  fail.h fix_code.h gc_ctrl.h instrtrace.h interp.h intext.h io.h \
+  memory.h gc.h major_gc.h freelist.h minor_gc.h osdeps.h prims.h \
+  printexc.h reverse.h signals.h stacks.h sys.h startup.h
 str.o: str.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h
 sys.o: sys.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
@@ -127,10 +130,10 @@ alloc.d.o: alloc.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   stacks.h
 array.d.o: array.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h minor_gc.h
-backtrace.d.o: backtrace.c config.h ../config/m.h ../config/s.h \
- mlvalues.h misc.h alloc.h io.h instruct.h intext.h fix_code.h exec.h \
- startup.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
- sys.h backtrace.h
+backtrace.d.o: backtrace.c config.h ../config/m.h ../config/s.h mlvalues.h \
+  misc.h alloc.h io.h instruct.h intext.h fix_code.h exec.h startup.h \
+  stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h \
+  backtrace.h
 callback.d.o: callback.c callback.h mlvalues.h config.h ../config/m.h \
   ../config/s.h misc.h fail.h memory.h gc.h major_gc.h freelist.h \
   minor_gc.h interp.h instruct.h fix_code.h stacks.h
@@ -146,9 +149,9 @@ custom.d.o: custom.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 debugger.d.o: debugger.c config.h ../config/m.h ../config/s.h debugger.h \
   misc.h mlvalues.h fail.h fix_code.h instruct.h intext.h io.h stacks.h \
   memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
-dynlink.d.o: dynlink.c config.h ../config/m.h ../config/s.h alloc.h \
- misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h osdeps.h prims.h
+dynlink.d.o: dynlink.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h osdeps.h prims.h
 extern.d.o: extern.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h memory.h \
   major_gc.h freelist.h minor_gc.h reverse.h
@@ -156,8 +159,8 @@ fail.d.o: fail.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h minor_gc.h \
   printexc.h signals.h stacks.h
 finalise.d.o: finalise.c callback.h mlvalues.h config.h ../config/m.h \
- ../config/s.h misc.h fail.h roots.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h signals.h
+  ../config/s.h misc.h fail.h roots.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h signals.h
 fix_code.d.o: fix_code.c config.h ../config/m.h ../config/s.h debugger.h \
   misc.h mlvalues.h fix_code.h instruct.h md5.h io.h memory.h gc.h \
   major_gc.h freelist.h minor_gc.h reverse.h
@@ -166,9 +169,9 @@ floats.d.o: floats.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   reverse.h stacks.h
 freelist.d.o: freelist.c config.h ../config/m.h ../config/s.h freelist.h \
   misc.h mlvalues.h gc.h gc_ctrl.h major_gc.h
-gc_ctrl.d.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h \
- ../config/s.h mlvalues.h compact.h custom.h finalise.h roots.h \
- memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h stacks.h
+gc_ctrl.d.o: gc_ctrl.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+  mlvalues.h compact.h custom.h finalise.h roots.h memory.h gc.h \
+  major_gc.h freelist.h minor_gc.h gc_ctrl.h stacks.h
 globroots.d.o: globroots.c memory.h config.h ../config/m.h ../config/s.h \
   gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h globroots.h
 hash.d.o: hash.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
@@ -185,9 +188,12 @@ interp.d.o: interp.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
 ints.d.o: ints.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h custom.h fail.h intext.h io.h fix_code.h memory.h gc.h \
   major_gc.h freelist.h minor_gc.h int64_native.h
-io.d.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
- mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h freelist.h \
- minor_gc.h signals.h sys.h
+io-hack.d.o: io-hack.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h custom.h debugger.h fail.h io.h memory.h gc.h major_gc.h \
+  freelist.h minor_gc.h signals.h sys.h
+io.d.o: io.c config.h ../config/m.h ../config/s.h alloc.h misc.h mlvalues.h \
+  custom.h fail.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
+  signals.h sys.h
 lexing.d.o: lexing.c fail.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
 macintosh.d.o: macintosh.c misc.h config.h ../config/m.h ../config/s.h \
@@ -205,35 +211,35 @@ memory.d.o: memory.c fail.h misc.h config.h ../config/m.h ../config/s.h \
 meta.d.o: meta.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h fix_code.h interp.h major_gc.h freelist.h memory.h \
   gc.h minor_gc.h prims.h stacks.h
-minor_gc.d.o: minor_gc.c config.h ../config/m.h ../config/s.h fail.h \
- misc.h mlvalues.h finalise.h roots.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h gc_ctrl.h signals.h
-misc.d.o: misc.c config.h ../config/m.h ../config/s.h misc.h memory.h \
- gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
+minor_gc.d.o: minor_gc.c config.h ../config/m.h ../config/s.h fail.h misc.h \
+  mlvalues.h finalise.h roots.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h gc_ctrl.h signals.h
+misc.d.o: misc.c config.h ../config/m.h ../config/s.h misc.h memory.h gc.h \
+  mlvalues.h major_gc.h freelist.h minor_gc.h
 mpwtool.d.o: mpwtool.c
 obj.d.o: obj.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h gc.h major_gc.h freelist.h memory.h minor_gc.h \
   prims.h
 parsing.d.o: parsing.c config.h ../config/m.h ../config/s.h mlvalues.h \
   misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h alloc.h
-prims.d.o: prims.c mlvalues.h config.h ../config/m.h ../config/s.h \
- misc.h prims.h
+prims.d.o: prims.c mlvalues.h config.h ../config/m.h ../config/s.h misc.h \
+  prims.h
 printexc.d.o: printexc.c backtrace.h mlvalues.h config.h ../config/m.h \
   ../config/s.h misc.h callback.h debugger.h fail.h printexc.h
 roots.d.o: roots.c finalise.h roots.h misc.h config.h ../config/m.h \
- ../config/s.h memory.h gc.h mlvalues.h major_gc.h freelist.h \
- minor_gc.h globroots.h stacks.h
+  ../config/s.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h \
+  globroots.h stacks.h
 rotatecursor.d.o: rotatecursor.c rotatecursor.h
-signals.d.o: signals.c alloc.h misc.h config.h ../config/m.h \
- ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h major_gc.h \
- freelist.h minor_gc.h roots.h signals.h sys.h
+signals.d.o: signals.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
+  mlvalues.h callback.h fail.h memory.h gc.h major_gc.h freelist.h \
+  minor_gc.h roots.h signals.h sys.h
 stacks.d.o: stacks.c config.h ../config/m.h ../config/s.h fail.h misc.h \
   mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h
-startup.d.o: startup.c config.h ../config/m.h ../config/s.h alloc.h \
- misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
- dynlink.h exec.h fail.h fix_code.h gc_ctrl.h instrtrace.h interp.h \
- intext.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h osdeps.h \
- prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h
+startup.d.o: startup.c config.h ../config/m.h ../config/s.h alloc.h misc.h \
+  mlvalues.h backtrace.h callback.h custom.h debugger.h dynlink.h exec.h \
+  fail.h fix_code.h gc_ctrl.h instrtrace.h interp.h intext.h io.h \
+  memory.h gc.h major_gc.h freelist.h minor_gc.h osdeps.h prims.h \
+  printexc.h reverse.h signals.h stacks.h sys.h startup.h
 str.d.o: str.c alloc.h misc.h config.h ../config/m.h ../config/s.h \
   mlvalues.h fail.h
 sys.d.o: sys.c config.h ../config/m.h ../config/s.h alloc.h misc.h \

byterun/io.c

@@ -485,14 +485,17 @@ CAMLprim value channel_descriptor(value vchannel)
 
 CAMLprim value caml_close_channel(value vchannel)
 {
+  int result;
+
   /* For output channels, must have flushed before */
   struct channel * channel = Channel(vchannel);
-  close(channel->fd);
+  result = close(channel->fd);
   channel->fd = -1;
   /* Ensure that every read or write on the channel will cause an
      immediate flush_partial or refill, thus raising a Sys_error
      exception */
   channel->curr = channel->max = channel->end;
+  if (result == -1) sys_error (NO_ARG);
   return Val_unit;
 }
 

otherlibs/threads/pervasives.ml

@@ -348,7 +348,10 @@ external pos_out : out_channel -> int = "caml_pos_out"
 external out_channel_length : out_channel -> int = "caml_channel_size"
 external close_out_channel : out_channel -> unit = "caml_close_channel"
 
-let close_out oc = flush oc; close_out_channel oc
+let close_out oc = (try flush oc with _ -> ()); close_out_channel oc
+let close_out_noerr oc =
+  (try flush oc with _ -> ());
+  (try close_out_channel oc with _ -> ())
 external set_binary_mode_out : out_channel -> bool -> unit
                              = "caml_set_binary_mode"
 
@@ -453,6 +456,7 @@ external seek_in : in_channel -> int -> unit = "caml_seek_in"
 external pos_in : in_channel -> int = "caml_pos_in"
 external in_channel_length : in_channel -> int = "caml_channel_size"
 external close_in : in_channel -> unit = "caml_close_channel"
+let close_in_noerr ic = (try close_in ic with _ -> ());;
 external set_binary_mode_in : in_channel -> bool -> unit
                             = "caml_set_binary_mode"
 

stdlib/.depend

@@ -41,8 +41,8 @@ int64.cmo: int32.cmi obj.cmi pervasives.cmi int64.cmi
 int64.cmx: int32.cmx obj.cmx pervasives.cmx int64.cmi 
 lazy.cmo: obj.cmi lazy.cmi 
 lazy.cmx: obj.cmx lazy.cmi 
-lexing.cmo: string.cmi sys.cmi lexing.cmi 
-lexing.cmx: string.cmx sys.cmx lexing.cmi 
+lexing.cmo: array.cmi string.cmi sys.cmi lexing.cmi 
+lexing.cmx: array.cmx string.cmx sys.cmx lexing.cmi 
 list.cmo: list.cmi 
 list.cmx: list.cmi 
 listLabels.cmo: list.cmi listLabels.cmi 
@@ -65,8 +65,10 @@ pervasives.cmo: pervasives.cmi
 pervasives.cmx: pervasives.cmi 
 printexc.cmo: obj.cmi printf.cmi sys.cmi printexc.cmi 
 printexc.cmx: obj.cmx printf.cmx sys.cmx printexc.cmi 
-printf.cmo: buffer.cmi char.cmi list.cmi obj.cmi string.cmi printf.cmi 
-printf.cmx: buffer.cmx char.cmx list.cmx obj.cmx string.cmx printf.cmi 
+printf.cmo: buffer.cmi char.cmi list.cmi obj.cmi string.cmi sys.cmi \
+    printf.cmi 
+printf.cmx: buffer.cmx char.cmx list.cmx obj.cmx string.cmx sys.cmx \
+    printf.cmi 
 queue.cmo: obj.cmi queue.cmi 
 queue.cmx: obj.cmx queue.cmi 
 random.cmo: array.cmi char.cmi digest.cmi string.cmi random.cmi 

stdlib/pervasives.ml

@@ -271,9 +271,10 @@ external seek_out : out_channel -> int -> unit = "caml_seek_out"
 external pos_out : out_channel -> int = "caml_pos_out"
 external out_channel_length : out_channel -> int = "caml_channel_size"
 external close_out_channel : out_channel -> unit = "caml_close_channel"
-let close_out oc =
-  begin try flush oc with _ -> () end;
-  close_out_channel oc
+let close_out oc = (try flush oc with _ -> ()); close_out_channel oc
+let close_out_noerr oc =
+  (try flush oc with _ -> ());
+  (try close_out_channel oc with _ -> ())
 external set_binary_mode_out : out_channel -> bool -> unit
                              = "caml_set_binary_mode"
 
@@ -348,6 +349,7 @@ external seek_in : in_channel -> int -> unit = "caml_seek_in"
 external pos_in : in_channel -> int = "caml_pos_in"
 external in_channel_length : in_channel -> int = "caml_channel_size"
 external close_in : in_channel -> unit = "caml_close_channel"
+let close_in_noerr ic = (try close_in ic with _ -> ());;
 external set_binary_mode_in : in_channel -> bool -> unit
                             = "caml_set_binary_mode"
 

stdlib/pervasives.mli

@@ -617,7 +617,13 @@ val close_out : out_channel -> unit
 (** Close the given channel, flushing all buffered write operations.
    Output functions raise a [Sys_error] exception when they are
    applied to a closed output channel, except [close_out] and [flush],
-   which do nothing when applied to an already closed channel. *)
+   which do nothing when applied to an already closed channel.
+   Note that [close_out] may raise [Sys_error] if the operating
+   system signals an error when closing the underlying file descriptor. *)
+
+val close_out_noerr : out_channel -> unit
+(** Same as [close_out], but ignore all errors and never raise
+    [Sys_error]. *)
 
 val set_binary_mode_out : out_channel -> bool -> unit
 (** [set_binary_mode_out oc true] sets the channel [oc] to binary
@@ -720,7 +726,13 @@ val close_in : in_channel -> unit
 (** Close the given channel.  Input functions raise a [Sys_error]
   exception when they are applied to a closed input channel,
   except [close_in], which does nothing when applied to an already
-  closed channel. *)
+  closed channel.  Note that [close_in] may raise [Sys_error] if
+  the operating system signals an error when closing the underlying
+  file descriptor. *)
+
+val close_in_noerr : in_channel -> unit
+(** Same as [close_in], but ignore any errors and never raise
+    [Sys_error]. *)
 
 val set_binary_mode_in : in_channel -> bool -> unit
 (** [set_binary_mode_in ic true] sets the channel [ic] to binary

stdlib/sys.ml

@@ -75,7 +75,6 @@ let catch_break on =
     set_signal sigint Signal_default
 
 
-(* OCaml version string, moved from utils/config.mlp.
-   Must be in the format described in sys.mli. *)
+(* OCaml version string, must be in the format described in sys.mli. *)
 
-let ocaml_version = "3.06+10 (2002-10-28)"
+let ocaml_version = "3.06+11 (2002-10-29)";;