Ticket #8791: missing.patch

backends/platform/wince/missing/missing.cpp

@@ -40 +40 @@
 
 void *bsearch(const void *key, const void *base, size_t nmemb,
                           size_t size, int (*compar)(const void *, const void *)) {
-        size_t i;
+        // Perform binary search
+        size_t lo = 0;
+        size_t hi = nmemb;
+        while (lo < hi) {
+                size_t mid = (lo + hi) / 2;
+                const void *p = ((const char *)base) + mid * size;
+                int tmp = (*compar)(key, p);
+                if (tmp < 0)
+                        hi = mid;
+                else if (tmp > 0)
+                        lo = mid + 1;
+                else
+                        return (void *)p;
+        }
 
-        for (i=0; i<nmemb; i++)
-                if (compar(key, (void*)((size_t)base + size * i)) == 0)
-                        return (void*)((size_t)base + size * i);
         return NULL;
 }
 
@@ -319 +329 @@
         return 1;
 }
 
-/* in our case unlink is the same as remove */
-int unlink(const char* path)
-{
-        return remove(path);
-}
-
 /* Make directory, Unix style */
 void mkdir(char* dirname, int mode)
 {
@@ -349 +353 @@
         CreateDirectory(pathUnc, 0);
 }
 
-/* Used in DEVICES.C and UI.C for some purpose. Not critical in this port */
-int system(const char* path) { return 0; }
-
-#if 0
-
-char *tmpnam(char *string)
-{
-        TCHAR pTemp[MAX_PATH+1];
-        static char buffer[MAX_PATH+1];
-        GetTempFileName(TEXT("."), TEXT("A8_"), 0, pTemp);
-        WideCharToMultiByte(CP_ACP, 0, pTemp, -1, buffer, MAX_PATH, NULL, NULL);
-
-        if (string)
-        {
-                strcpy(string, buffer);
-                return string;
-        }
-        else
-                return buffer;
-}
-
-FILE *tmpfile()
-{
-        TCHAR pTemp[MAX_PATH+1];
-        if (!GetTempFileName(TEXT("."), TEXT("A8_"), 0, pTemp))
-                return _wfopen(pTemp, TEXT("w+b"));
-        else
-                return 0;
-}
-
-#endif
-
-void rewind(FILE *stream)
-{
-        fseek(stream, 0, SEEK_SET);
-}
-
-
 #if _WIN32_WCE < 300
 
-int isalnum(int c) {
-        return ((c >= 'A' && c <= 'Z') ||
-                        (c >= 'a' && c <= 'z') ||
-                        (c >= '0' && c <= '9'));
-}
-
 char *_strdup(const char *strSource)
 #else
 char *strdup(const char *strSource)
 #endif
 {
         char* buffer;
-        buffer = (char*)malloc(strlen(strSource)+1);
+        size_z len = strlen(strSource)+1;
+        buffer = (char*)malloc(len);
         if (buffer)
-                strcpy(buffer, strSource);
+                memcpy(buffer, strSource, len);
         return buffer;
 }
-
-/* Very limited implementation of sys/time.h */
-void gettimeofday(struct timeval* tp, void* dummy)
-{
-        DWORD dt = GetTickCount();
-        tp->tv_sec = dt/1000;
-        tp->tv_usec = dt*1000;
-}
-
-void usleep(long usec)
-{
-        long msec = usec/1000;
-        if (msec <= 0)
-                Sleep(0);
-        else
-                Sleep(msec);
-}
-
-/* This may provide for better sync mechanism */
-unsigned int clock()
-{
-        return GetTickCount();
-}
-
-/* And why do people use this? */
-#if _WIN32_WCE >= 300
-void abort()
-{
-        exit(1);
-}
 #endif
 
-/*
-IMHO, no project should use this one, it is not portable at all. This implementation
-at least allows some projects to work.
-*/
-char* getenv(char* name)
-{
-        static char buffer[MAX_PATH+1];
-        if (strcmp(name, "HOME") == 0 || strcmp(name, "HOMEDIR") == 0)
-        {
-                getcwd(buffer, MAX_PATH);
-                return buffer;
-        }
-        else
-                return "";
-}
-
 #if _WIN32_WCE < 300 || defined(_TEST_HPC_STDIO)
 
 void *calloc(size_t n, size_t s) {
@@ -465 +380 @@
 }
 
 char *strpbrk(const char *s, const char *accept) {
-        int i;
-
         if (!s || !accept)
                 return NULL;
 
-        for (i=0; i<strlen(s); i++) {
-                int j;
-                for (j=0; j<strlen(accept); j++)
-                        if (s[i] == accept[j])
-                                return (char*)&s[i];
+        for (; *s != 0; ++s) {
+                for (const char *a = accept; *a != 0; ++a) {
+                        if (*s == *a)
+                                return (char *)s;
+                }
         }
 
         return NULL;
@@ -486 +399 @@
         return (c >='0' && c <= '9');
 }
 
-int isprint(int c) {
-        return (c >= ' ' && c <= '~');
-}
-
-int isspace(int c) {
-        return (c == ' ');
-}
-
 #endif
 
 #ifndef WIN32_PLATFORM_HPCPRO
@@ -643 +548 @@
 
 #endif
 
-int stricmp( const char *string1, const char *string2 ) {
-        char src[4096];
-        char dest[4096];
-        int i;
-
-        for (i=0; i<strlen(string1); i++)
-                if (string1[i] >= 'A' && string1[i] <= 'Z')
-                        src[i] = string1[i] + 32;
-                else
-                        src[i] = string1[i];
-        src[i] = 0;
-
-        for (i=0; i<strlen(string2); i++)
-                if (string2[i] >= 'A' && string2[i] <= 'Z')
-                        dest[i] = string2[i] + 32;
-                else
-                        dest[i] = string2[i];
-        dest[i] = 0;
-
-        return strcmp(src, dest);
+int stricmp(const char *s1, const char *s2) {
+        while (*s1 != 0 && tolower(*s1) == tolower(*s2)) {
+                s1++;
+                s2++;
+        }
+        return *(unsigned char *)s1 - *(unsigned char *)s2;
 }
 
-char *strrchr(const char *s, int c) {
-        int i;
+/* Find the last occurrence of C in S. Code taken from glibc. */
+char * strrchr (const char *s, int c) {
+        const char *found, *p;
+        c = (unsigned char)c;
 
-        for (i = strlen(s) - 1; i > 0; i--)
-                if (s[i] == c)
-                        return (char*)(s + i);
+        /* Since strchr is fast, we use it rather than the obvious loop.  */
+        if (c == '\0')
+                return strchr (s, '\0');
 
-        return NULL;
+        found = NULL;
+        while ((p = strchr(s, c)) != NULL) {
+                found = p;
+                s = p + 1;
+        }
+        return (char *) found;
 }
 
 long int strtol(const char *nptr, char **endptr, int base) {
@@ -691 +589 @@
 #else // defined(__GNUC__)
 
 #ifndef __MINGW32CE__
-int islower(int c)
-{
+int islower(int c) {
         return (c>='a' && c<='z');
 }
 
-int isspace(int c)
-{
+int isspace(int c) {
         return (c==' ' || c=='\f' || c=='\n' || c=='\r' || c=='\t' || c=='\v');
 }
 
-int isalpha(int c)
-{
-        return (islower(c) || (c>='A' && c<='Z'));
+int isalpha(int c) {
+        return ((c>='a' && c<='z') || (c>='A' && c<='Z'));
 }
 
-int isalnum(int c)
-{
-        return (isalpha(c) || (c>='0' && c<='9'));
+int isalnum(int c) {
+        return ((c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9'));
 }
 
-int isprint(int c)
-{
-        static char punct[] = "!\"#%&'();<=>?[\\]*+,-./:^_{|}~";
-        int i = 0, flag = 0;
-        while ((punct[i] != 0) && (flag = (punct[i] != c)))
-                i++;
-        return (isalnum(c) || flag);
+int isprint(int c) {
+        //static const char punct[] = "!\"#%&'();<=>?[\\]*+,-./:^_{|}~";
+        //return (isalnum(c) || strchr(punct, c));
+        return (32 <= c && c <= 126);   // based on BSD manpage
 }
-
-extern "C" int atexit(void (*function)(void))
-{
-        return 0;
-}
 #endif
 
 #endif