improve C functions

Author: LdBeth

cutil/lm_nocompare.c

@@ -14,16 +14,16 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation,
  * version 2.1 of the License.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Additional permission is given to link this library with the
  * OpenSSL project's "OpenSSL" library, and with the OCaml runtime,
  * and you may distribute the linked executables.  See the file

cutil/lm_printf.c

@@ -67,6 +67,7 @@ static int s_wcswidth(const wchar_t *pwcs, size_t n)
  */
 value display_width_of_string(value v_string)
 {
+    CAMLparam1(v_string);
     const char *str = String_val(v_string);
 
     wchar_t pwcs[BUFSIZE];
@@ -79,5 +80,5 @@ value display_width_of_string(value v_string)
         i += s_wcswidth(pwcs, BUFSIZE);
     }
 
-    return Val_int(i);
+    CAMLreturn(Val_int(i));
 }

cutil/lm_rformat.c

@@ -44,12 +44,9 @@ static int load_terminfo() {
 }
 
 /* Converts termcap data type to capname */
-static char *capname(int i) {
-
-    char *names[] = {"bold", "snrmq", "ssubm", "ssupm", "smul", "sitm", "sgr0"};
-
-    return names[i];
-}
+static char *capnames[] = {
+    "bold", "snrmq", "ssubm", "ssupm", "smul", "sitm", "sgr0"
+};
 
 #endif /* NCURSES support? */
 
@@ -77,16 +74,17 @@ value caml_tgetstr(value id) {
       in.  */
 #ifdef NCURSES
    if(load_terminfo() == 0) {
-       char *name = capname(Int_val(id));
+       char *name = capnames[Int_val(id)];
        termdata = tigetstr(name);
    }
 #endif /* NCURSES */
 
    /* Note that tigetstr will return either 0 or -1 on error. */
    if(termdata == NULL || termdata == (char *)(-1)) {
-      result = caml_copy_string("");
+      result = Val_int(0); /* None */
    } else {
-      result = caml_copy_string(termdata);
+      result = caml_alloc_small(1, 0); /* Some string */
+      Field(result, 0) = caml_copy_string(termdata);
       /* apparently we're not supposed to free termdata here */
       /* TEMP:  I cannot find specs on this! */
       //free(termdata);

cutil/lm_terminfo.c

@@ -66,15 +66,15 @@ value caml_term_size(value arg)
 
         if(ioctl(fd, TIOCGWINSZ, &ws) < 0)
             caml_failwith("lm_termsize.c: caml_term_size: not a terminal");
-    
+
         /* Return the pair of numbers */
         Field(buf, 0) = Val_int(ws.ws_row);
         Field(buf, 1) = Val_int(ws.ws_col);
     }
 #else /* TIOCGWINSZ */
-   /* Assume that the terminal is 80 by 25 */
-   Field(buf, 0) = Val_int( 25 );
-   Field(buf, 1) = Val_int( 80 );
+    /* Assume that the terminal is 80 by 25 */
+    Field(buf, 0) = Val_int( 25 );
+    Field(buf, 1) = Val_int( 80 );
 #endif /* TIOCGWINSZ */
 #endif /* WIN32 */
 

cutil/lm_termsize.c

@@ -10,16 +10,16 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation,
  * version 2.1 of the License.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Additional permission is given to link this library with the
  * OpenSSL project's "OpenSSL" library, and with the OCaml runtime,
  * and you may distribute the linked executables.  See the file

cutil/lm_uname_ext.c

@@ -29,7 +29,7 @@ type termcap = Bold | Normal | Subscript | Superscript
 (* The C function takes a integer, and returns the escape sequence
    (or an empty string if the ID is not defined for this terminal).  *)
 external caml_tgetstr_enabled : unit -> bool = "caml_tgetstr_enabled"
-external caml_tgetstr : termcap -> string = "caml_tgetstr"
+external caml_tgetstr : termcap -> string option = "caml_tgetstr"
 
 
 (* Tgetstr is enabled only if the terminal is defined *)
@@ -39,15 +39,9 @@ let tgetstr_enabled = caml_tgetstr_enabled ()
    Lookup the terminal capability with indicated id.  This assumes the
    terminfo to lookup is given in the TERM environment variable.  This
    function returns None if the terminal capability is not defined.  *)
-let tgetstr id =
-   if tgetstr_enabled then
-      let result = caml_tgetstr id in
-         if result = "" then
-            None
-         else
-            Some result
-   else
-      None
+let tgetstr = if tgetstr_enabled then
+                 caml_tgetstr
+              else (fun _ -> None)
 
 
 (* Various terminfo identifier names for use with tgetstr *)