Changeset 903 for trunk/src/gmakenew/misc.c

Timestamp:

May 23, 2007, 7:31:19 AM (18 years ago)

Author:

bird

Message:

Merged with the 2007-05-23 CVS. Added rsort and fixed a couple of windows build issues.

File:

• trunk/src/gmakenew/misc.c (modified) (15 diffs)

trunk/src/gmakenew/misc.c

@@ -172 +172 @@
 
 
-/* Return a newly-allocated string whose contents
-   concatenate those of s1, s2, s3.  */
+/* Return a string whose contents concatenate those of s1, s2, s3.
+   This string lives in static, re-used memory.  */
 
 char *
@@ -179 +179 @@
 {
   unsigned int len1, len2, len3;
-  char *result;
-
-  len1 = *s1 != '\0' ? strlen (s1) : 0;
-  len2 = *s2 != '\0' ? strlen (s2) : 0;
-  len3 = *s3 != '\0' ? strlen (s3) : 0;
-
-  result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  if (*s1 != '\0')
-    bcopy (s1, result, len1);
-  if (*s2 != '\0')
-    bcopy (s2, result + len1, len2);
-  if (*s3 != '\0')
-    bcopy (s3, result + len1 + len2, len3);
-  *(result + len1 + len2 + len3) = '\0';
+  static unsigned int rlen = 0;
+  static char *result = NULL;
+
+  len1 = (s1 && *s1 != '\0') ? strlen (s1) : 0;
+  len2 = (s2 && *s2 != '\0') ? strlen (s2) : 0;
+  len3 = (s3 && *s3 != '\0') ? strlen (s3) : 0;
+
+  if (len1 + len2 + len3 + 1 > rlen)
+    result = xrealloc (result, (rlen = len1 + len2 + len3 + 10));
+
+  if (len1)
+    memcpy (result, s1, len1);
+  if (len2)
+    memcpy (result + len1, s2, len2);
+  if (len3)
+    memcpy (result + len1 + len2, s3, len3);
+
+  result[len1+len2+len3] = '\0';
 
   return result;
@@ -351 +354 @@
 #undef xstrdup
 
-char *
+void *
 xmalloc (unsigned int size)
 {
   /* Make sure we don't allocate 0, for pre-ANSI libraries.  */
-  char *result = (char *) malloc (size ? size : 1);
+  void *result = malloc (size ? size : 1);
   if (result == 0)
     fatal (NILF, _("virtual memory exhausted"));
@@ -362 +365 @@
 
 
-char *
-xrealloc (char *ptr, unsigned int size)
-{
-  char *result;
+void *
+xrealloc (void *ptr, unsigned int size)
+{
+  void *result;
 
   /* Some older implementations of realloc() don't conform to ANSI.  */
@@ -385 +388 @@
   result = strdup (ptr);
 #else
-  result = (char *) malloc (strlen (ptr) + 1);
+  result = malloc (strlen (ptr) + 1);
 #endif
 
@@ -394 +397 @@
   return result;
 #else
-  return strcpy(result, ptr);
+  return strcpy (result, ptr);
 #endif
 }
@@ -403 +406 @@
 savestring (const char *str, unsigned int length)
 {
-  register char *out = (char *) xmalloc (length + 1);
+  char *out = xmalloc (length + 1);
   if (length > 0)
-    bcopy (str, out, length);
+    memcpy (out, str, length);
   out[length] = '\0';
   return out;
@@ -448 +451 @@
  */
 char *
-end_of_token_w32 (char *s, char stopchar)
-{
-  register char *p = s;
-  register int backslash = 0;
+end_of_token_w32 (const char *s, char stopchar)
+{
+  const char *p = s;
+  int backslash = 0;
 
   while (*p != '\0' && *p != stopchar
@@ -469 +472 @@
     }
 
-  return p;
+  return (char *)p;
 }
 #endif
@@ -483 +486 @@
 }
 
-/* Find the next token in PTR; return the address of it, and store the
-   length of the token into *LENGTHPTR if LENGTHPTR is not nil.  */
+/* Find the next token in PTR; return the address of it, and store the length
+   of the token into *LENGTHPTR if LENGTHPTR is not nil.  Set *PTR to the end
+   of the token, so this function can be called repeatedly in a loop.  */
 
 char *
-find_next_token (char **ptr, unsigned int *lengthptr)
-{
-  char *p = next_token (*ptr);
-  char *end;
+find_next_token (const char **ptr, unsigned int *lengthptr)
+{
+  const char *p = next_token (*ptr);
 
   if (*p == '\0')
     return 0;
 
-  *ptr = end = end_of_token (p);
+  *ptr = end_of_token (p);
   if (lengthptr != 0)
-    *lengthptr = end - p;
-  return p;
+    *lengthptr = *ptr - p;
+
+  return (char *)p;
 }
 
@@ -508 +512 @@
 alloc_dep ()
 {
-  struct dep *d = (struct dep *) xmalloc (sizeof (struct dep));
-  bzero ((char *) d, sizeof (struct dep));
+  struct dep *d = xmalloc (sizeof (struct dep));
+  memset (d, '\0', sizeof (struct dep));
   return d;
 }
@@ -519 +523 @@
 free_dep (struct dep *d)
 {
-  if (d->name != 0)
-    free (d->name);
-
-  if (d->stem != 0)
-    free (d->stem);
-
-  free ((char *)d);
+  free (d);
 }
 
@@ -534 +532 @@
 copy_dep_chain (const struct dep *d)
 {
-  register struct dep *c;
   struct dep *firstnew = 0;
   struct dep *lastnew = 0;
@@ -540 +537 @@
   while (d != 0)
     {
-      c = (struct dep *) xmalloc (sizeof (struct dep));
-      bcopy ((char *) d, (char *) c, sizeof (struct dep));
-
-      if (c->name != 0)
-        c->name = xstrdup (c->name);
-      if (c->stem != 0)
-        c->stem = xstrdup (c->stem);
+      struct dep *c = xmalloc (sizeof (struct dep));
+      memcpy (c, d, sizeof (struct dep));
 
       c->next = 0;
@@ -573 +565 @@
 }
 
-
-/* Free a chain of `struct nameseq'. Each nameseq->name is freed
-   as well.  For `struct dep' chains use free_dep_chain.  */
-
-void
-free_ns_chain (struct nameseq *n)
-{
-  register struct nameseq *tmp;
-
-  while (n != 0)
-  {
-    if (n->name != 0)
-      free (n->name);
-
-    tmp = n;
-
-    n = n->next;
-
-    free (tmp);
-  }
-
-}
-
-#ifdef  iAPX286
-/* The losing compiler on this machine can't handle this macro.  */
-
-char *
-dep_name (struct dep *dep)
-{
-  return dep->name == 0 ? dep->file->name : dep->name;
+/* Free a chain of struct nameseq.
+   For struct dep chains use free_dep_chain.  */
+
+void
+free_ns_chain (struct nameseq *ns)
+{
+  while (ns != 0)
+    {
+      struct nameseq *t = ns;
+      ns = ns->next;
+      free (t);
+    }
+}
+
+
+
+#if !HAVE_STRCASECMP && !HAVE_STRICMP && !HAVE_STRCMPI
+
+/* If we don't have strcasecmp() (from POSIX), or anything that can substitute
+   for it, define our own version.  */
+
+int
+strcasecmp (const char *s1, const char *s2)
+{
+  while (1)
+    {
+      int c1 = (int) *(s1++);
+      int c2 = (int) *(s2++);
+
+      if (isalpha (c1))
+        c1 = tolower (c1);
+      if (isalpha (c2))
+        c2 = tolower (c2);
+
+      if (c1 != '\0' && c1 == c2)
+        continue;
+
+      return (c1 - c2);
+    }
 }
 #endif