Use new destructive line parser to avoid a lot of strdup/free's.

SVN revision: 30132

src/menus-misc.c

@@ -313,29 +313,28 @@ FillFlatFileMenu(Menu * m, const char *name, const char *file)
 
 	if (first)
 	  {
-	     char               *wd;
+	     char               *title;
 
-	     wd = field(s, 0);
-	     if (wd)
-	       {
-		  MenuSetTitle(m, wd);
-		  Efree(wd);
-	       }
 	     first = 0;
+
+	     title = NULL;
+	     parse(s, "%S", &title);
+
+	     if (!title)
+		continue;
+	     MenuSetTitle(m, title);
 	  }
 	else
 	  {
-	     char               *txt = NULL, *icon = NULL, *act = NULL;
+	     char               *txt, *icon, *act, *params;
-	     char               *params = NULL, wd[4096];
+	     char                wd[4096];
-
 	     MenuItem           *mi;
 	     ImageClass         *icc = NULL;
 	     Menu               *mm;
 
-	     txt = field(s, 0);
+	     txt = icon = act = params = NULL;
-	     icon = field(s, 1);
+	     parse(s, "%S%T%S%S", &txt, &icon, &act, &params);
-	     act = field(s, 2);
+
-	     params = field(s, 3);
 	     if (icon && exists(icon))
 	       {
 		  Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
@@ -348,8 +347,8 @@ FillFlatFileMenu(Menu * m, const char *name, const char *file)
 		  sscanf(params, "%4000s", wd);
 		  if (path_canexec(wd))
 		    {
-		       Esnprintf(s, sizeof(s), "exec %s", params);
+		       Esnprintf(wd, sizeof(wd), "exec %s", params);
-		       mi = MenuItemCreate(txt, icc, s, NULL);
+		       mi = MenuItemCreate(txt, icc, wd, NULL);
 		       MenuAddItem(m, mi);
 		    }
 	       }
@@ -368,14 +367,6 @@ FillFlatFileMenu(Menu * m, const char *name, const char *file)
 		  mi = MenuItemCreate(txt, icc, act, NULL);
 		  MenuAddItem(m, mi);
 	       }
-	     if (txt)
-		Efree(txt);
-	     if (icon)
-		Efree(icon);
-	     if (act)
-		Efree(act);
-	     if (params)
-		Efree(params);
 	  }
      }
    fclose(f);

src/parse.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
+ * Copyright (C) 2007 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,200 +21,81 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include "parse.h"
-#include "util.h"
 
-#if 0				/* Unused */
+int
-
+parse(char *buf, const char *fmt, ...)
-const char         *
-atword(const char *s, int num)
 {
-   int                 cnt, i;
+   int                 nitems;
+   char                chi, chf, chq;
+   char               *p, **ps;
+   va_list             args;
 
-   if (!s)
+   va_start(args, fmt);
-      return NULL;
-   cnt = 0;
-   i = 0;
 
-   while (s[i])
+   for (nitems = 0;;)
      {
-	if ((s[i] != ' ') && (s[i] != '\t'))
+	chf = *fmt++;
+	if (chf != '%')
+	   break;
+	chf = *fmt++;
+	if (chf == '\0')
+	   break;
+	/* Strip leading whitespace */
+	while (isspace(*buf))
+	   buf++;
+	if (!*buf)
+	   break;
+	switch (chf)
 	  {
-	     if (i == 0)
+	  case 'S':		/* Return pointer to string */
-		cnt++;
+	  case 'T':		/* As S, convert "NULL" to NULL pointer */
-	     else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
+	     chi = *buf;
-		cnt++;
+	     chq = (chi == '\'' || chi == '"') ? chi : '\0';
-	     if (cnt == num)
+	     if (chq)
-		return &s[i];
-	  }
-	i++;
-     }
-   return NULL;
-}
-
-void
-word(const char *s, int num, char *wd)
-{
-   int                 cnt, i;
-   const char         *start, *finish, *ss;
-
-   if (!s)
-      return;
-   if (!wd)
-      return;
-   if (num <= 0)
-     {
-	*wd = 0;
-	return;
-     }
-   cnt = 0;
-   i = 0;
-   start = NULL;
-   finish = NULL;
-   ss = NULL;
-
-   while (s[i])
-     {
-	if ((cnt == num) && ((s[i] == ' ') || (s[i] == '\t')))
-	  {
-	     finish = &s[i];
-	     break;
-	  }
-	if ((s[i] != ' ') && (s[i] != '\t'))
-	  {
-	     if (i == 0)
 	       {
-		  cnt++;
+		  /* Token is quoted */
-		  if (cnt == num)
+		  buf++;
-		     start = &s[i];
+		  for (p = buf;; p++)
-	       }
-	     else if ((s[i - 1] == ' ') || (s[i - 1] == '\t'))
-	       {
-		  cnt++;
-		  if (cnt == num)
-		     start = &s[i];
-	       }
-	  }
-	i++;
-     }
-   if (cnt == num)
-     {
-	if ((start) && (finish))
-	  {
-	     for (ss = start; ss < finish; ss++)
-		*wd++ = *ss;
-	  }
-	else if (start)
-	  {
-	     for (ss = start; *ss != 0; ss++)
-		*wd++ = *ss;
-	  }
-	*wd = 0;
-     }
-}
-
-#endif /* Unused */
-
-/* gets word number [num] in the string [s] and copies it into [wd] */
-/* wd is NULL terminated. If word [num] does not exist wd = "" */
-/* NB: this function now handles quotes so for a line: */
-/* Hello to "Welcome sir - may I Help" Shub Foo */
-/* Word 1 = Hello */
-/* Word 2 = to */
-/* Word 3 = Welcome sir - may I Help */
-/* Word 4 = Shub */
-/* word 5 = Foo */
-void
-fword(char *s, int num, char *wd)
-{
-   char               *cur, *start, *end;
-   int                 count, inword, inquote, len;
-
-   if (!s)
-      return;
-   if (!wd)
-      return;
-   *wd = 0;
-   if (num <= 0)
-      return;
-   cur = s;
-   count = 0;
-   inword = 0;
-   inquote = 0;
-   start = NULL;
-   end = NULL;
-   while ((*cur) && (count < num))
-     {
-	if (inword)
-	  {
-	     if (inquote)
-	       {
-		  if (*cur == '"')
 		    {
-		       inquote = 0;
+		       p = strchr(p, chq);
-		       inword = 0;
+		       if (p)
-		       end = cur;
+			 {
-		       count++;
+			    if (p[1] && !isspace(p[1]))
+			       continue;
+			    *p++ = '\0';	/* Terminate at quote */
+			 }
+		       else
+			 {
+			    p = buf + strlen(buf);	/* Missing end quote */
+			 }
+		       break;
 		    }
 	       }
 	     else
 	       {
-		  if (isspace(*cur))
+		  /* Token is unquoted */
-		    {
+		  p = buf + 1;
-		       end = cur;
+		  while (*p && !isspace(*p))
-		       inword = 0;
+		     p++;
-		       count++;
+		  if (*p)
-		    }
+		     *p++ = '\0';
 	       }
-	  }
+	     ps = va_arg(args, char **);
-	else
-	  {
-	     if (!isspace(*cur))
-	       {
-		  if (*cur == '"')
-		    {
-		       inquote = 1;
-		       start = cur + 1;
-		    }
-		  else
-		     start = cur;
-		  inword = 1;
-	       }
-	  }
-	if (count == num)
-	   break;
-	cur++;
-     }
-   if (!start)
-      return;
-   if (!end)
-      end = cur;
-   if (end <= start)
-      return;
-   len = (int)(end - start);
-   if (len > 4000)
-      len = 4000;
-   if (len > 0)
-     {
-	strncpy(wd, start, len);
-	wd[len] = 0;
-     }
-}
 
-char               *
+	     if (chf == 'T' && (!buf[0] || !strcmp(buf, "NULL")))
-field(char *s, int fieldno)
+		*ps = NULL;
-{
+	     else
-   char                buf[4096];
+		*ps = buf;
-
+	     nitems++;
-   buf[0] = 0;
+	     buf = p;
-   fword(s, fieldno + 1, buf);
+	  }
-   if (buf[0])
-     {
-	if ((!strcmp(buf, "NULL")) || (!strcmp(buf, "(null)")))
-	   return NULL;
-	return Estrdup(buf);
      }
-   return NULL;
+
+   va_end(args);
+
+   return nitems;
 }

src/parse.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
+ * Copyright (C) 2007 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -23,7 +23,6 @@
 #ifndef _PARSE_H_
 #define _PARSE_H_
 
-char               *field(char *s, int fieldno);
+int                 parse(char *buf, const char *fmt, ...);
-void                fword(char *s, int num, char *wd);
 
 #endif /* _PARSE_H_ */