X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=misc.c;h=0f96b7a878316948c11d98a70259865d5e70ac55;hp=db2a584f6a4b0683c5a819fe876b7490aa874362;hb=7c88cafcd333277b6bfd55370a5ec1c5b76c2b0d;hpb=384a832f989722381d0ad998a87d52f2ce05b714

diff --git a/misc.c b/misc.c
index db2a584..0f96b7a 100644
--- a/misc.c
+++ b/misc.c
@@ -5,6 +5,8 @@
  * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
+ * getaline() Copyright (C) Lars Wirzenius
+ * sprintf and snprintf copyright is owned by various people
  */
 
 #include <stdio.h>
@@ -16,9 +18,8 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#ifdef HANDLE_MULTIBYTE
-#	include <mbswidth.h>
-#endif
+#include <mbswidth.h>
+#include "abook.h"
 #include "misc.h"
 #include "xmalloc.h"
 
@@ -63,6 +64,41 @@ strtrim(char *s)
 	return s;
 }
 
+int
+is_number(char *p)
+{
+	if(!p || !*p || (*p == '-' && !*++p))
+		return 0;
+
+	for(; *p; p++)
+		if(!isdigit(*p))
+			return 0;
+
+	return 1;
+}
+
+#ifndef HAVE_STRCASESTR
+char *
+strcasestr(const char *haystack, const char *needle)
+{
+	int i;
+	int k;
+
+	assert(haystack != NULL);
+	assert(needle != NULL);
+
+	for(i=0; i<strlen(haystack)-strlen(needle)+1; i++) {
+		for(k=0; k<strlen(needle); k++, i++) {
+			if (tolower(haystack[i]) != tolower(needle[k]))
+				break;
+			else if ((k+1) == strlen(needle))
+				return &haystack[i];
+		}
+	}
+
+	return NULL;
+}
+#endif
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -80,12 +116,12 @@ strtrim(char *s)
 #endif
 
 char *
-mkstr (const char *format, ... )
+strdup_printf (const char *format, ... )
 {
 	MY_VA_LOCAL_DECL;
 	size_t size = 100;
 	char *buffer = xmalloc (size);
-	
+
 	assert(format != NULL);
 
 	for(;;) {
@@ -102,7 +138,7 @@ mkstr (const char *format, ... )
 			size = n + 1;
 		else
 			size *= 2;
-		
+
 		buffer = xrealloc(buffer, size);
 	}
 }
@@ -125,11 +161,8 @@ strconcat (const char *str, ...)
 		MY_VA_SHIFT(s, char*);
 	}
 	MY_VA_END;
-	
-	concat = (char *)
-	xmalloc(l);
-	if(concat == NULL)
-		return NULL;
+
+	concat =  xmalloc(l);
 
 	strcpy (concat, str);
 	MY_VA_START(str);
@@ -178,7 +211,7 @@ my_getcwd()
 		return NULL;
 
 	*dir = 0;
-	
+
 	while( getcwd(dir, size) == NULL && errno == ERANGE )
 		if( (dir = xrealloc(dir, size *=2)) == NULL)
 			return NULL;
@@ -186,7 +219,33 @@ my_getcwd()
 	return dir;
 }
 
-#define INITIAL_SIZE	128
+/*
+ * getaline()
+ *
+ * Copyright (c) 1994 Lars Wirzenius
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 char *
 getaline(FILE *f)
@@ -249,11 +308,7 @@ int
 strwidth(const char *s)
 {
 	assert(s);
-#ifdef HANDLE_MULTIBYTE
-	return (int)mbswidth(s, 0);
-#else
-	return strlen(s);
-#endif
+	return mbswidth(s, 0);
 }
 
 int
@@ -297,9 +352,9 @@ bytes2width(const char *s, int width)
  *    original.  Also, there is now a builtin-test, just compile with:
  *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
  *    and run snprintf for results.
- * 
+ *
  *  Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
- *    The PGP code was using unsigned hexadecimal formats. 
+ *    The PGP code was using unsigned hexadecimal formats.
  *    Unfortunately, unsigned formats simply didn't work.
  *
  *  Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
@@ -348,7 +403,7 @@ bytes2width(const char *s, int width)
 /*int snprintf (char *str, size_t count, const char *fmt, ...);*/
 /*int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);*/
 
-static void dopr (char *buffer, size_t maxlen, const char *format, 
+static void dopr (char *buffer, size_t maxlen, const char *format,
                   va_list args);
 static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
 		    char *value, int flags, int min, int max);
@@ -401,7 +456,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
   int flags;
   int cflags;
   size_t currlen;
-  
+
   state = DP_S_DEFAULT;
   currlen = flags = cflags = min = 0;
   max = -1;
@@ -409,20 +464,20 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 
   while (state != DP_S_DONE)
   {
-    if ((ch == '\0') || (currlen >= maxlen)) 
+    if ((ch == '\0') || (currlen >= maxlen))
       state = DP_S_DONE;
 
-    switch(state) 
+    switch(state)
     {
     case DP_S_DEFAULT:
-      if (ch == '%') 
+      if (ch == '%')
 	state = DP_S_FLAGS;
-      else 
+      else
 	dopr_outch (buffer, &currlen, maxlen, ch);
       ch = *format++;
       break;
     case DP_S_FLAGS:
-      switch (ch) 
+      switch (ch)
       {
       case '-':
 	flags |= DP_F_MINUS;
@@ -450,49 +505,49 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       }
       break;
     case DP_S_MIN:
-      if (isdigit((unsigned char)ch)) 
+      if (isdigit((unsigned char)ch))
       {
 	min = 10*min + char_to_int (ch);
 	ch = *format++;
-      } 
-      else if (ch == '*') 
+      }
+      else if (ch == '*')
       {
 	min = va_arg (args, int);
 	ch = *format++;
 	state = DP_S_DOT;
-      } 
-      else 
+      }
+      else
 	state = DP_S_DOT;
       break;
     case DP_S_DOT:
-      if (ch == '.') 
+      if (ch == '.')
       {
 	state = DP_S_MAX;
 	ch = *format++;
-      } 
-      else 
+      }
+      else
 	state = DP_S_MOD;
       break;
     case DP_S_MAX:
-      if (isdigit((unsigned char)ch)) 
+      if (isdigit((unsigned char)ch))
       {
 	if (max < 0)
 	  max = 0;
 	max = 10*max + char_to_int (ch);
 	ch = *format++;
-      } 
-      else if (ch == '*') 
+      }
+      else if (ch == '*')
       {
 	max = va_arg (args, int);
 	ch = *format++;
 	state = DP_S_MOD;
-      } 
-      else 
+      }
+      else
 	state = DP_S_MOD;
       break;
     case DP_S_MOD:
       /* Currently, we don't support Long Long, bummer */
-      switch (ch) 
+      switch (ch)
       {
       case 'h':
 	cflags = DP_C_SHORT;
@@ -512,11 +567,11 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       state = DP_S_CONV;
       break;
     case DP_S_CONV:
-      switch (ch) 
+      switch (ch)
       {
       case 'd':
       case 'i':
-	if (cflags == DP_C_SHORT) 
+	if (cflags == DP_C_SHORT)
 	  value = va_arg (args, short int);
 	else if (cflags == DP_C_LONG)
 	  value = va_arg (args, long int);
@@ -585,7 +640,7 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 	break;
       case 's':
 	strvalue = va_arg (args, char *);
-	if (max < 0) 
+	if (max < 0)
 	  max = maxlen; /* ie, no max */
 	fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
 	break;
@@ -594,19 +649,19 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
 	fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
 	break;
       case 'n':
-	if (cflags == DP_C_SHORT) 
+	if (cflags == DP_C_SHORT)
 	{
 	  short int *num;
 	  num = va_arg (args, short int *);
 	  *num = currlen;
-        } 
-	else if (cflags == DP_C_LONG) 
+        }
+	else if (cflags == DP_C_LONG)
 	{
 	  long int *num;
 	  num = va_arg (args, long int *);
 	  *num = currlen;
-        } 
-	else 
+        }
+	else
 	{
 	  int *num;
 	  num = va_arg (args, int *);
@@ -636,9 +691,9 @@ static void dopr (char *buffer, size_t maxlen, const char *format, va_list args)
       break; /* some picky compilers need this */
     }
   }
-  if (currlen < maxlen - 1) 
+  if (currlen < maxlen - 1)
     buffer[currlen] = '\0';
-  else 
+  else
     buffer[maxlen - 1] = '\0';
 }
 
@@ -647,7 +702,7 @@ static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
 {
   int padlen, strln;     /* amount to pad */
   int cnt = 0;
-  
+
   if (value == 0)
   {
     value = "<NULL>";
@@ -655,23 +710,23 @@ static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
 
   for (strln = 0; value[strln]; ++strln); /* strlen */
   padlen = min - strln;
-  if (padlen < 0) 
+  if (padlen < 0)
     padlen = 0;
-  if (flags & DP_F_MINUS) 
+  if (flags & DP_F_MINUS)
     padlen = -padlen; /* Left Justify */
 
-  while ((padlen > 0) && (cnt < max)) 
+  while ((padlen > 0) && (cnt < max))
   {
     dopr_outch (buffer, currlen, maxlen, ' ');
     --padlen;
     ++cnt;
   }
-  while (*value && (cnt < max)) 
+  while (*value && (cnt < max))
   {
     dopr_outch (buffer, currlen, maxlen, *value++);
     ++cnt;
   }
-  while ((padlen < 0) && (cnt < max)) 
+  while ((padlen < 0) && (cnt < max))
   {
     dopr_outch (buffer, currlen, maxlen, ' ');
     ++padlen;
@@ -691,7 +746,7 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
   int spadlen = 0; /* amount to space pad */
   int zpadlen = 0; /* amount to zero pad */
   int caps = 0;
-  
+
   if (max < 0)
     max = 0;
 
@@ -710,7 +765,7 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
       if (flags & DP_F_SPACE)
 	signvalue = ' ';
   }
-  
+
   if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
 
   do {
@@ -731,7 +786,7 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
     zpadlen = MAX(zpadlen, spadlen);
     spadlen = 0;
   }
-  if (flags & DP_F_MINUS) 
+  if (flags & DP_F_MINUS)
     spadlen = -spadlen; /* Left Justifty */
 
 #ifdef DEBUG_SNPRINTF
@@ -740,18 +795,18 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
 #endif
 
   /* Spaces */
-  while (spadlen > 0) 
+  while (spadlen > 0)
   {
     dopr_outch (buffer, currlen, maxlen, ' ');
     --spadlen;
   }
 
   /* Sign */
-  if (signvalue) 
+  if (signvalue)
     dopr_outch (buffer, currlen, maxlen, signvalue);
 
   /* Zeros */
-  if (zpadlen > 0) 
+  if (zpadlen > 0)
   {
     while (zpadlen > 0)
     {
@@ -761,9 +816,9 @@ static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
   }
 
   /* Digits */
-  while (place > 0) 
+  while (place > 0)
     dopr_outch (buffer, currlen, maxlen, convert[--place]);
-  
+
   /* Left Justified spaces */
   while (spadlen < 0) {
     dopr_outch (buffer, currlen, maxlen, ' ');
@@ -790,7 +845,7 @@ static long double pow10 (int exp)
     result *= 10;
     exp--;
   }
-  
+
   return result;
 }
 
@@ -816,12 +871,12 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
   int iplace = 0;
   int fplace = 0;
   int padlen = 0; /* amount to pad */
-  int zpadlen = 0; 
+  int zpadlen = 0;
   int caps = 0;
   long intpart;
   long fracpart;
-  
-  /* 
+
+  /*
    * AIX manpage says the default is 0, but Solaris says the default
    * is 6, and sprintf on AIX defaults to 6
    */
@@ -845,8 +900,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 
   intpart = ufvalue;
 
-  /* 
-   * Sorry, we only support 9 digits past the decimal because of our 
+  /*
+   * Sorry, we only support 9 digits past the decimal because of our
    * conversion method
    */
   if (max > 9)
@@ -886,18 +941,18 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
   fconvert[fplace] = 0;
 
   /* -1 for decimal point, another -1 if we are printing a sign */
-  padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); 
+  padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
   zpadlen = max - fplace;
   if (zpadlen < 0)
     zpadlen = 0;
-  if (padlen < 0) 
+  if (padlen < 0)
     padlen = 0;
-  if (flags & DP_F_MINUS) 
+  if (flags & DP_F_MINUS)
     padlen = -padlen; /* Left Justifty */
 
-  if ((flags & DP_F_ZERO) && (padlen > 0)) 
+  if ((flags & DP_F_ZERO) && (padlen > 0))
   {
-    if (signvalue) 
+    if (signvalue)
     {
       dopr_outch (buffer, currlen, maxlen, signvalue);
       --padlen;
@@ -914,10 +969,10 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
     dopr_outch (buffer, currlen, maxlen, ' ');
     --padlen;
   }
-  if (signvalue) 
+  if (signvalue)
     dopr_outch (buffer, currlen, maxlen, signvalue);
 
-  while (iplace > 0) 
+  while (iplace > 0)
     dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
 
   /*
@@ -926,7 +981,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
    */
   dopr_outch (buffer, currlen, maxlen, '.');
 
-  while (fplace > 0) 
+  while (fplace > 0)
     dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
 
   while (zpadlen > 0)
@@ -935,7 +990,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
     --zpadlen;
   }
 
-  while (padlen < 0) 
+  while (padlen < 0)
   {
     dopr_outch (buffer, currlen, maxlen, ' ');
     ++padlen;
@@ -972,7 +1027,7 @@ int snprintf (va_alist) va_dcl
   char *fmt;
 #endif
   VA_LOCAL_DECL;
-    
+
   VA_START (fmt);
   VA_SHIFT (str, char *);
   VA_SHIFT (count, size_t );
@@ -1004,7 +1059,7 @@ int main (void)
     "%3.2f",
     NULL
   };
-  double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 
+  double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996,
     0.9996, 1.996, 4.136, 0};
   char *int_fmt[] = {
     "%-1.5d",
@@ -1032,7 +1087,7 @@ int main (void)
       sprintf (buf2, fp_fmt[x], fp_nums[y]);
       if (strcmp (buf1, buf2))
       {
-	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n", 
+	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n",
 	    fp_fmt[x], buf1, buf2);
 	fail++;
       }
@@ -1046,7 +1101,7 @@ int main (void)
       sprintf (buf2, int_fmt[x], int_nums[y]);
       if (strcmp (buf1, buf2))
       {
-	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n", 
+	printf("snprintf doesn't match Format: %s\n\tsnprintf = %s\n\tsprintf  = %s\n",
 	    int_fmt[x], buf1, buf2);
 	fail++;
       }
@@ -1057,3 +1112,189 @@ int main (void)
 #endif /* SNPRINTF_TEST */
 
 #endif /* !HAVE_SNPRINTF */
+
+
+
+
+/*
+ * List handling functions
+ */
+
+void
+abook_list_append(abook_list **list, char *str)
+{
+	abook_list *tmp;
+
+	if(!str)
+		return;
+
+	for(tmp = *list; tmp && tmp->next; tmp = tmp->next)
+		;
+
+	if(tmp) {
+		tmp->next = xmalloc(sizeof(abook_list));
+		tmp = tmp->next;
+	} else
+		tmp = *list = xmalloc(sizeof(abook_list));
+
+	tmp->data = xstrdup(str);
+	tmp->next = NULL;
+}
+
+void
+abook_list_free(abook_list **list)
+{
+	abook_list *prev = NULL, *tmp = *list;
+
+	if(!list)
+		return;
+
+	while(tmp) {
+		xfree(tmp->data);
+		prev = tmp;
+		tmp = tmp->next;
+		xfree(prev);
+	}
+
+	*list = NULL;
+}
+
+abook_list *
+csv_to_abook_list(char *str)
+{
+	char *start, *p = str, *end;
+	abook_list *list = NULL;
+
+	if(!str)
+		return NULL;
+
+	SKIPWS(p);
+	start = end = p;
+
+	while(*p) {
+		if(!strchr(", ", *p)) {
+			end = ++p;
+			continue;
+		}
+
+		if((*p == ',') && (end - start)) {
+			abook_list_append(&list, xstrndup(start, end - start));
+			p++;
+			SKIPWS(p);
+			start = end = p;
+			continue;
+		}
+
+		p++;
+	}
+	if(end - start)
+		abook_list_append(&list, xstrndup(start, end - start));
+
+	return list;
+}
+
+char *
+abook_list_to_csv(abook_list *list)
+{
+	abook_list *tmp;
+	char *res = NULL;
+
+	for(tmp = list; tmp; tmp = tmp->next) {
+		if(tmp == list)
+			res = xstrdup(tmp->data);
+		else {
+			res = xrealloc(res, strlen(res)+strlen(tmp->data)+2);
+			strcat(res, ",");
+			strcat(res, tmp->data);
+		}
+	}
+
+	return res;
+}
+
+void
+abook_list_rotate(abook_list **list, enum rotate_dir dir)
+{
+	abook_list *tmp = *list;
+
+	if(!tmp || !tmp->next)
+		return;
+
+	switch(dir) {
+		case ROTATE_LEFT:
+			for(; tmp && tmp->next; tmp = tmp->next)
+				;
+
+			tmp->next = *list;
+			tmp = *list;
+			*list = (*list)->next;
+			tmp->next = NULL;
+			break;
+		case ROTATE_RIGHT:
+			for(; tmp && tmp->next && tmp->next->next;
+					tmp = tmp->next)
+				;
+
+			tmp->next->next = *list;
+			*list = tmp->next;
+			tmp->next = NULL;
+			break;
+		default:
+			assert(0);
+	}
+}
+
+/* if str == NULL, deleting the list element */
+void
+abook_list_replace(abook_list **list, int index, char *str)
+{
+	abook_list *cur, *prev;
+	int i = 0;
+
+	cur = prev = *list;
+
+	if((index == 0) && !str) {
+		*list = cur->next;
+		free(cur->data);
+		free(cur);
+		return;
+	}
+	
+	while(1) {
+		if(!cur)
+			return;
+
+		if(i == index)
+			break;
+
+		prev = cur;
+		cur = cur->next;
+		i++;
+	}
+
+	if(str) {
+		free(cur->data);
+		cur->data = xstrdup(str);
+	} else {
+		prev->next = cur->next;
+		free(cur->data);
+		free(cur);
+	}
+}
+
+abook_list *
+abook_list_get(abook_list *list, int index)
+{
+	int i = 0;
+
+	while(1) {
+		if(!list)
+			return NULL;
+
+		if(i == index)
+			return list;
+
+		i++;
+		list = list->next;
+	}
+}