Changes in text.c [3bcf125:f34dd65]

File:

• text.c (modified) (4 diffs)

text.c

@@ -6 +6 @@
 
 static const char fileIdent[] = "$Id$";
-
-/* start with line aline (where the first line is 1) and print 'lines'
- *  lines
- */
-int owl_text_truncate_lines(char *out, char *in, int aline, int lines)
-{
-  char *ptr1, *ptr2;
-  int i;
-
-  strcpy(out, "");
-  
-  if (aline==0) aline=1; /* really illegal use */
-
-  /* find the starting line */
-  ptr1=in;
-  if (aline!=1) {
-     for (i=0; i<aline-1; i++) {
-      ptr1=strchr(ptr1, '\n');
-      if (!ptr1) return(-1);
-      ptr1++;
-    }
-  }
-  /* ptr1 now holds the starting point */
-
-  /* copy in the next 'lines' lines */
-  if (lines<1) return(-1);
-  
-  for (i=0; i<lines; i++) {
-    ptr2=strchr(ptr1, '\n');
-    if (!ptr2) {
-      strcat(out, ptr1);
-      return(-1);
-    }
-    strncat(out, ptr1, ptr2-ptr1+1);
-    ptr1=ptr2+1;
-  }
-  return(0);
-}
-
-  
-/* the first column is column 0.  The message is expected to end in a
- * new line for now */
-void owl_text_truncate_cols(char *out, char *in, int acol, int bcol)
-{
-  char *ptr1, *ptr2, *tmpbuff, *last;
-  int len;
-
-  tmpbuff=owl_malloc(strlen(in)+20);
-
-  strcpy(tmpbuff, "");
-  last=in+strlen(in)-1;
-  ptr1=in;
-  while (ptr1<last) {
-    ptr2=strchr(ptr1, '\n');
-    if (!ptr2) {
-      /* but this shouldn't happen if we end in a \n */
-      break;
-    }
-    
-    if (ptr2==ptr1) {
-      strcat(tmpbuff, "\n");
-      ptr1++;
-      continue;
-    }
-
-    /* we need to check that we won't run over here */
-    if ( (ptr2-ptr1) < (bcol-acol) ) {
-      len=ptr2-(ptr1+acol);
-    } else {
-      len=bcol-acol;
-    }
-    if ((ptr1+len)>=last) {
-      len-=last-(ptr1+len);
-    }
-
-    strncat(tmpbuff, ptr1+acol, len);
-    strcat(tmpbuff, "\n");
-
-    ptr1=ptr2+1;
-  }
-  strcpy(out, tmpbuff);
-  owl_free(tmpbuff);
-}
-
 
 void owl_text_indent(char *out, char *in, int n)
@@ -275 +191 @@
 char *stristr(char *a, char *b)
 {
-  char *x, *y, *ret;
-
-  if ((x=owl_strdup(a))==NULL) return(NULL);
-  if ((y=owl_strdup(b))==NULL) return(NULL);
-  downstr(x);
-  downstr(y);
-  ret=strstr(x, y);
-  if (ret==NULL) {
-    owl_free(x);
-    owl_free(y);
-    return(NULL);
-  }
-  ret=ret-x+a;
-  owl_free(x);
-  owl_free(y);
+  char *x, *y;
+  char *ret = NULL;
+  if ((x = g_utf8_casefold(a, -1)) != NULL) {
+    if ((y = g_utf8_casefold(b, -1)) != NULL) {
+      ret = strstr(x, y);
+      if (ret != NULL) {
+        ret = ret - x + a;
+      }
+      g_free(y);
+    }
+    g_free(x);
+  }
   return(ret);
 }
@@ -296 +209 @@
 int only_whitespace(char *s)
 {
-  int i;
-  for (i=0; s[i]; i++) {
-    if (!isspace((int) s[i])) return(0);
+  if (g_utf8_validate(s,-1,NULL)) {
+    char *p;
+    for(p = s; p[0]; p=g_utf8_next_char(p)) {
+      if (!g_unichar_isspace(g_utf8_get_char(p))) return 0;
+    }
+  }
+  else {
+    int i;
+    for (i=0; s[i]; i++) {
+      if (!isspace((int) s[i])) return(0);
+    }
   }
   return(1);
@@ -327 +248 @@
   tolen  = strlen(to);
   fromlen  = strlen(from);
-  out = malloc(outlen);
+  out = owl_malloc(outlen);
 
   while (in[inpos]) {