*** empty log message ***

[lilypond.git] / flower / libc-extension.cc

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index b380b1fd2d90671ac2a7e1b5d731ad6a139e484f..efa544be6364b45fdd610a7c37a9308f58457d20 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -4,80 +4,112 @@
 
   source file of the flowerlib
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+         Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
+
 #include "libc-extension.hh"
 
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
 
 char* 
-strnlwr (char* start_l ,int n)
+strnlwr (char* start ,int n)
 {
-    char * p = start_l + n;
-    while (--p >= start_l) 
+  char * p = start + n;
+  while (--p >= start) 
     {
-       *p = tolower (*p);    /* a macro on some compilers */
+      *p = tolower (*p);    /* a macro on some compilers */
     }
-    return start_l;
+  return start;
 }
 
 char* 
-strnupr (char* start_l, int n)
+strnupr (char* start, int n)
 {
-    char * p = start_l + n;
-    while (--p >= start_l) 
+  char * p = start + n;
+  while (--p >= start) 
     {
-       *p = toupper (*p);    /* a macro on some compilers */
+      *p = toupper (*p);    /* a macro on some compilers */
     }
-    return start_l;
+  return start;
+}
+
+/*
+  There are some strange problems with round() on early glibcs.
+ */
+double
+my_round (double x)
+{
+  return floor (x -0.5)+ 1.0 ;
 }
 
+#ifndef isinf
+#if !HAVE_ISINF
+int
+isinf (double x)
+{
+  return x && ( x == x/ 2) ;
+}
+#endif
+#endif
+
 #if !HAVE_MEMMEM
 
 /** locate a substring. #memmem# finds the first occurrence of
-  #needle# in #haystack#
-  */
+  #needle# in #haystack#.  This is not ANSI-C.
 
-char *
-memmem (Byte const * haystack, int haystack_len,
+  The prototype is not in accordance with the Linux Programmer's
+  Manual v1.15, but it is with /usr/include/string.h   */
+
+Byte *
+_memmem (Byte const *haystack, int haystack_len,
        Byte const *needle,int needle_len)
 {
-    Byte const * end_haystack = haystack + haystack_len - needle_len;
-    Byte const * end_needle = needle + needle_len ;
+  Byte const * end_haystack = haystack + haystack_len - needle_len + 1;
+  Byte const * end_needle = needle + needle_len ;
 
-    /* Ahhh ... Some minimal lowlevel stuff. This *is* nice; Varation
-       is the spice of life */
-    while (haystack < end_haystack) 
+  /* Ahhh ... Some minimal lowlevel stuff. This *is* nice; Varation
+     is the spice of life */
+  while (haystack < end_haystack) 
     {
-       Byte const *subneedle_l = needle;
-       Byte const *subhaystack_l = haystack;
-       while (subneedle_l < end_needle) 
-       {
-           if (*subneedle_l++ != *subhaystack_l++)
-               goto next;      // yeah. I should be prosecuted.
-       }
+      Byte const *subneedle = needle;
+      Byte const *subhaystack = haystack;
+      while (subneedle < end_needle) 
+        if (*subneedle++ != *subhaystack++)
+         goto next;
        
-       // completed the needle. Gotcha.
-       return (char*) haystack;
-    next:
+      /* Completed the needle.  Gotcha.  */
+      return (Byte *) haystack;
+      next:
        haystack++;
     }
-    return 0;
+  return 0;
+}
+
+void *
+memmem (void const *haystack, int haystack_len,
+       void const *needle,int needle_len)
+{
+  Byte const* haystack_byte_c = (Byte const*)haystack;
+  Byte const* needle_byte_c = (Byte const*)needle;
+  return _memmem (haystack_byte_c, haystack_len, needle_byte_c, needle_len);
 }
+
 #endif
 
 Byte *
 memrchr (Byte const * p, int n, char c)
 {
-    const    Byte * q = p+n;
-    while (q > p) 
+  const    Byte * q = p+n;
+  while (q > p) 
     {
-       if (*--q == c)
-           return (Byte*)q;
+      if (*--q == c)
+       return (Byte*)q;
     }
-    return 0;
+  return 0;
 }
 
 
@@ -85,34 +117,43 @@ template<class T>
 inline void
 my_swap (T &t1, T &t2, T &tmp)
 {
-    tmp = t1;
-    t1 = t2;
-    t2 = tmp;
+  tmp = t1;
+  t1 = t2;
+  t2 = tmp;
 }
 
 Byte*
-strrev (Byte* byte_l, int length_i)
+strrev (Byte* byte, int length_i)
 {
-    Byte tmp_byte;
+  Byte tmp_byte;
   
-    Byte* left_l = byte_l;
-    Byte* right_l = byte_l + length_i;
+  Byte* left = byte;
+  Byte* right = byte + length_i;
 
-    while (right_l > left_l) 
+  while (right > left) 
     {
-       my_swap (*right_l-- , *left_l++ , tmp_byte);
+      my_swap (*right-- , *left++ , tmp_byte);
     }
-    return byte_l;
+  return byte;
 }
 
 #if ! HAVE_SNPRINTF
-int snprintf (char *str, size_t,
-              char const *format, ...)
+int 
+snprintf (char *str, size_t, char const *format, ...)
+{
+  va_list ap;
+  va_start (ap, format);
+  int i = vsprintf (str, format, ap);
+  va_end (ap);
+  return i;
+}
+#endif
+
+#if ! HAVE_VSNPRINTF
+int 
+vsnprintf (char *str, size_t, char const *format, va_list args)
 {
-    va_list ap;
-    va_start (ap, format);
-    int i = vsprintf (str, format, ap);
-    va_end (ap);
-    return i;
+  int i = vsprintf (str, format, args);
+  return i;
 }
 #endif